Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 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.)
This commit is contained in:
mrg 2012-01-07 02:07:58 +00:00
parent acd0d5274c
commit bf795abb8d
6 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
external/mit/xorg/lib/xcb-util/Makefile vendored
View File

@ -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>

8
external/mit/xorg/lib/xcb-util/icccm/Makefile vendored
View File

@ -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

8
external/mit/xorg/lib/xcb-util/image/Makefile vendored
View File

@ -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

8
external/mit/xorg/lib/xcb-util/property/Makefile vendored
View File

@ -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

8
external/mit/xorg/lib/xcb-util/render-util/Makefile vendored
View File

@ -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

5
external/mit/xorg/lib/xcb-util/xcb-util.mk vendored
View File

@ -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