diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-05-23 15:08:52 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-05-23 15:08:52 +0000 |
| commit | b3fd7ea07d5cad132df82597ac0f0c5ed0b3f60b (patch) | |
| tree | 272e3770df2cdfad424ccf16f1e6347c358df594 /lib/libxcb | |
| parent | 2f0e102752058556a15e25a6f80fa5f8265d2eec (diff) | |
explicitely addt inter-library dependencies.
Diffstat (limited to 'lib/libxcb')
| -rw-r--r-- | lib/libxcb/Makefile | 3 | ||||
| -rw-r--r-- | lib/libxcb/Makefile.inc | 6 | ||||
| -rw-r--r-- | lib/libxcb/libxcb/Makefile | 10 |
3 files changed, 14 insertions, 5 deletions
diff --git a/lib/libxcb/Makefile b/lib/libxcb/Makefile index 6230c9063..244de6086 100644 --- a/lib/libxcb/Makefile +++ b/lib/libxcb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2009/05/22 16:09:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2009/05/23 15:08:50 matthieu Exp $ SUBDIR=\ libxcb \ @@ -23,6 +23,5 @@ SUBDIR=\ libxcb-xv \ libxcb-xvmc - .include <bsd.subdir.mk> .include <bsd.xorg.mk> diff --git a/lib/libxcb/Makefile.inc b/lib/libxcb/Makefile.inc index 1dc6cb449..27e5e1ec2 100644 --- a/lib/libxcb/Makefile.inc +++ b/lib/libxcb/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 2009/05/22 21:39:17 matthieu Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2009/05/23 15:08:50 matthieu Exp $ LIBXCB= ${.CURDIR}/../../../dist/libxcb @@ -6,6 +6,10 @@ CPPFLAGS= -I${X11BASE}/include \ -I${.CURDIR}/../src -I${LIBXCB}/src \ -DHAVE_CONFIG_H +XCB_LIBS!= pkg-config --libs xcb + +LDADD?= ${XCB_LIBS} + .SUFFIXES: .in .PATH: ${LIBXCB}/src diff --git a/lib/libxcb/libxcb/Makefile b/lib/libxcb/libxcb/Makefile index 10a99a6cf..1c9691407 100644 --- a/lib/libxcb/libxcb/Makefile +++ b/lib/libxcb/libxcb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2009/05/23 08:44:32 matthieu Exp $ +# $OpenBSD: Makefile,v 1.4 2009/05/23 15:08:51 matthieu Exp $ LIB= xcb @@ -26,9 +26,15 @@ SRCS= \ PKGCONFIG= xcb.pc -EXTRA_PKGCONFIG_SUBST= '-e s,@NEEDED@,pthread-stubs xau >= 0.99.2 xdmcp,g' \ +NEEDED= pthread-stubs xau >= 0.99.2 xdmcp + +EXTRA_PKGCONFIG_SUBST= '-e s,@NEEDED@,${NEEDED},g' \ '-e s,@LIBS@,,g' \ +NEEDED_LIBS!= pkg-config --libs "${NEEDED}" + +LDADD= ${NEEDED_LIBS} + install-ext: @echo installing ${EXTHEADERS} in ${INCSDIR}/${HEADER_SUBDIR} cd ${.CURDIR}/../src; for i in ${EXTHEADERS}; do \ |