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.
81 lines
1.8 KiB
Makefile
81 lines
1.8 KiB
Makefile
# $NetBSD: Makefile,v 1.12 2004/05/16 10:25:14 lukem Exp $
|
|
|
|
.include <bsd.own.mk>
|
|
|
|
SUBDIR= tools include lib bin share Xserver
|
|
|
|
.if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
|
|
BUILDTARGETS+= cleandir
|
|
.endif
|
|
.if ${MKOBJDIRS} != "no"
|
|
BUILDTARGETS+= obj
|
|
.endif
|
|
.if !defined(NOINCLUDES)
|
|
BUILDTARGETS+= includes
|
|
.endif
|
|
BUILDTARGETS+= do-tools
|
|
BUILDTARGETS+= do-lib-X11 do-lib-ICE do-lib-Xau
|
|
BUILDTARGETS+= do-lib-SM do-lib-Xext
|
|
BUILDTARGETS+= do-lib-Xt do-lib-Xpm do-lib-Xrender do-lib-GL
|
|
BUILDTARGETS+= do-lib-Xmu do-lib-dps do-lib-expat
|
|
BUILDTARGETS+= do-lib
|
|
BUILDTARGETS+= do-build
|
|
|
|
.ORDER: ${BUILDTARGETS}
|
|
|
|
START_TIME!= date
|
|
|
|
build: check_X11SRCDIR
|
|
@echo "X11 build started at: ${START_TIME}"
|
|
.for tgt in ${BUILDTARGETS}
|
|
${MAKEDIRTARGET} . ${tgt}
|
|
.endfor
|
|
@echo "X11 build started at: ${START_TIME}"
|
|
@printf "X11 build finished at: " && date
|
|
|
|
do-build:
|
|
.for targ in dependall install
|
|
${MAKEDIRTARGET} . ${targ}
|
|
.endfor
|
|
|
|
.for dir in tools lib/X11 lib/ICE lib/Xau lib/SM lib/Xext lib/Xt lib/Xpm \
|
|
lib/Xrender lib/GL lib/Xmu lib/dps lib/expat lib
|
|
do-${dir:S/\//-/g}:
|
|
. for targ in dependall install
|
|
${MAKEDIRTARGET} ${dir} ${targ}
|
|
. endfor
|
|
.endfor
|
|
|
|
afterinstall: .PHONY
|
|
.if ${MKMAN} != "no"
|
|
${MAKEDIRTARGET} ${NETBSDSRCDIR}/share/man makedb \
|
|
WHATISDBDIR=${X11MANDIR}
|
|
.endif
|
|
|
|
|
|
DISTRIBTARGETS= Xserver/Xext/ext \
|
|
bin/lbxproxy bin/proxymngr bin/rstart bin/twm \
|
|
bin/xdm/config bin/xfs bin/xinit bin/xsm \
|
|
lib/fontconfig/etc
|
|
|
|
distribution: check_X11SRCDIR
|
|
.for tgt in ${DISTRIBTARGETS}
|
|
${MAKEDIRTARGET} ${tgt} configinstall
|
|
.endfor
|
|
|
|
|
|
check_X11SRCDIR: .PHONY .NOTMAIN
|
|
.if !defined(X11SRCDIR)
|
|
@echo
|
|
@echo "ERROR: setenv X11SRCDIR before doing that!"
|
|
@false
|
|
.elif !exists(${X11SRCDIR.xc})
|
|
@echo
|
|
@echo "ERROR: X11SRCDIR.xc \`${X11SRCDIR.xc}' does not exist"
|
|
@false
|
|
.else
|
|
@true
|
|
.endif
|
|
|
|
.include <bsd.subdir.mk>
|