Module Name: src
Committed By: mrg
Date: Mon Aug 23 22:13:27 UTC 2021
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
define variables for the libxcb-* libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.338 -r1.339 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.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.338 src/share/mk/bsd.prog.mk:1.339
--- src/share/mk/bsd.prog.mk:1.338 Sun Aug 15 10:30:39 2021
+++ src/share/mk/bsd.prog.mk Mon Aug 23 22:13:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.338 2021/08/15 10:30:39 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.339 2021/08/23 22:13:27 mrg Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -264,6 +264,14 @@ _X11LIBLIST= dps fntstubs fontcache font
ICE lbxutil SM X11 X11_xcb Xau Xaw xcb Xdmcp Xext Xfont Xfont2 Xft Xi \
Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt XTrap Xtst Xv Xxf86dga \
Xxf86misc Xxf86vm Xcomposite Xdamage Xfixes
+_XCBLIBLIST= \
+ atom aux composite damage dpms dri2 dri3 event glx icccm image keysyms \
+ present property randr record render_util render reply res screensaver \
+ shape shm sync xf86dri xfixes xinerama xinput xkb xtest xv xvmc
+
+# Ugly one-offs
+LIBX11_XCB= ${DESTDIR}${X11USRLIBDIR}/libX11-xcb.a
+LIBXCB= ${DESTDIR}${X11USRLIBDIR}/libxcb.a
.for _lib in ${_X11LIBLIST}
.ifndef LIB${_lib:tu}
@@ -272,9 +280,13 @@ LIB${_lib:tu}= ${DESTDIR}${X11USRLIBDIR}
.endif
.endfor
-# Ugly one-offs
-LIBX11_XCB= ${DESTDIR}${X11USRLIBDIR}/libX11-xcb.a
-LIBXCB= ${DESTDIR}${X11USRLIBDIR}/libxcb.a
+# These ones have "_" in the variable name and "-" in the path.
+.for _lib in ${_XCBLIBLIST}
+.ifndef LIBXCB_${_lib:tu}
+LIBXCB_${_lib:tu}= ${DESTDIR}${X11USRLIBDIR}/libxcb-${_lib}.a
+.MADE: ${LIBXCB_${_lib:tu}} # Note: ${DESTDIR} will be expanded
+.endif
+.endfor
.if defined(RESCUEDIR)
CPPFLAGS+= -DRESCUEDIR=\"${RESCUEDIR}\"
