Fri Oct 3 02:29:22 2008 UTC ()
xcursor.pc is taken care of, and xcursor-config is no more, so g/c .if 0
related code.


(cube)
diff -r1.2 -r1.3 src/external/mit/xorg/lib/libXcursor/Makefile
cvs diff -r1.2 -r1.3 src/external/mit/xorg/lib/libXcursor/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libXcursor/Makefile 2008/09/13 04:32:30 1.2
+++ src/external/mit/xorg/lib/libXcursor/Makefile 2008/10/03 02:29:22 1.3
@@ -1,58 +1,30 @@ @@ -1,58 +1,30 @@
1# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:30 cube Exp $ 1# $NetBSD: Makefile,v 1.3 2008/10/03 02:29:22 cube Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= Xcursor 5LIB= Xcursor
6 6
7.PATH: ${X11SRCDIR.${LIB}}/src 7.PATH: ${X11SRCDIR.${LIB}}/src
8.PATH: ${X11SRCDIR.${LIB}}/include/X11/Xcursor 8.PATH: ${X11SRCDIR.${LIB}}/include/X11/Xcursor
9.PATH: ${X11SRCDIR.${LIB}}/man 9.PATH: ${X11SRCDIR.${LIB}}/man
10SRCS= cursor.c display.c file.c library.c xlib.c 10SRCS= cursor.c display.c file.c library.c xlib.c
11 11
12INCS= Xcursor.h 12INCS= Xcursor.h
13INCSDIR=${X11INCDIR}/X11/Xcursor 13INCSDIR=${X11INCDIR}/X11/Xcursor
14 14
15MAN= Xcursor.3 15MAN= Xcursor.3
16 16
17CPPFLAGS+= ${X11FLAGS.THREADLIB} 17CPPFLAGS+= ${X11FLAGS.THREADLIB}
18CPPFLAGS+= -DICONDIR=\"${X11LIBDIR}/icons\" 18CPPFLAGS+= -DICONDIR=\"${X11LIBDIR}/icons\"
19CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xcursor 19CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xcursor
20CPPFLAGS+= -I${X11SRCDIR.${LIB}}/../include 20CPPFLAGS+= -I${X11SRCDIR.${LIB}}/../include
21 21
22LIBDPLIBS=\ 22LIBDPLIBS=\
23 Xrender ${.CURDIR}/../libXrender \ 23 Xrender ${.CURDIR}/../libXrender \
24 Xext ${.CURDIR}/../libXext \ 24 Xext ${.CURDIR}/../libXext \
25 X11 ${.CURDIR}/../libX11/dynamic 25 X11 ${.CURDIR}/../libX11/dynamic
26 26
27.if 0 
28# XXX it would be really swell if SCRIPTS was available from bsd.lib.mk 
29FILES= xcursor.pc xcursor-config 
30FILESDIR_xcursor.pc= ${X11USRLIBDIR}/pkgconfig 
31FILESDIR_xcursor-config=${X11BINDIR} 
32FILESOWN_xcursor-config=${BINOWN} 
33FILESGRP_xcursor-config=${BINGRP} 
34FILESMODE_xcursor-config=${BINMODE} 
35 
36CLEANFILES+=${FILES} 
37realall: ${FILES} 
38 
39XCURSORDIR= ${X11SRCDIR.xc}/lib/Xcursor 
40CONFIG_SUBST= ${HOST_SH} ${XCURSORDIR}/config-subst \ 
41 prefix="${X11ROOTDIR}" \ 
42 exec_prefix="${X11BINDIR}" \ 
43 libdir="${X11USRLIBDIR}" \ 
44 includedir="${X11INCDIR}" \ 
45 hardcode_libdir_flag_spec="-Wl,-rpath,${X11USRLIBDIR}" \ 
46 PACKAGE_VERSION="1.0.0" 
47 
48xcursor.pc: 
49 ${CONFIG_SUBST} < ${XCURSORDIR}/xcursor.pc.in > ${.TARGET} 
50 
51xcursor-config: 
52 ${CONFIG_SUBST} < ${XCURSORDIR}/xcursor-config.in > ${.TARGET} 
53.endif 
54 
55PKGDIST= ${LIB} 27PKGDIST= ${LIB}
56 28
57.include <bsd.x11.mk> 29.include <bsd.x11.mk>
58.include <bsd.lib.mk> 30.include <bsd.lib.mk>