Module Name: src
Committed By: mrg
Date: Fri May 31 06:48:43 UTC 2013
Modified Files:
src/share/mk: bsd.README bsd.prog.mk
Log Message:
add LIBX11_XCB; unfortunately since the library is named with a -
in it, we have to use an ugly hard coded assignment for now.
(could be cleaned up with more make variable magic i'm sure.)
To generate a diff of this commit:
cvs rdiff -u -r1.316 -r1.317 src/share/mk/bsd.README
cvs rdiff -u -r1.283 -r1.284 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.316 src/share/mk/bsd.README:1.317
--- src/share/mk/bsd.README:1.316 Sun Apr 28 04:44:21 2013
+++ src/share/mk/bsd.README Fri May 31 06:48:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.316 2013/04/28 04:44:21 joerg Exp $
+# $NetBSD: bsd.README,v 1.317 2013/05/31 06:48:43 mrg Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1584,6 +1584,7 @@ DPADD Additional dependencies for the p
LIBICE?= ${DESTDIR}/usr/X11R7/lib/libICE.a
LIBSM?= ${DESTDIR}/usr/X11R7/lib/libSM.a
LIBX11?= ${DESTDIR}/usr/X11R7/lib/libX11.a
+ LIBX11_XCB?= ${DESTDIR}/usr/X11R7/lib/libX11-xcb.a
LIBXTRAP?= ${DESTDIR}/usr/X11R7/lib/libXTrap.a
LIBXAU?= ${DESTDIR}/usr/X11R7/lib/libXau.a
LIBXAW?= ${DESTDIR}/usr/X11R7/lib/libXaw.a
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.283 src/share/mk/bsd.prog.mk:1.284
--- src/share/mk/bsd.prog.mk:1.283 Thu Apr 4 21:14:36 2013
+++ src/share/mk/bsd.prog.mk Fri May 31 06:48:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.283 2013/04/04 21:14:36 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.284 2013/05/31 06:48:43 mrg Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -269,6 +269,9 @@ LIB${_lib:tu}= ${DESTDIR}${X11USRLIBDIR}
.endif
.endfor
+# Ugly one-offs
+LIBX11_XCB= ${DESTDIR}${X11USRLIBDIR}/libX11-xcb.a
+
.if defined(RESCUEDIR)
CPPFLAGS+= -DRESCUEDIR=\"${RESCUEDIR}\"
.endif
