Module Name: src
Committed By: mrg
Date: Sat Jan 7 02:07:59 UTC 2012
Modified Files:
src/external/mit/xorg/lib/xcb-util: Makefile xcb-util.mk
src/external/mit/xorg/lib/xcb-util/icccm: Makefile
src/external/mit/xorg/lib/xcb-util/image: Makefile
src/external/mit/xorg/lib/xcb-util/property: Makefile
src/external/mit/xorg/lib/xcb-util/render-util: Makefile
Log Message:
- reorder the SUBDIR list to have correct .WAIT-based dependancies.
- fix the handling of subdir additional LIBDPLIBS so they're present
when <bsd.lib.mk> is loaded. fixes missing shlib links relative to
what the normal package does. (noted by wiz.)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/xcb-util/Makefile \
src/external/mit/xorg/lib/xcb-util/xcb-util.mk
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/xcb-util/icccm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/xcb-util/image/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/xcb-util/property/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/xcb-util/render-util/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/xcb-util/Makefile
diff -u src/external/mit/xorg/lib/xcb-util/Makefile:1.2 src/external/mit/xorg/lib/xcb-util/Makefile:1.3
--- src/external/mit/xorg/lib/xcb-util/Makefile:1.2 Sun Jul 18 10:58:07 2010
+++ src/external/mit/xorg/lib/xcb-util/Makefile Sat Jan 7 02:07:58 2012
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/07/18 10:58:07 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2012/01/07 02:07:58 mrg Exp $
-SUBDIR= atom property event aux .WAIT \
- reply image icccm keysyms render-util
+SUBDIR= reply keysyms render-util \
+ atom event aux .WAIT property .WAIT \
+ image icccm
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/lib/xcb-util/xcb-util.mk
diff -u src/external/mit/xorg/lib/xcb-util/xcb-util.mk:1.2 src/external/mit/xorg/lib/xcb-util/xcb-util.mk:1.3
--- src/external/mit/xorg/lib/xcb-util/xcb-util.mk:1.2 Sun May 15 21:19:20 2011
+++ src/external/mit/xorg/lib/xcb-util/xcb-util.mk Sat Jan 7 02:07:58 2012
@@ -1,4 +1,4 @@
-# $NetBSD: xcb-util.mk,v 1.2 2011/05/15 21:19:20 christos Exp $
+# $NetBSD: xcb-util.mk,v 1.3 2012/01/07 02:07:58 mrg Exp $
# define XCBUTIL to something before including this
@@ -10,7 +10,8 @@ CPPFLAGS+= -DHAVE_VASPRINTF
LIBDPLIBS=\
xcb ${.CURDIR}/../../libxcb/libxcb \
Xau ${.CURDIR}/../../libXau \
- Xdmcp ${.CURDIR}/../../libXdmcp
+ Xdmcp ${.CURDIR}/../../libXdmcp \
+ ${XCBUTIL_EXTRA_DPLIBS}
SHLIB_MAJOR?= 0
SHLIB_MINOR?= 0
Index: src/external/mit/xorg/lib/xcb-util/icccm/Makefile
diff -u src/external/mit/xorg/lib/xcb-util/icccm/Makefile:1.1 src/external/mit/xorg/lib/xcb-util/icccm/Makefile:1.2
--- src/external/mit/xorg/lib/xcb-util/icccm/Makefile:1.1 Sun Jul 18 07:01:38 2010
+++ src/external/mit/xorg/lib/xcb-util/icccm/Makefile Sat Jan 7 02:07:58 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/07/18 07:01:38 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2012/01/07 02:07:58 mrg Exp $
XCBUTIL= icccm
@@ -6,13 +6,13 @@ SRCS= icccm.c
SHLIB_MAJOR= 1
-.include "../xcb-util.mk"
-
-LIBDPLIBS+=\
+XCBUTIL_EXTRA_DPLIBS+=\
xcb-atom ${.CURDIR}/../atom \
xcb-property ${.CURDIR}/../property \
xcb-event ${.CURDIR}/../event
+.include "../xcb-util.mk"
+
CPPFLAGS+= -I${X11SRCDIR.xcb-util}/atom
CPPFLAGS+= -I${X11SRCDIR.xcb-util}/property
CPPFLAGS+= -I${X11SRCDIR.xcb-util}/event
Index: src/external/mit/xorg/lib/xcb-util/image/Makefile
diff -u src/external/mit/xorg/lib/xcb-util/image/Makefile:1.2 src/external/mit/xorg/lib/xcb-util/image/Makefile:1.3
--- src/external/mit/xorg/lib/xcb-util/image/Makefile:1.2 Thu Aug 11 23:15:39 2011
+++ src/external/mit/xorg/lib/xcb-util/image/Makefile Sat Jan 7 02:07:58 2012
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2012/01/07 02:07:58 mrg Exp $
XCBUTIL= image
SRCS= \
xcb_image.c
-.include "../xcb-util.mk"
-
-LIBDPLIBS+=\
+XCBUTIL_EXTRA_DPLIBS+=\
xcb-shm ${.CURDIR}/../../libxcb/shm \
xcb-aux ${.CURDIR}/../aux
+.include "../xcb-util.mk"
+
CPPFLAGS+= -I${X11SRCDIR.xcb-util}/aux
CWARNFLAGS.clang+= -Wno-return-type
Index: src/external/mit/xorg/lib/xcb-util/property/Makefile
diff -u src/external/mit/xorg/lib/xcb-util/property/Makefile:1.1 src/external/mit/xorg/lib/xcb-util/property/Makefile:1.2
--- src/external/mit/xorg/lib/xcb-util/property/Makefile:1.1 Sun Jul 18 07:01:39 2010
+++ src/external/mit/xorg/lib/xcb-util/property/Makefile Sat Jan 7 02:07:58 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/07/18 07:01:39 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2012/01/07 02:07:58 mrg Exp $
XCBUTIL= property
@@ -6,9 +6,9 @@ SRCS= property.c
SHLIB_MAJOR= 1
-.include "../xcb-util.mk"
-
-LIBDPLIBS+=\
+XCBUTIL_EXTRA_DPLIBS+=\
xcb-event ${.CURDIR}/../event
+.include "../xcb-util.mk"
+
CPPFLAGS+= -I${X11SRCDIR.xcb-util}/event
Index: src/external/mit/xorg/lib/xcb-util/render-util/Makefile
diff -u src/external/mit/xorg/lib/xcb-util/render-util/Makefile:1.2 src/external/mit/xorg/lib/xcb-util/render-util/Makefile:1.3
--- src/external/mit/xorg/lib/xcb-util/render-util/Makefile:1.2 Thu Aug 11 23:15:39 2011
+++ src/external/mit/xorg/lib/xcb-util/render-util/Makefile Sat Jan 7 02:07:59 2012
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2012/01/07 02:07:59 mrg Exp $
XCBUTIL= render-util
SRCS= cache.c glyph.c util.c
+XCBUTIL_EXTRA_DPLIBS+=\
+ xcb-render ${.CURDIR}/../../libxcb/render
+
# xxx render-util vs renderutil
PKGCONFIG= xcb-renderutil
.include "../xcb-util.mk"
-LIBDPLIBS+=\
- xcb-render ${.CURDIR}/../../libxcb/render
-
# xxx render-util vs renderutil
CPPFLAGS+= -I${X11SRCDIR.xcb-util}/renderutil
.PATH: ${X11SRCDIR.xcb-util}/renderutil
