Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use ${PRINTX11VERSION}

This commit is contained in:
rtr 2004-02-06 11:58:56 +00:00
parent a7e3a7b9ff
commit 5ce86a019f
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/Xserver/dix/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2004/01/25 05:22:27 mhitch Exp $
# $NetBSD: Makefile,v 1.7 2004/02/06 11:58:56 rtr Exp $
.include "../Makefile.serverlib"
@ -14,6 +14,7 @@ SRCS= atom.c colormap.c cursor.c devices.c dispatch.c dixutils.c \
main.c property.c resource.c swaprep.c swapreq.c tables.c \
window.c initatoms.c dixfonts.c privates.c pixmap.c
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xc}/include/fonts \
@ -21,16 +22,18 @@ CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/include \
-I${X11SRCDIR.xc}/programs/Xserver/Xext \
-I${X11SRCDIR.xc}/programs/Xserver/lbx
CPPFLAGS.globals.c= -DCOMPILEDDEFAULTFONTPATH=\"${X11FONTDIR}/misc/,${X11FONTDIR}/Speedo/,${X11FONTDIR}/Type1/,${X11FONTDIR}/CID/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/\" \
-DRGB_DB=\"${X11LIBDIR}/rgb\"
CPPFLAGS.main.c= -DVENDOR_STRING="\"The XFree86 Project, Inc\"" \
-DVENDOR_RELEASE="(((4) * 10000000) + (( 3) * 100000) + (( 0) * 1000) + 0)"
-DVENDOR_RELEASE="${XVERSION}"
COPTS.gc.c= -Wno-error # XXX gcc 3.3
COPTS.window.c= -Wno-error # XXX gcc 3.3
.include <bsd.x11.mk>
XVERSION!= ${PRINTX11VERSION}
.include <bsd.lib.mk>
.include <bsd.subdir.mk>

5
x11/Xserver/hw/xfree86/bin/xf86config/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2003/12/26 05:23:15 rtr Exp $
# $NetBSD: Makefile,v 1.2 2004/02/06 11:58:56 rtr Exp $
.include <bsd.own.mk>
@ -14,7 +14,7 @@ DPADD= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
CPPFLAGS+= -DCARD_DATABASE_FILE='"${X11INCDIR}/X11/Cards"' \
-DXKB_RULES_DIR=\"${X11INCDIR}/X11/xkb/rules\" \
-DXCONFIGFILE=\"XF86Config\" \
-DXVERSION="(((4) * 10000000) + (( 3) * 100000) + (( 0) * 1000) + 0)" \
-DXVERSION="${XVERSION}" \
-DWSCONS_SUPPORT
.if ${MACHINE} == "i386"
@ -22,4 +22,5 @@ CPPFLAGS+= -DPCCONS_SUPPORT -DPCVT_SUPPORT
.endif
.include <bsd.x11.mk>
XVERSION!= ${PRINTX11VERSION}
.include <bsd.prog.mk>

5
x11/Xserver/hw/xfree86/xf86config/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2003/12/24 12:44:17 rtr Exp $
# $NetBSD: Makefile,v 1.3 2004/02/06 11:58:56 rtr Exp $
XTODO= cpconfig
@ -24,8 +24,9 @@ CPPFLAGS= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
CPPFLAGS.scan.c= -DXCONFIGDIR=\"/usr/X11R6/lib/X11\" \
-DXCONFIGFILE=\"XF86Config\" \
-DXVERSION="(((4) * 10000000) + (( 3) * 100000) + (( 0) * 1000) + 0)"
-DXVERSION="${XVERSION}"
.include <bsd.x11.mk>
XVERSION!= ${PRINTX11VERSION}
LIBDIR=${X11USRLIBDIR}
.include <bsd.lib.mk>