diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-05-31 18:01:29 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-05-31 18:01:29 +0000 |
| commit | 0c6d6a83ff990307af452ce9cf370cf32a78ef30 (patch) | |
| tree | e69d809e2459b78492c1af1e28443b5dcfbdd0af /lib/xcb-util | |
| parent | 165fb2bfdea2998f1b9f57124a0f56380a04f19d (diff) | |
Don't use != to call pkg-config in Makefiles. It's slow and generates
tons of warnings if stuff isn't installed yet.
Diffstat (limited to 'lib/xcb-util')
| -rw-r--r-- | lib/xcb-util/Makefile.inc | 6 | ||||
| -rw-r--r-- | lib/xcb-util/icccm/Makefile | 4 | ||||
| -rw-r--r-- | lib/xcb-util/image/Makefile | 4 | ||||
| -rw-r--r-- | lib/xcb-util/property/Makefile | 4 | ||||
| -rw-r--r-- | lib/xcb-util/renderutil/Makefile | 4 |
5 files changed, 10 insertions, 12 deletions
diff --git a/lib/xcb-util/Makefile.inc b/lib/xcb-util/Makefile.inc index 069b95a45..be99e720e 100644 --- a/lib/xcb-util/Makefile.inc +++ b/lib/xcb-util/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.1 2009/05/23 14:43:12 matthieu Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2009/05/31 18:01:28 matthieu Exp $ XCBUTIL= ${.CURDIR}/../../../dist/xcb-util @@ -16,9 +16,7 @@ LIB?= xcb-${SUBLIB} _SRCDIR?= ${XCBUTIL}/${SUBLIB} PKGCONFIG?= xcb-${SUBLIB}.pc -LIBADD!= pkg-config --libs xcb - -LDADD?= ${LIBADD} +LDADD?= `pkg-config --libs xcb` .PATH: ${XCBUTIL}/${SUBLIB} diff --git a/lib/xcb-util/icccm/Makefile b/lib/xcb-util/icccm/Makefile index 31e04122b..0cfde5715 100644 --- a/lib/xcb-util/icccm/Makefile +++ b/lib/xcb-util/icccm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2009/05/23 14:43:12 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2009/05/31 18:01:28 matthieu Exp $ SUBLIB= icccm @@ -8,7 +8,7 @@ CPPFLAGS= -I${XCBUTIL}/property -I${XCBUTIL}/event -I${XCBUTIL}/atom HEADERS= xcb_icccm.h -LDADD!= pkg-config --libs xcb-atom xcb-event xcb-property +LDADD= `pkg-config --libs xcb-atom xcb-event xcb-property` .include <bsd.lib.mk> .include <bsd.xorg.mk> diff --git a/lib/xcb-util/image/Makefile b/lib/xcb-util/image/Makefile index d50d6f464..f5a830af8 100644 --- a/lib/xcb-util/image/Makefile +++ b/lib/xcb-util/image/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2009/05/23 14:43:12 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2009/05/31 18:01:28 matthieu Exp $ SUBLIB= image @@ -6,7 +6,7 @@ SRCS= xcb_image.c HEADERS= xcb_image.h xcb_pixel.h -LDADD!= pkg-config --libs xcb xcb-shm xcb-aux +LDADD= `pkg-config --libs xcb xcb-shm xcb-aux` .include <bsd.lib.mk> .include <bsd.xorg.mk> diff --git a/lib/xcb-util/property/Makefile b/lib/xcb-util/property/Makefile index a385fffb3..4357c9818 100644 --- a/lib/xcb-util/property/Makefile +++ b/lib/xcb-util/property/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2009/05/23 14:43:12 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2009/05/31 18:01:28 matthieu Exp $ SUBLIB= property @@ -8,7 +8,7 @@ CPPFLAGS= -I${XCBUTIL}/event HEADERS= xcb_property.h -LDADD!= pkg-config --libs xcb xcb-event +LDADD= `pkg-config --libs xcb xcb-event` .include <bsd.lib.mk> .include <bsd.xorg.mk> diff --git a/lib/xcb-util/renderutil/Makefile b/lib/xcb-util/renderutil/Makefile index 9096ec34a..dbf2d1b7c 100644 --- a/lib/xcb-util/renderutil/Makefile +++ b/lib/xcb-util/renderutil/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2009/05/23 14:43:12 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2009/05/31 18:01:28 matthieu Exp $ LIB= xcb-render-util @@ -8,7 +8,7 @@ SRCS= cache.c glyph.c util.c HEADERS= xcb_renderutil.h -LDADD!= pkg-config --libs xcb xcb-render +LDADD= `pkg-config --libs xcb xcb-render` .include <bsd.lib.mk> .include <bsd.xorg.mk> |