qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't use != to call pkg-config in Makefiles. It's slow and generates

Browse Source 
tons of warnings if stuff isn't installed yet.
This commit is contained in:
matthieu 2009-05-31 18:01:28 +00:00
parent f3b20b10a0
commit ced3b52794
7 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libxcb/Makefile.inc
View File

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

6
lib/libxcb/libxcb/Makefile
View File

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

6
lib/xcb-util/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.1.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}

4
lib/xcb-util/icccm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.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>

4
lib/xcb-util/image/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.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>

4
lib/xcb-util/property/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.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>

4
lib/xcb-util/renderutil/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.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>