Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/xorg/lib/xcb-util - reorder the SUBDIR list to ...
details: https://anonhg.NetBSD.org/src/rev/3cb037b32c1e
branches: trunk
changeset: 772524:3cb037b32c1e
user: mrg <mrg%NetBSD.org@localhost>
date: Sat Jan 07 02:07:58 2012 +0000
description:
- 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.)
diffstat:
external/mit/xorg/lib/xcb-util/Makefile | 7 ++++---
external/mit/xorg/lib/xcb-util/icccm/Makefile | 8 ++++----
external/mit/xorg/lib/xcb-util/image/Makefile | 8 ++++----
external/mit/xorg/lib/xcb-util/property/Makefile | 8 ++++----
external/mit/xorg/lib/xcb-util/render-util/Makefile | 8 ++++----
external/mit/xorg/lib/xcb-util/xcb-util.mk | 5 +++--
6 files changed, 23 insertions(+), 21 deletions(-)
diffs (130 lines):
diff -r 5005ff55b084 -r 3cb037b32c1e external/mit/xorg/lib/xcb-util/Makefile
--- a/external/mit/xorg/lib/xcb-util/Makefile Fri Jan 06 22:20:54 2012 +0000
+++ b/external/mit/xorg/lib/xcb-util/Makefile Sat Jan 07 02:07:58 2012 +0000
@@ -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>
diff -r 5005ff55b084 -r 3cb037b32c1e external/mit/xorg/lib/xcb-util/icccm/Makefile
--- a/external/mit/xorg/lib/xcb-util/icccm/Makefile Fri Jan 06 22:20:54 2012 +0000
+++ b/external/mit/xorg/lib/xcb-util/icccm/Makefile Sat Jan 07 02:07:58 2012 +0000
@@ -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 @@
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
diff -r 5005ff55b084 -r 3cb037b32c1e external/mit/xorg/lib/xcb-util/image/Makefile
--- a/external/mit/xorg/lib/xcb-util/image/Makefile Fri Jan 06 22:20:54 2012 +0000
+++ b/external/mit/xorg/lib/xcb-util/image/Makefile Sat Jan 07 02:07:58 2012 +0000
@@ -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
diff -r 5005ff55b084 -r 3cb037b32c1e external/mit/xorg/lib/xcb-util/property/Makefile
--- a/external/mit/xorg/lib/xcb-util/property/Makefile Fri Jan 06 22:20:54 2012 +0000
+++ b/external/mit/xorg/lib/xcb-util/property/Makefile Sat Jan 07 02:07:58 2012 +0000
@@ -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 @@
SHLIB_MAJOR= 1
+XCBUTIL_EXTRA_DPLIBS+=\
+ xcb-event ${.CURDIR}/../event
+
.include "../xcb-util.mk"
-LIBDPLIBS+=\
- xcb-event ${.CURDIR}/../event
-
CPPFLAGS+= -I${X11SRCDIR.xcb-util}/event
diff -r 5005ff55b084 -r 3cb037b32c1e external/mit/xorg/lib/xcb-util/render-util/Makefile
--- a/external/mit/xorg/lib/xcb-util/render-util/Makefile Fri Jan 06 22:20:54 2012 +0000
+++ b/external/mit/xorg/lib/xcb-util/render-util/Makefile Sat Jan 07 02:07:58 2012 +0000
@@ -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
diff -r 5005ff55b084 -r 3cb037b32c1e external/mit/xorg/lib/xcb-util/xcb-util.mk
--- a/external/mit/xorg/lib/xcb-util/xcb-util.mk Fri Jan 06 22:20:54 2012 +0000
+++ b/external/mit/xorg/lib/xcb-util/xcb-util.mk Sat Jan 07 02:07:58 2012 +0000
@@ -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 @@
LIBDPLIBS=\
xcb ${.CURDIR}/../../libxcb/libxcb \
Xau ${.CURDIR}/../../libXau \
- Xdmcp ${.CURDIR}/../../libXdmcp
+ Xdmcp ${.CURDIR}/../../libXdmcp \
+ ${XCBUTIL_EXTRA_DPLIBS}
SHLIB_MAJOR?= 0
SHLIB_MINOR?= 0
Home |
Main Index |
Thread Index |
Old Index