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.
51 lines
1.5 KiB
Makefile
51 lines
1.5 KiB
Makefile
# $NetBSD: Makefile,v 1.6 2004/05/16 10:25:14 lukem Exp $
|
|
|
|
.include <bsd.own.mk>
|
|
|
|
PROG= lbxproxy
|
|
|
|
|
|
.PATH: ${X11SRCDIR.xc}/programs/${PROG}/di
|
|
SRCS+= atomcache.c cache.c cmap.c cmaputil.c dispatch.c extensions.c \
|
|
gfx.c globals.c init.c lbxfuncs.c lbxutil.c main.c options.c \
|
|
pm.c props.c reqtype.c resource.c swaprep.c swapreq.c \
|
|
tables.c tags.c unsquish.c utils.c wire.c zeropad.c
|
|
|
|
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
|
|
-I${DESTDIR}${X11INCDIR}/X11/extensions \
|
|
-I${X11SRCDIR.xc}/programs/${PROG}/include \
|
|
${X11FLAGS.SERVER}
|
|
|
|
LBXPROXYDIR= ${X11ETCDIR}/lbxproxy
|
|
|
|
CPPFLAGS.dispatch.c= ${X11FLAGS.EXTENSION}
|
|
CPPFLAGS.utils.c= -DDEF_ATOMS_FILE=\"${LBXPROXYDIR}/AtomControl\" \
|
|
-DRGB_DB=\"${X11LIBDIR}/rgb\"
|
|
|
|
|
|
.PATH: ${X11SRCDIR.xc}/programs/${PROG}/os
|
|
.PATH: ${X11SRCDIR.xc}/lib/xtrans
|
|
SRCS.os= WaitFor.c connection.c io.c osinit.c transport.c
|
|
SRCS+= ${SRCS.os}
|
|
.for _S in ${SRCS.os}
|
|
CPPFLAGS.${_S}= ${X11FLAGS.CONNECTION} \
|
|
${X11FLAGS.OS_DEFINES}
|
|
.endfor
|
|
|
|
CPPFLAGS.connection.c+= -DLBXPROXY_t -DTRANS_SERVER -DBSD44SOCKETS
|
|
CPPFLAGS.io.c+= -DLBXPROXY_t -DTRANS_SERVER ${X11FLAGS.EXTENSION}
|
|
CPPFLAGS.transport.c+= -DLBXPROXY_t -DTRANS_SERVER -DBSD44SOCKETS \
|
|
-I${X11SRCDIR.xc}/lib/xtrans
|
|
|
|
.PATH: ${X11SRCDIR.xc}/programs/${PROG}/config
|
|
CONFIGFILES= AtomControl
|
|
FILESDIR= ${LBXPROXYDIR}
|
|
|
|
LDADD+= -llbxutil -lICE -lXext -lX11 -lz
|
|
DPADD+= ${LIBLBXUTIL} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBZ}
|
|
|
|
.PATH: ${X11SRCDIR.xc}/programs/${PROG}
|
|
|
|
.include <bsd.x11.mk>
|
|
.include <bsd.prog.mk>
|