Module Name: src
Committed By: mrg
Date: Fri May 31 06:47:31 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xdpyinfo: Makefile
Log Message:
convert to generated config.h. add libX11-xcb.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xdpyinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdpyinfo/Makefile
diff -u src/external/mit/xorg/bin/xdpyinfo/Makefile:1.4 src/external/mit/xorg/bin/xdpyinfo/Makefile:1.5
--- src/external/mit/xorg/bin/xdpyinfo/Makefile:1.4 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/xdpyinfo/Makefile Fri May 31 06:47:31 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/05/31 06:24:05 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2013/05/31 06:47:31 mrg Exp $
.include <bsd.own.mk>
@@ -6,13 +6,14 @@
PROG= xdpyinfo
-CPPFLAGS+=-DMITSHM -DXKB -DXINPUT -DXRENDER
-CPPFLAGS+=-DPANORAMIX -DXF86VIDMODE -DXFreeXDGA -DXF86MISC
+CPPFLAGS+=-I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
-LDADD+= -lXtst -lXi -lXrender -lXinerama \
- -lXxf86vm -lXxf86dga -lXxf86misc -lXext -lX11
-DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER} ${LIBXINERAMA} \
- ${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXEXT} ${LIBX11}
+LDADD+= -lXtst -lXi -lXrender -lXinerama -lXcomposite \
+ -lXxf86vm -lXxf86dga -lXxf86misc -lXext -lX11 \
+ -lX11-xcb
+DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER} ${LIBXINERAMA} ${LIBXCOMPOSITE} \
+ ${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXXF86MISC} ${LIBXEXT} ${LIBX11} \
+ ${LIBX11XCB}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
