Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
NetBSD/x11/bin/xdm/config/Makefile

56 lines
1.6 KiB
Makefile
Raw Normal View History

Convert more MACHINE tests to MACHINE_ARCH so it is more obvious what could be sharable per MACHINE_ARCH. Again another selection of mixed amd64/x86_64 tests cleaned up, including one file which was testing MACHINE for both!
2009-02-14 16:48:16 +03:00
# $NetBSD: Makefile,v 1.12 2009/02/14 13:48:17 abs 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-11 22:37:05 +04:00
.include <bsd.own.mk>
CPPSCRIPTS= Xresources Xservers.ws xdm-config
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_Xresources= -DXPM -DBITMAPDIR=${X11INCDIR}/X11/pixmaps \
Use NetBSD logo pixmaps in reachover, too.
2004-11-16 17:42:19 +03:00
-DXDM_PIXMAP=NetBSD.xpm \
-DXDM_BWPIXMAP=NetBSDbw.xpm
DEFAULTVT=vt05 to Xservers.ws generation for i386 only (as native does) XXX should this be given vtXX for other MACHINE's? should resolve pr#24619
2004-03-01 17:56:51 +03:00
mirror change in Imakefiles: provide DEFAULTVT=vt05 for amd64 as well.
2004-04-05 16:21:04 +04:00
# native only gives DEFAULTVT for i386 and amd64.
Convert more MACHINE tests to MACHINE_ARCH so it is more obvious what could be sharable per MACHINE_ARCH. Again another selection of mixed amd64/x86_64 tests cleaned up, including one file which was testing MACHINE for both!
2009-02-14 16:48:16 +03:00
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "cats"
DEFAULTVT=vt05 to Xservers.ws generation for i386 only (as native does) XXX should this be given vtXX for other MACHINE's? should resolve pr#24619
2004-03-01 17:56:51 +03:00
DEFAULTVT=vt05
mirror change in Imakefiles: provide DEFAULTVT=vt05 for amd64 as well.
2004-04-05 16:21:04 +04:00
.else
DEFAULTVT= # defined empty
DEFAULTVT=vt05 to Xservers.ws generation for i386 only (as native does) XXX should this be given vtXX for other MACHINE's? should resolve pr#24619
2004-03-01 17:56:51 +03:00
.endif
CPPSCRIPTFLAGS_Xservers.ws= -DBINDIR=${X11BINDIR} -DDEFAULTVT=${DEFAULTVT}
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_xdm-config= -DXDMDIR=${XDMDIR} \
Use /var/db/xdm (instead of /usr/X11R6/lib/X11/xdm) as the default authDir.
2004-05-12 07:58:47 +04:00
-DXDMAUTHDIR=${XDMVARDIR} \
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
-DXDMLOGDIR=${XDMLOGDIR} \
-DXDMPIDDIR=${XDMPIDDIR} \
Use /var/db/xdm (instead of /usr/X11R6/lib/X11/xdm) as the default authDir.
2004-05-12 07:58:47 +04:00
-DSU="su -m"
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-11 22:37:05 +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
CONFIGFILES= GiveConsole TakeConsole \
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-11 22:37:05 +04:00
Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \
${CPPSCRIPTS}
Use NetBSD logo pixmaps in reachover, too.
2004-11-16 17:42:19 +03:00
FILES= NetBSD.xpm NetBSDbw.xpm NetBSDinv.xpm \
XFree86.xpm XFree86bw.xpm
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
FILESDIR= ${XDMDIR}
Use NetBSD logo pixmaps in reachover, too.
2004-11-16 17:42:19 +03:00
FILESDIR_NetBSD.xpm= ${X11INCDIR}/X11/pixmaps
FILESDIR_NetBSDbw.xpm= ${X11INCDIR}/X11/pixmaps
FILESDIR_NetBSDinv.xpm= ${X11INCDIR}/X11/pixmaps
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
FILESDIR_XFree86.xpm= ${X11INCDIR}/X11/pixmaps
FILESDIR_XFree86bw.xpm= ${X11INCDIR}/X11/pixmaps
Install the following as executable scripts: GiveConsole TakeConsole Xsetup_0 Xsession Xwilling Should fix issue raised by Ian P. Thomas on <netbsd-users>.
2004-08-19 05:30:33 +04:00
FILESMODE_GiveConsole= ${BINMODE}
FILESMODE_TakeConsole= ${BINMODE}
FILESMODE_Xsetup_0= ${BINMODE}
FILESMODE_Xsession= ${BINMODE}
FILESMODE_Xwilling= ${BINMODE}
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-11 22:37:05 +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
CONFIGSYMLINKS= Xservers.ws ${XDMDIR}/Xservers
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-11 22:37:05 +04:00
Change `LNFILES' to `BUILDSYMLINKS', to more accurately describe its purpose. Per discussion with Simon Gerraty.
2003-09-20 10:20:41 +04:00
BUILDSYMLINKS= Xres.cpp Xresources.cpp \
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-11 22:37:05 +04:00
Xserv.ws.cpp Xservers.ws.cpp \
xdm-conf.cpp xdm-config.cpp
.PATH: ${X11SRCDIR.xc}/programs/xdm/config
Define CHOOSERPATH to /usr/X11R6/libexec/chooser, and use appropriately.
2004-01-02 20:19:51 +03:00
.include "../Makefile.xdm"
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_xdm-config+= -DCHOOSERPATH=${XDMCHOOSERPATH}
Define CHOOSERPATH to /usr/X11R6/libexec/chooser, and use appropriately.
2004-01-02 20:19:51 +03:00
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-11 22:37:05 +04:00
.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>