10cfcae8fc
* 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.
59 lines
1.8 KiB
Makefile
59 lines
1.8 KiB
Makefile
# $NetBSD: Makefile,v 1.7 2004/05/16 10:25:14 lukem Exp $
|
|
|
|
.include <bsd.own.mk>
|
|
|
|
PROG= xfs
|
|
|
|
.PATH: ${X11SRCDIR.xc}/programs/${PROG}/difs
|
|
SRCS= atom.c cache.c charinfo.c difsutils.c dispatch.c events.c \
|
|
extensions.c fontinfo.c fonts.c globals.c initfonts.c main.c \
|
|
resource.c swaprep.c swapreq.c tables.c
|
|
|
|
.PATH: ${X11SRCDIR.xc}/programs/${PROG}/os
|
|
SRCS+= access.c config.c connection.c daemon.c error.c io.c osglue.c \
|
|
osinit.c utils.c waitfor.c
|
|
|
|
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/xfs/include \
|
|
-I${X11SRCDIR.xc}/include/fonts \
|
|
-I${X11SRCDIR.xc}/lib/font/include \
|
|
-I${X11SRCDIR.xc}/lib/font/bitmap
|
|
|
|
CONN_DEFINES= ${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_SERVER \
|
|
-DTRANS_REOPEN
|
|
|
|
XFSCONFIGDIR= ${X11ETCDIR}/fs
|
|
|
|
CPPFLAGS.main.c= -DDEFAULT_CONFIG_FILE=\"${XFSCONFIGDIR}/config\"
|
|
CPPFLAGS.initfonts.c= -DFONT_PCF -DFONT_FS -DFONT_SPEEDO -DFONTCACHE
|
|
CPPFLAGS.connection.c= ${CONN_DEFINES} -DBSD44SOCKETS \
|
|
${X11FLAGS.OS_DEFINES}
|
|
CPPFLAGS.utils.c= -DXFSPIDDIR=\"/var/run\"
|
|
CPPFLAGS.io.c= ${CONN_DEFINES}
|
|
CPPFLAGS.waitfor.c= ${CONN_DEFINES}
|
|
CPPFLAGS.error.c= -DUSE_SYSLOG
|
|
CPPFLAGS.osglue.c= ${CONN_DEFINES} \
|
|
${X11FLAGS.OS_DEFINES}
|
|
CPPFLAGS.config.c= ${CONN_DEFINES} -DFONTCACHE
|
|
|
|
X11EXTRAMANDEFS+= -DDEFAULT_CONFIG_FILE=${XFSCONFIGDIR}/config
|
|
|
|
|
|
BUILDSYMLINKS= config.cpp fsconfig.cpp
|
|
CPPSCRIPTS= fsconfig
|
|
CPPSCRIPTFLAGS= -DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Speedo/,${X11FONTDIR}/Type1/,${X11FONTDIR}/CID/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \
|
|
-DFSERRORS=/var/log/xfs.log
|
|
|
|
CONFIGFILES= fsconfig
|
|
FILESNAME= config
|
|
FILESDIR= ${XFSCONFIGDIR}
|
|
|
|
|
|
LDADD+= -lXfont -lfntstubs -lXfontcache -lXext -lX11 -lfreetype -lm -lz
|
|
DPADD+= ${LIBXFONT} ${LIBFNTSTUBS} ${LIBXFONTCACHE} ${LIBXEXT} ${LIBX11} \
|
|
${LIBFREETYPE} ${LIBM} ${LIBZ}
|
|
|
|
.PATH: ${X11SRCDIR.xc}/programs/${PROG}
|
|
|
|
.include <bsd.x11.mk>
|
|
.include <bsd.prog.mk>
|