Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
710cfd7aef
NetBSD/x11/bin/xinit/Makefile

37 lines
902 B
Makefile
Raw Normal View History

Radically overhaul X11 configuration: * End user modifiable configuration has moved from /usr/X11R6/lib/X11/<someprog> to /etc/X11/<someprog> This is consistent with our own policies as well as other projects. The files & directories that were moved have _NOT_ been marked `obsolete', as they contain user configuration and therefore we don't want the automatic "obsolete file removal" mechanism to remove them. * The /etc/font/* and /etc/X11/* configuration files are installed with 'configinstall' (not 'install'), using CONFIGFILES and CONFIGSYMLINKS. This is so that a normal 'make build' in src/x11 will not trash your configuration. * A 'distribution' target has been added to src/x11 to perform 'make configinstall' in the appropriate subdirectories. (Should we consider making 'configinstall' a first-class target?) * The xdm pixmaps have have been moved to /usr/X11R6/include/X11/pixmaps where the other pixmaps are. (I don't consider these pictures end-user configuration). IMPORTANT NOTE: * These changes require an up to date xsrc, and 'make cleandir' should be performed in src/x11 before a build for the changes to fully take effect.
2004-05-16 14:25:13 +04:00
# $NetBSD: Makefile,v 1.5 2004/05/16 10:25:14 lukem Exp $
Imakeicide-II: reach-over makefile infrastructure to build XFree86 4.x (from /usr/xsrc) using bsd-style Makefiles. Why? - sane cross building - easy builds from read only source - non-root building - imake is evil nuff said.
2003-09-12 06:49:56 +04:00
.include <bsd.own.mk>
- -DXFREE86 if we build an XFree86 server. - use /dev/urandom & hexdump to generate cookies. mostly as-is from PR#25239. XXX the #ifdef XFREE86 line in xinit.c is simply for an error message to XXX include the text "XFree86 XFree86 displays" in an array of char *, XXX that is used to display an error message. i think nearly all the XXX netbsd servers need to optionally be added to this list....
2004-04-24 07:42:07 +04:00
.include "../../Xserver/Makefile.common"
Imakeicide-II: reach-over makefile infrastructure to build XFree86 4.x (from /usr/xsrc) using bsd-style Makefiles. Why? - sane cross building - easy builds from read only source - non-root building - imake is evil nuff said.
2003-09-12 06:49:56 +04:00
PROG= xinit
MAN= xinit.1 startx.1
Radically overhaul X11 configuration: * End user modifiable configuration has moved from /usr/X11R6/lib/X11/<someprog> to /etc/X11/<someprog> This is consistent with our own policies as well as other projects. The files & directories that were moved have _NOT_ been marked `obsolete', as they contain user configuration and therefore we don't want the automatic "obsolete file removal" mechanism to remove them. * The /etc/font/* and /etc/X11/* configuration files are installed with 'configinstall' (not 'install'), using CONFIGFILES and CONFIGSYMLINKS. This is so that a normal 'make build' in src/x11 will not trash your configuration. * A 'distribution' target has been added to src/x11 to perform 'make configinstall' in the appropriate subdirectories. (Should we consider making 'configinstall' a first-class target?) * The xdm pixmaps have have been moved to /usr/X11R6/include/X11/pixmaps where the other pixmaps are. (I don't consider these pictures end-user configuration). IMPORTANT NOTE: * These changes require an up to date xsrc, and 'make cleandir' should be performed in src/x11 before a build for the changes to fully take effect.
2004-05-16 14:25:13 +04:00
XINITDIR= ${X11ETCDIR}/xinit
- -DXFREE86 if we build an XFree86 server. - use /dev/urandom & hexdump to generate cookies. mostly as-is from PR#25239. XXX the #ifdef XFREE86 line in xinit.c is simply for an error message to XXX include the text "XFree86 XFree86 displays" in an array of char *, XXX that is used to display an error message. i think nearly all the XXX netbsd servers need to optionally be added to this list....
2004-04-24 07:42:07 +04:00
CPPFLAGS+= -DHAS_VFORK ${X11FLAGS.CONNECTION} -DBINDIR=\"${X11BINDIR}\" \
.if ${XSERVER_XFREE86} != "no"
CPPFLAGS+= -DXFREE86
.endif
Imakeicide-II: reach-over makefile infrastructure to build XFree86 4.x (from /usr/xsrc) using bsd-style Makefiles. Why? - sane cross building - easy builds from read only source - non-root building - imake is evil nuff said.
2003-09-12 06:49:56 +04:00
CPPSCRIPTS= startx xinitrc
Radically overhaul X11 configuration: * End user modifiable configuration has moved from /usr/X11R6/lib/X11/<someprog> to /etc/X11/<someprog> This is consistent with our own policies as well as other projects. The files & directories that were moved have _NOT_ been marked `obsolete', as they contain user configuration and therefore we don't want the automatic "obsolete file removal" mechanism to remove them. * The /etc/font/* and /etc/X11/* configuration files are installed with 'configinstall' (not 'install'), using CONFIGFILES and CONFIGSYMLINKS. This is so that a normal 'make build' in src/x11 will not trash your configuration. * A 'distribution' target has been added to src/x11 to perform 'make configinstall' in the appropriate subdirectories. (Should we consider making 'configinstall' a first-class target?) * The xdm pixmaps have have been moved to /usr/X11R6/include/X11/pixmaps where the other pixmaps are. (I don't consider these pictures end-user configuration). IMPORTANT NOTE: * These changes require an up to date xsrc, and 'make cleandir' should be performed in src/x11 before a build for the changes to fully take effect.
2004-05-16 14:25:13 +04:00
CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR}
CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
- -DXFREE86 if we build an XFree86 server. - use /dev/urandom & hexdump to generate cookies. mostly as-is from PR#25239. XXX the #ifdef XFREE86 line in xinit.c is simply for an error message to XXX include the text "XFree86 XFree86 displays" in an array of char *, XXX that is used to display an error message. i think nearly all the XXX netbsd servers need to optionally be added to this list....
2004-04-24 07:42:07 +04:00
-DHAS_COOKIE_MAKER \
-DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
Imakeicide-II: reach-over makefile infrastructure to build XFree86 4.x (from /usr/xsrc) using bsd-style Makefiles. Why? - sane cross building - easy builds from read only source - non-root building - imake is evil nuff said.
2003-09-12 06:49:56 +04:00
SCRIPTS= startx
Radically overhaul X11 configuration: * End user modifiable configuration has moved from /usr/X11R6/lib/X11/<someprog> to /etc/X11/<someprog> This is consistent with our own policies as well as other projects. The files & directories that were moved have _NOT_ been marked `obsolete', as they contain user configuration and therefore we don't want the automatic "obsolete file removal" mechanism to remove them. * The /etc/font/* and /etc/X11/* configuration files are installed with 'configinstall' (not 'install'), using CONFIGFILES and CONFIGSYMLINKS. This is so that a normal 'make build' in src/x11 will not trash your configuration. * A 'distribution' target has been added to src/x11 to perform 'make configinstall' in the appropriate subdirectories. (Should we consider making 'configinstall' a first-class target?) * The xdm pixmaps have have been moved to /usr/X11R6/include/X11/pixmaps where the other pixmaps are. (I don't consider these pictures end-user configuration). IMPORTANT NOTE: * These changes require an up to date xsrc, and 'make cleandir' should be performed in src/x11 before a build for the changes to fully take effect.
2004-05-16 14:25:13 +04:00
CONFIGFILES= xinitrc
FILESDIR= ${XINITDIR}
Imakeicide-II: reach-over makefile infrastructure to build XFree86 4.x (from /usr/xsrc) using bsd-style Makefiles. Why? - sane cross building - easy builds from read only source - non-root building - imake is evil nuff said.
2003-09-12 06:49:56 +04:00
Don't rely upon -lXmuu's internal dependancy upon -lXt -lSM -lICE and link these explicitly. Why: - on my main system i get intermittent link errors with ICE and Xt missing various libc symbols with the implicit link of these libs - it also works for static linking
2003-09-14 01:50:50 +04:00
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
Imakeicide-II: reach-over makefile infrastructure to build XFree86 4.x (from /usr/xsrc) using bsd-style Makefiles. Why? - sane cross building - easy builds from read only source - non-root building - imake is evil nuff said.
2003-09-12 06:49:56 +04:00
Radically overhaul X11 configuration: * End user modifiable configuration has moved from /usr/X11R6/lib/X11/<someprog> to /etc/X11/<someprog> This is consistent with our own policies as well as other projects. The files & directories that were moved have _NOT_ been marked `obsolete', as they contain user configuration and therefore we don't want the automatic "obsolete file removal" mechanism to remove them. * The /etc/font/* and /etc/X11/* configuration files are installed with 'configinstall' (not 'install'), using CONFIGFILES and CONFIGSYMLINKS. This is so that a normal 'make build' in src/x11 will not trash your configuration. * A 'distribution' target has been added to src/x11 to perform 'make configinstall' in the appropriate subdirectories. (Should we consider making 'configinstall' a first-class target?) * The xdm pixmaps have have been moved to /usr/X11R6/include/X11/pixmaps where the other pixmaps are. (I don't consider these pictures end-user configuration). IMPORTANT NOTE: * These changes require an up to date xsrc, and 'make cleandir' should be performed in src/x11 before a build for the changes to fully take effect.
2004-05-16 14:25:13 +04:00
X11EXTRAMANDEFS=-D__xinitdir__=${XINITDIR}
Imakeicide-II: reach-over makefile infrastructure to build XFree86 4.x (from /usr/xsrc) using bsd-style Makefiles. Why? - sane cross building - easy builds from read only source - non-root building - imake is evil nuff said.
2003-09-12 06:49:56 +04:00
.PATH: ${X11SRCDIR.xc}/programs/${PROG}
.include <bsd.x11.mk>
Rework to include <bsd.x11.mk> before all other <bsd.*.mk> _except_ <bsd.own.mk>, as we now set BINDIR,LIBDIR,MANDIR in <bsd.x11.mk> rather than using a hierarchy of Makefile.inc files just to include x11/Makefile.inc to get those variables.
2003-09-14 00:17:57 +04:00
.include <bsd.prog.mk>
Reference in New Issue Copy Permalink