From 0c6d6a83ff990307af452ce9cf370cf32a78ef30 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Sun, 31 May 2009 18:01:29 +0000
Subject: Don't use != to call pkg-config in Makefiles. It's slow and generates
 tons of warnings if stuff isn't installed yet.

---
 lib/libxcb/Makefile.inc    | 6 ++----
 lib/libxcb/libxcb/Makefile | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'lib/libxcb')

diff --git a/lib/libxcb/Makefile.inc b/lib/libxcb/Makefile.inc
index 27e5e1ec2..576e7c896 100644
--- a/lib/libxcb/Makefile.inc
+++ b/lib/libxcb/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.4 2009/05/23 15:08:50 matthieu Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 2009/05/31 18:01:28 matthieu Exp $
 
 LIBXCB=	${.CURDIR}/../../../dist/libxcb
 
@@ -6,9 +6,7 @@ CPPFLAGS=	-I${X11BASE}/include \
 		-I${.CURDIR}/../src -I${LIBXCB}/src \
 		-DHAVE_CONFIG_H
 
-XCB_LIBS!=	pkg-config --libs xcb
-
-LDADD?=		${XCB_LIBS}
+LDADD?=		`pkg-config --libs xcb`
 
 .SUFFIXES: .in
 
diff --git a/lib/libxcb/libxcb/Makefile b/lib/libxcb/libxcb/Makefile
index 1c9691407..ee9382429 100644
--- a/lib/libxcb/libxcb/Makefile
+++ b/lib/libxcb/libxcb/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2009/05/23 15:08:51 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.5 2009/05/31 18:01:28 matthieu Exp $
 
 LIB=		xcb
 
@@ -31,9 +31,7 @@ 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}
+LDADD=		`pkg-config --libs "${NEEDED}"`
 
 install-ext:
 	@echo installing ${EXTHEADERS} in ${INCSDIR}/${HEADER_SUBDIR}
-- 
cgit v1.2.3