head	1.44;
access;
symbols
	netbsd-6-1:1.44.0.20
	netbsd-6-0-2-RELEASE:1.44
	netbsd-6-1-RELEASE:1.44
	netbsd-6-1-RC4:1.44
	netbsd-6-1-RC3:1.44
	netbsd-6-1-RC2:1.44
	netbsd-6-1-RC1:1.44
	netbsd-5-2:1.44.0.18
	netbsd-6-0-1-RELEASE:1.44
	netbsd-5-2-RELEASE:1.44
	netbsd-5-2-RC1:1.44
	netbsd-6-0:1.44.0.16
	netbsd-6-0-RELEASE:1.44
	netbsd-6-0-RC2:1.44
	netbsd-6-0-RC1:1.44
	netbsd-6:1.44.0.14
	netbsd-6-base:1.44
	netbsd-5-1-2-RELEASE:1.44
	netbsd-5-1-1-RELEASE:1.44
	netbsd-5-1:1.44.0.12
	netbsd-5-1-RELEASE:1.44
	netbsd-5-1-RC4:1.44
	netbsd-5-1-RC3:1.44
	netbsd-5-1-RC2:1.44
	netbsd-5-1-RC1:1.44
	netbsd-5-0-2-RELEASE:1.44
	netbsd-5-0-1-RELEASE:1.44
	netbsd-5-0:1.44.0.10
	netbsd-5-0-RELEASE:1.44
	netbsd-5-0-RC4:1.44
	netbsd-5-0-RC3:1.44
	netbsd-5-0-RC2:1.44
	netbsd-5-0-RC1:1.44
	netbsd-5:1.44.0.8
	netbsd-5-base:1.44
	netbsd-4-0-1-RELEASE:1.44
	netbsd-4-0:1.44.0.6
	netbsd-4-0-RELEASE:1.44
	netbsd-4-0-RC5:1.44
	netbsd-4-0-RC4:1.44
	netbsd-4-0-RC3:1.44
	netbsd-4-0-RC2:1.44
	netbsd-4-0-RC1:1.44
	netbsd-3-1-1-RELEASE:1.43.2.1
	netbsd-3-0-3-RELEASE:1.43.2.1
	abandoned-netbsd-4-base:1.44
	abandoned-netbsd-4:1.44.0.2
	netbsd-3-1:1.43.2.1.0.4
	netbsd-3-1-RELEASE:1.43.2.1
	netbsd-3-0-2-RELEASE:1.43.2.1
	netbsd-3-1-RC4:1.43.2.1
	netbsd-3-1-RC3:1.43.2.1
	netbsd-3-1-RC2:1.43.2.1
	netbsd-3-1-RC1:1.43.2.1
	netbsd-4:1.44.0.4
	netbsd-4-base:1.44
	netbsd-3-0-1-RELEASE:1.43.2.1
	netbsd-3-0:1.43.2.1.0.2
	netbsd-3-0-RELEASE:1.43.2.1
	netbsd-3-0-RC6:1.43.2.1
	netbsd-3-0-RC5:1.43.2.1
	netbsd-3-0-RC4:1.43.2.1
	netbsd-3-0-RC3:1.43.2.1
	netbsd-3-0-RC2:1.43.2.1
	netbsd-3-0-RC1:1.43.2.1
	netbsd-2-0-3-RELEASE:1.41.2.1
	netbsd-2-1:1.41.2.1.0.4
	netbsd-2-1-RELEASE:1.41.2.1
	netbsd-2-1-RC6:1.41.2.1
	netbsd-2-1-RC5:1.41.2.1
	netbsd-2-1-RC4:1.41.2.1
	netbsd-2-1-RC3:1.41.2.1
	netbsd-2-1-RC2:1.41.2.1
	netbsd-2-1-RC1:1.41.2.1
	netbsd-2-0-2-RELEASE:1.41.2.1
	netbsd-3:1.43.0.2
	netbsd-3-base:1.43
	netbsd-2-0-1-RELEASE:1.41.2.1
	netbsd-2:1.41.2.1.0.2
	netbsd-2-base:1.41.2.1
	netbsd-2-0-RELEASE:1.41.2.1
	netbsd-2-0-RC5:1.41.2.1
	netbsd-2-0-RC4:1.41.2.1
	netbsd-2-0-RC3:1.41.2.1
	netbsd-2-0-RC2:1.41.2.1
	netbsd-2-0-RC1:1.41.2.1
	netbsd-2-0:1.41.0.2
	netbsd-2-0-base:1.41
	netbsd-1-6-PATCH002-RELEASE:1.40
	netbsd-1-6-PATCH002:1.40
	netbsd-1-6-PATCH002-RC4:1.40
	netbsd-1-6-PATCH002-RC3:1.40
	netbsd-1-6-PATCH002-RC2:1.40
	netbsd-1-6-PATCH002-RC1:1.40
	netbsd-1-6:1.40.0.2
	netbsd-1-6-base:1.40
	netbsd-1-6-PATCH001:1.35
	netbsd-1-6-RELEASE:1.32
	netbsd-1-5-PATCH003:1.30
	netbsd-1-5-PATCH002:1.27
	netbsd-1-5-PATCH001:1.27
	netbsd-1-5-RELEASE:1.20
	netbsd-1-4-PATCH003:1.18
	netbsd-1-4-PATCH002:1.13
	comdex-fall-1999:1.8
	netbsd-1-4-PATCH001:1.5
	netbsd-1-4-RELEASE:1.3
	netbsd-1-3-PATCH003:1.3
	pre-xf86-3-3-3-import:1.3
	netbsd-1-3-PATCH002:1.3
	netbsd-1-3-RELEASE:1.3;
locks; strict;
comment	@# @;


1.44
date	2005.03.18.15.56.09;	author tron;	state Exp;
branches;
next	1.43;

1.43
date	2005.01.07.18.51.33;	author tron;	state Exp;
branches
	1.43.2.1;
next	1.42;

1.42
date	2004.06.14.16.04.28;	author tron;	state Exp;
branches;
next	1.41;

1.41
date	2004.03.12.20.20.49;	author tron;	state Exp;
branches
	1.41.2.1;
next	1.40;

1.40
date	2003.07.21.11.09.45;	author lukem;	state Exp;
branches;
next	1.39;

1.39
date	2003.06.25.12.26.17;	author tron;	state Exp;
branches;
next	1.38;

1.38
date	2003.05.30.13.05.58;	author tron;	state Exp;
branches;
next	1.37;

1.37
date	2003.04.11.16.18.52;	author fredb;	state Exp;
branches;
next	1.36;

1.36
date	2003.02.04.18.57.34;	author matt;	state Exp;
branches;
next	1.35;

1.35
date	2002.12.25.22.08.21;	author tron;	state Exp;
branches;
next	1.34;

1.34
date	2002.12.25.22.01.43;	author tron;	state Exp;
branches;
next	1.33;

1.33
date	2002.12.16.00.38.40;	author lukem;	state Exp;
branches;
next	1.32;

1.32
date	2002.07.06.14.41.06;	author tron;	state Exp;
branches;
next	1.31;

1.31
date	2002.04.26.16.52.42;	author lukem;	state Exp;
branches;
next	1.30;

1.30
date	2001.11.25.18.52.25;	author thorpej;	state Exp;
branches;
next	1.29;

1.29
date	2001.10.14.23.56.18;	author jwise;	state Exp;
branches;
next	1.28;

1.28
date	2001.08.19.17.26.42;	author mrg;	state Exp;
branches;
next	1.27;

1.27
date	2001.05.23.12.47.13;	author fredb;	state Exp;
branches;
next	1.26;

1.26
date	2001.04.13.17.01.47;	author wiz;	state Exp;
branches;
next	1.25;

1.25
date	2001.04.13.15.07.56;	author tron;	state Exp;
branches;
next	1.24;

1.24
date	2001.04.10.12.10.51;	author tron;	state Exp;
branches;
next	1.23;

1.23
date	2001.04.09.22.41.10;	author tron;	state Exp;
branches;
next	1.22;

1.22
date	2001.04.09.11.51.39;	author tron;	state Exp;
branches;
next	1.21;

1.21
date	2001.04.08.15.49.43;	author tron;	state Exp;
branches;
next	1.20;

1.20
date	2000.11.08.06.35.41;	author is;	state Exp;
branches;
next	1.19;

1.19
date	2000.11.05.15.55.34;	author fredb;	state Exp;
branches;
next	1.18;

1.18
date	2000.10.30.21.26.00;	author is;	state Exp;
branches;
next	1.17;

1.17
date	2000.10.02.05.57.00;	author simonb;	state Exp;
branches;
next	1.16;

1.16
date	2000.07.30.10.23.20;	author tron;	state Exp;
branches;
next	1.15;

1.15
date	2000.07.25.17.08.28;	author thorpej;	state Exp;
branches;
next	1.14;

1.14
date	2000.03.12.11.16.55;	author dbj;	state Exp;
branches;
next	1.13;

1.13
date	2000.02.27.16.44.50;	author fredb;	state Exp;
branches;
next	1.12;

1.12
date	2000.02.23.18.29.00;	author hubertf;	state Exp;
branches;
next	1.11;

1.11
date	2000.02.05.00.56.16;	author fredb;	state Exp;
branches;
next	1.10;

1.10
date	2000.02.05.00.54.27;	author fredb;	state Exp;
branches;
next	1.9;

1.9
date	99.12.28.19.51.54;	author fredb;	state Exp;
branches;
next	1.8;

1.8
date	99.09.27.08.56.05;	author fredb;	state Exp;
branches;
next	1.7;

1.7
date	99.09.14.08.21.45;	author fredb;	state Exp;
branches;
next	1.6;

1.6
date	99.09.06.12.52.11;	author tron;	state Exp;
branches;
next	1.5;

1.5
date	99.05.24.00.05.37;	author tv;	state Exp;
branches;
next	1.4;

1.4
date	99.05.16.16.07.12;	author tv;	state Exp;
branches;
next	1.3;

1.3
date	97.12.09.11.58.28;	author mrg;	state Exp;
branches;
next	1.2;

1.2
date	97.12.04.21.12.00;	author mrg;	state Exp;
branches;
next	1.1;

1.1
date	97.12.01.13.11.50;	author mrg;	state Exp;
branches;
next	;

1.43.2.1
date	2005.03.19.17.45.07;	author jwise;	state Exp;
branches;
next	;

1.41.2.1
date	2004.06.22.09.18.26;	author grant;	state Exp;
branches;
next	;


desc
@@


1.44
log
@Remove code handling "contrib" directory.
@
text
@#	$NetBSD: Makefile,v 1.43 2005/01/07 18:51:33 tron Exp $
#
# Targets & Variables
#
# build: Clean out xsrc, and build and install everything that goes
#	under /usr/X11R6.
#
#  DESTDIR -- Set to an alternative directory to install under.
#  UPDATE --  If set, don't make clean first, plus attempt to make
#	only the targets that are out of date.
#
# release snapshot: Same as build, plus tar up the X sets and install
#	them under the ${RELEASEDIR}/binary/sets directory (NetBSD <=1.6)
#	or the ${RELEASEDIR}/${MACHINE}/binary/sets directory (NetBSD >1.6).
#
#  DESTDIR -- Same as for build. Mandatory for building a release.
#  RELEASEDIR -- As explained above.
#  BUILD_DONE -- If set, assume build is already done.
#  INSTALL_DONE -- If set, assume binaries to tar up are to be found
#	in ${DESTDIR} already.
#  NETBSDSRCDIR -- Set to the full path to the main source tree, /usr/src
#	by default. Needed to find ./distrib/sets.
#
# cleandir distclean: Remove all generated files from under xsrc.
#
# clean: Remove object files, but keep imake generated makefiles.

.include <bsd.own.mk>

# Backwards compatibility with NetBSD 1.5 and 1.5.x where NETBSDSRCDIR
# doesn't get defined by  "bsd.own.mk".
NETBSDSRCDIR?=	${BSDSRCDIR}

XCDIR=	xfree/xc

.MAIN: all
all: all-xc all-local

all-xc:
.if exists(${XCDIR}/xmakefile) && defined(UPDATE)
	@@cd ${XCDIR} && ${MAKE} Everything
.else
	@@-rm -f ${XCDIR}/xmakefile
	@@cd ${XCDIR} && ${MAKE} World
.endif

all-local:
	@@if [ ! -f local/Makefile ]; then \
	  cd local && PATH=../${XCDIR}/config/imake:$$PATH \
	    sh ../${XCDIR}/config/util/xmkmf -a ../${XCDIR} \
	      ${.CURDIR}/local; \
	fi
	@@cd local && ${MAKE}

install: install-xc install-local

install-xc:
	@@cd ${XCDIR} && \
	  ${MAKE} DESTDIR="${DESTDIR}" install && \
	  ${MAKE} DESTDIR="${DESTDIR}" install.man

install-local:
	@@cd local && \
	  ${MAKE} DESTDIR="${DESTDIR}" install && \
	  ${MAKE} DESTDIR="${DESTDIR}" install.man

clean:
	@@-cd ${XCDIR} && ${MAKE} clean
	@@-cd local && ${MAKE} clean

cleandir distclean: clean
	find ${XCDIR} local -name .depend | xargs -n5 rm
	find ${XCDIR} local -name 'Makefile*' | \
	    xargs -n5 grep -l "Makefile generated by imake" | xargs rm
	-rmdir ${XCDIR}/exports
	rm -f ${XCDIR}/xmakefile ${XCDIR}/config/cf/version.def \
	   ${XCDIR}/config/cf/date.def

build:
.if defined(UPDATE)
	@@${MAKE} all && ${MAKE} install
.else
	@@${MAKE} cleandir && ${MAKE} all && ${MAKE} install
.endif

# release goo
#
.if !defined(DESTDIR)
release snapshot:
	@@echo setenv DESTDIR before doing that!
	@@false
.elif !defined(RELEASEDIR)
release snapshot:
	@@echo setenv RELEASEDIR before doing that!
	@@false
#
.else
#
.if defined(INSTALL_DONE)
release snapshot:
.elif defined(BUILD_DONE)
release snapshot: install
.else
release snapshot: build
#
.endif # INSTALL_DONE or BUILD_DONE
#
	${INSTALL} -d -m 755 -o root -g wheel ${RELEASEDIR}/${MACHINE}/binary/sets
	${INSTALL} -d -m 755 -o root -g wheel ${DESTDIR}/etc/mtree
.if defined(METALOG.add) && !exists(${DESTDIR}/etc/master.passwd)
	cd ${NETBSDSRCDIR}/distrib/sets && \
	    sh ./maketars -x -d ${DESTDIR:S,^$,/,} -N ${NETBSDSRCDIR}/etc -t ${RELEASEDIR}/${MACHINE}/binary/sets
.else
	cd ${NETBSDSRCDIR}/distrib/sets && \
	    sh ./maketars -x -d ${DESTDIR:S,^$,/,} -t ${RELEASEDIR}/${MACHINE}/binary/sets
.endif
	cd ${RELEASEDIR}/${MACHINE}/binary/sets && \
		cksum -o 1 *.tgz >BSDSUM && \
		cksum *.tgz >CKSUM && \
		cksum -m *.tgz >MD5 && \
		cksum -o 2 *.tgz >SYSVSUM
#
.endif # DESTDIR and RELEASEDIR check
@


1.43
log
@EOL of XFree86 3.3.6, approved by core@@NetBSD.org
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.42 2004/06/14 16:04:28 tron Exp $
a46 8
all-contrib:
	@@if [ ! -f contrib/Makefile ]; then \
	  cd contrib && PATH=../${XCDIR}/config/imake:$$PATH \
	    sh ../${XCDIR}/config/util/xmkmf -a ../${XCDIR} \
	       ${.CURDIR}/contrib; \
	fi
	@@cd contrib && ${MAKE}

a61 5
install-contrib:
	@@cd contrib && \
	  ${MAKE} DESTDIR="${DESTDIR}" install && \
	  ${MAKE} DESTDIR="${DESTDIR}" install.man

d72 2
a73 2
	find ${XCDIR} contrib local -name .depend | xargs -n5 rm
	find ${XCDIR} contrib local -name 'Makefile*' | \
@


1.43.2.1
log
@Ticket [pullup-3 #13]

Pull up revision 1.44:
Remove code handling "contrib" directory.
@
text
@d1 1
a1 1
#	$NetBSD$
d47 8
d70 5
d85 2
a86 2
	find ${XCDIR} local -name .depend | xargs -n5 rm
	find ${XCDIR} local -name 'Makefile*' | \
@


1.42
log
@Remove two symbolic links in "${XCDIR}" in the "cleandir" target. This
fixes the second half of PR xsrc/25852 by Martin Husemann.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.41 2004/03/12 20:20:49 tron Exp $
a33 1
.if ${USE_XF86_4:Uno} != "no"
a34 4
.else
XCDIR=	xc
.endif

a36 1
.if ${USE_XF86_4:Uno} != "no"
a37 3
.else
all: all-xc all-contrib all-local
.endif
a62 1
.if ${USE_XF86_4:Uno} != "no"
a63 3
.else
install: install-xc install-contrib install-local
.endif
a80 4
.if ${USE_XF86_4:Uno} != "no"
	@@-cd ${XCDIR} && ${MAKE} clean
	@@-cd local && ${MAKE} clean
.else
a81 1
	@@-cd contrib && ${MAKE} clean
a82 1
.endif
a121 4
.if (${MACHINE} == "amiga") && ${USE_XF86_4:Uno} == "no"
	cd ${XCDIR}/programs/Xserver/hw/netbsd/amiga && \
		${INSTALL} -c -m 644 INSTALL.X11 ${RELEASEDIR}/${MACHINE}
.endif
@


1.41
log
@Make native XFree86 distribution set creation work again. Fix provided by
Luke Mewburn in private e-mail.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.40 2003/07/21 11:09:45 lukem Exp $
d108 2
a109 1
	rm -f ${XCDIR}/xmakefile
@


1.41.2.1
log
@Pull up revision 1.42 (requested by tron in ticket #499):

Remove two symbolic links in "${XCDIR}" in the "cleandir" target.
PR #25852.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.41 2004/03/12 20:20:49 tron Exp $
d108 1
a108 2
	rm -f ${XCDIR}/xmakefile ${XCDIR}/config/cf/version.def \
	   ${XCDIR}/config/cf/date.def
@


1.40
log
@simplify the USE_XF86_4 tests
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.39 2003/06/25 12:26:17 tron Exp $
d144 1
@


1.39
log
@Check for "etc/master.passwd" instead of "etc" in the destination directory
to find out wether user and group database are available there. The XFree86
build process creates a directory "etc" itself.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.38 2003/05/30 13:05:58 tron Exp $
d34 1
a34 1
.if defined(USE_XF86_4) && (${USE_XF86_4} != no)
d40 1
d42 1
a42 1
.if defined(USE_XF86_4) && (${USE_XF86_4} != no)
d72 1
a72 1
.if defined(USE_XF86_4) && (${USE_XF86_4} != no)
d94 1
a94 1
.if defined(USE_XF86_4) && (${USE_XF86_4} != no)
d140 1
a140 1
.if (${MACHINE} == "amiga") && !(defined(USE_XF86_4) && (${USE_XF86_4} != no))
@


1.38
log
@Extend comment about snapshots to mention the new directory layout used
in NetBSD after 1.6. This fixes PR xsrc/20211 by HIRATSUKA Kouichirou.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.37 2003/04/11 16:18:52 fredb Exp $
d143 1
a143 1
.if defined(METALOG.add) && !exists(${DESTDIR}/etc)
@


1.37
log
@Attempt to speed up the "cleandir" target, by beginning to remove
"Makefile"'s before the "find" is complete, and presumably while the
containing directory is still in the file cache.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.36 2003/02/04 18:57:34 matt Exp $
d13 2
a14 1
#	them under the ${RELEASEDIR}/binary/sets directory.
@


1.36
log
@Append ${MACHINE} after ${RELEASEDIR}.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.35 2002/12/25 22:08:21 tron Exp $
d102 1
a102 1
	find ${XCDIR} contrib local -name .depend | xargs rm
d104 1
a104 1
	    xargs grep -l "Makefile generated by imake" | xargs rm
@


1.35
log
@Use "${METALOG.add}" instead of "${METALOG}" to find out if "maketars"
needs the "-N" option because the first variable already existed under
NetBSD 1.6.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.34 2002/12/25 22:01:43 tron Exp $
d137 1
a137 1
	${INSTALL} -d -m 755 -o root -g wheel ${RELEASEDIR}/binary/sets
d140 1
a140 1
		${INSTALL} -c -m 644 INSTALL.X11 ${RELEASEDIR}
d144 1
a144 1
	    sh ./maketars -x -d ${DESTDIR:S,^$,/,} -N ${NETBSDSRCDIR}/etc -t ${RELEASEDIR}/binary/sets
d147 1
a147 1
	    sh ./maketars -x -d ${DESTDIR:S,^$,/,} -t ${RELEASEDIR}/binary/sets
d149 1
a149 1
	cd ${RELEASEDIR}/binary/sets && \
@


1.34
log
@Use user and group database from NetBSD source tree if we are installing
into an empty destination area using a toolchain with metalog support.
This fixes PR xsrc/19511 by Shin-ichi Yoshimoto.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.33 2002/12/16 00:38:40 lukem Exp $
d142 1
a142 1
.if defined(METALOG) && !exists(${DESTDIR}/etc)
@


1.33
log
@If ${DESTDIR}="", ensure `maketars -d ...' is called with an argument
(i.e, "/").  Fixes problem noted by simonb@@
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.32 2002/07/06 14:41:06 tron Exp $
d142 4
d148 1
@


1.32
log
@Add a fallback definition for "NETBSDSRCDIR" to fix the "release" target
under NetBSD 1.5 and 1.5.x. This fixes PR xsrc/17492 by John D Smerdon.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.31 2002/04/26 16:52:42 lukem Exp $
d143 1
a143 1
	    sh ./maketars -x -d ${DESTDIR} -t ${RELEASEDIR}/binary/sets
@


1.31
log
@s/BSDSRCDIR/NETBSDSRCIDR/
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.30 2001/11/25 18:52:25 thorpej Exp $
d28 4
@


1.30
log
@Update for recent changes to distrib/sets/maketars; invoke it by
cd'ing to ${BSDSRCDIR}/distrib/sets rather than invoking it as
${BSDSRCDIR}/distrib/sets/maketars so that it uses the correct
Makefile for the information it needs to fetch from the .mk system.

Problem pointed out by Launey Thomas <ljt@@alum.mit.edu> in a private
e-mail.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.29 2001/10/14 23:56:18 jwise Exp $
d20 1
a20 1
#  BSDSRCDIR -- Set to the full path to the main source tree, /usr/src
d138 1
a138 1
	cd ${BSDSRCDIR}/distrib/sets && \
@


1.29
log
@Fix a long-standing problem with builds with USE_XF86_4 set.

In XFree86 4.x, the `contrib' sources have been moved into xc/programs, so this
Makefile as it stood, was building those programs which had traditionally been
part of `contrib' from there and then overwriting them with XF86 3.x versions
from ./contrib.

Now, we don't descend into ./contrib if we are building from XF86 4.  This has
been verified to DTRT.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.28 2001/08/19 17:26:42 mrg Exp $
d138 2
a139 2
	sh ${BSDSRCDIR}/distrib/sets/maketars -x -s ${BSDSRCDIR}/distrib/sets \
		-d ${DESTDIR} -t ${RELEASEDIR}/binary/sets
@


1.28
log
@make the cleandir/all/install passes distinct, like in src/Makefile.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.27 2001/05/23 12:47:13 fredb Exp $
d36 3
d40 1
d66 3
d70 1
d88 4
d95 1
@


1.27
log
@Respect DESTDIR setting in ${MAKECONF}. Previously, it had to be set
in either the environment, or on the command line. Closes PR xsrc/13003.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.26 2001/04/13 17:01:47 wiz Exp $
d93 1
a93 1
	@@${MAKE} all install
d95 1
a95 1
	@@${MAKE} cleandir all install
@


1.26
log
@Fix typo in last commit.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.25 2001/04/13 15:07:56 tron Exp $
d65 3
a67 1
	@@cd ${XCDIR} && ${MAKE} install && ${MAKE} install.man
d70 3
a72 1
	@@cd contrib && ${MAKE} install && ${MAKE} install.man
d75 3
a77 1
	@@cd local && ${MAKE} install && ${MAKE} install.man
@


1.25
log
@If we are building from XFree86 4.x sources on an Amiga don't try to
install the not (yet) existing installation instructions.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.24 2001/04/10 12:10:51 tron Exp $
d115 1
a115 1
.if (${MACHINE} == "amiga")) && !(defined(USE_XF86_4) && (${USE_XF86_4} != no))
@


1.24
log
@Don't build from XFree86 4.x sources if "USE_XF86_4" is set to "no".
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.23 2001/04/09 22:41:10 tron Exp $
d115 1
a115 1
.if ${MACHINE} == "amiga"
@


1.23
log
@Make a full XFree86 4.x build including "contrib" and "local" finally work.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.22 2001/04/09 11:51:39 tron Exp $
d29 1
a29 1
.if defined(USE_XF86_4)
@


1.22
log
@Fix oversight in last commit.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.21 2001/04/08 15:49:43 tron Exp $
d49 2
a50 1
	    sh ../${XCDIR}/config/util/xmkmf -a ../${XCDIR} ../contrib; \
d57 2
a58 1
	    sh ../${XCDIR}/config/util/xmkmf -a ../${XCDIR} ../local; \
@


1.21
log
@Build from XFree86 4.x sources if "USE_XF86_4" is defined.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.20 2000/11/08 06:35:41 is Exp $
d49 1
a49 1
	    sh ../${XCDIR}/config/util/xmkmf -a ../xc ../contrib; \
d56 1
a56 1
	    sh ../${XCDIR}/config/util/xmkmf -a ../xc ../local; \
@


1.20
log
@Don't delete ..../amiga/INSTALL.X11 when installing it.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.19 2000/11/05 15:55:34 fredb Exp $
d29 6
d39 2
a40 2
.if exists(xc/xmakefile) && defined(UPDATE)
	@@cd xc && ${MAKE} Everything
d42 2
a43 2
	@@-rm -f xc/xmakefile
	@@cd xc && ${MAKE} World
d48 2
a49 2
	  cd contrib && PATH=../xc/config/imake:$$PATH \
	    sh ../xc/config/util/xmkmf -a ../xc ../contrib; \
d55 2
a56 2
	  cd local && PATH=../xc/config/imake:$$PATH \
	    sh ../xc/config/util/xmkmf -a ../xc ../local; \
d63 1
a63 1
	@@cd xc && ${MAKE} install && ${MAKE} install.man
d72 1
a72 1
	@@-cd xc && ${MAKE} clean
d77 2
a78 2
	find xc contrib local -name .depend | xargs rm
	find xc contrib local -name 'Makefile*' | \
d80 2
a81 2
	-rmdir xc/exports
	rm -f xc/xmakefile
d114 1
a114 1
	cd xc/programs/Xserver/hw/netbsd/amiga && \
a125 1

@


1.19
log
@Make "all" the default target, explicitly. Previously, the empty "all"
target was being passed over in favor of "all-xc", even though it was
listed first. Problem identified by Izumi Tsutsui on current-users.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.18 2000/10/30 21:26:00 is Exp $
d109 1
a109 1
		${INSTALL} -m 644 INSTALL.X11 ${RELEASEDIR}
@


1.18
log
@Install the Amiga INSTALL.X11 document when building the release.
XXX this should be done differently, but I can't think of an appropriate
method right now.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.17 2000/10/02 05:57:00 simonb Exp $
d29 1
a29 1

@


1.17
log
@Indent second line of a multi-line command.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.16 2000/07/30 10:23:20 tron Exp $
d107 4
@


1.16
log
@Handle "xsrc/local" in "cleandir" target, too. Patch supplied by
Takahiro Kambe in PR xsrc/10711.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.15 2000/07/25 17:08:28 thorpej Exp $
d73 1
a73 1
	xargs grep -l "Makefile generated by imake" | xargs rm
@


1.15
log
@Build local programs.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.14 2000/03/12 11:16:55 dbj Exp $
d68 1
d71 2
a72 2
	find xc contrib -name .depend | xargs rm
	find xc contrib -name 'Makefile*' | \
@


1.14
log
@
remove include of /etc/mk.conf since recent change using <bsd.own.mk>
deals with this instead
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13 2000/02/27 16:44:50 fredb Exp $
d30 1
a30 1
all: all-xc all-contrib
d47 8
a54 1
install: install-xc install-contrib
d61 3
@


1.13
log
@Correct comment, as we don't check for the existence of "maketars". If
you try to "make release" without having BSDSRCDIR properly set, the error
message from "sh" should be clue enough.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.12 2000/02/23 18:29:00 hubertf Exp $
a105 1
.include "/etc/mk.conf"
@


1.12
log
@Set BSDSRCDIR by pulling in <bsd.own.mk>. That way, users have a chance
to override it via /etc/mk.conf.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.11 2000/02/05 00:56:16 fredb Exp $
d104 1
a104 1
.endif # maketars exists and DESTDIR and RELEASEDIR check
@


1.11
log
@Fix goof in last commit.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2000/02/05 00:54:27 fredb Exp $
d27 2
a28 1
BSDSRCDIR?=	/usr/src
@


1.10
log
@Let $BSDSRCDIR be in any arbitrary location (for the snapshot target).
Closes PR xsrc/9348, submitted by jbernard@@mines.edu.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.9 1999/12/28 19:51:54 fredb Exp $
d95 1
a95 1
	sh ${BSDSRCDIR}/distrib/sets/maketars -x -s ${BSDSRCDIR}/src/distrib/sets \
@


1.9
log
@Add "release" aka "snapshot" target, as discussed on tech-install.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.8 1999/09/27 08:56:05 fredb Exp $
d95 1
a95 1
	sh ${BSDSRCDIR}/distrib/sets/maketars -x -s ../src/distrib/sets \
@


1.8
log
@Defer check for contrib/Makefile until it's needed,
so it can be regenerated if necessary, so alternate
"make build"'s don't fail (again).
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 1999/09/14 08:21:45 fredb Exp $
d3 25
a27 1
# build and install xsrc
d71 35
@


1.7
log
@Make "build" depend on "cleandir", and make "cleandir" depend on "clean,"
more in line with the "build" target in /usr/src. Also remove /xc/xmakefile
before doing "make World" pursuant to a "make build". This is all to ensure
that "make build" starts up cleanly and predictably.

For updating a fully populated tree, "make UPDATE= build" now does a
"make Everything" in xc. This is even faster than the old behavior of
"make build"--if there are no intervening changes, this only builds the
Makefiles and .depends and re-links.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 1999/09/06 12:52:11 tron Exp $
d16 4
a19 4
.if !exists(contrib/Makefile)
	@@cd contrib && PATH=../xc/config/imake:$$PATH \
	    sh ../xc/config/util/xmkmf -a ../xc ../contrib
.endif
@


1.6
log
@Add seperate "cleandir" target which removes all files remaining after
"make clean".
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 1999/05/24 00:05:37 tv Exp $
d8 2
a9 2
.if exists(xc/xmakefile)
	@@cd xc && ${MAKE} -f xmakefile World
d11 1
d31 1
a31 1
	@@cd xc && ${MAKE} clean
d34 1
a34 1
cleandir distclean:
d42 4
a45 5
.if exists(xc/xmakefile)
	@@echo ""
	@@echo "Warning:  This does not rebuild from a clean tree."
	@@echo "Use 'make clean' first if you want to start from scratch."
	@@echo ""
a46 1
	@@${MAKE} all install
@


1.5
log
@Move "build" rule so that default is "all".
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 1997/12/09 11:58:28 mrg Exp $
d29 1
a29 1
clean cleandir distclean:
d32 7
@


1.4
log
@Allow for stopped-in-the-middle rebuilds by using "make -f xmakefile
World" if xc/xmakefile exists.  Also don't re-run xmkmf on contrib if
contrib/Makefile exists.
@
text
@a4 9
build:
.if exists(xc/xmakefile)
	@@echo ""
	@@echo "Warning:  This does not rebuild from a clean tree."
	@@echo "Use 'make clean' first if you want to start from scratch."
	@@echo ""
.endif
	@@${MAKE} all install

d32 9
@


1.3
log
@clean this up a bit.  mostly from cgd.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 1997/12/04 21:12:00 mrg Exp $
d5 17
a21 3
all:
	cd xc ; ${MAKE} World
	${MAKE} all-contrib
d24 2
a25 1
	cd contrib ; PATH=../xc/config/imake:$$PATH \
d27 2
a28 4
	cd contrib ; ${MAKE}

build: all
	${MAKE} install
d33 1
a33 1
	cd xc; ${MAKE} install && ${MAKE} install.man
d36 1
a36 1
	cd contrib; ${MAKE} install && ${MAKE} install.man
d38 3
a40 3
clean:
	cd xc; ${MAKE} clean
	cd contrib; ${MAKE} clean
@


1.2
log
@use ${MAKE} and make "build-contrib" correct.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 1997/12/01 13:11:50 mrg Exp $
d3 1
a3 1
# this is a lame hack.  such is life
d5 3
a7 4
all: all-xc all-contrib

all-xc:
	(cd xc; ${MAKE})
d10 3
a12 1
	(cd contrib; ${MAKE})
d14 1
a14 1
build: build-xc build-contrib
a16 7
build-xc:
	(cd xc; ${MAKE} World)

build-contrib:
	(cd contrib; xmkmf -a; ${MAKE} clean; ${MAKE})
	${MAKE} install-contrib 

d20 1
a20 1
	(cd xc; ${MAKE} install && ${MAKE} install.man)
d23 5
a27 1
	(cd contrib; ${MAKE} install && ${MAKE} install.man)
@


1.1
log
@add a makefile to build the xsrc tree (xc and contrib).  has targets
`build', `all' (default) and `install'.
@
text
@d1 1
a1 1
#	$NetBSD$
d8 1
a8 1
	(cd xc; make)
d11 1
a11 1
	(cd contrib; make)
d14 1
a14 1
	make install
d17 1
a17 1
	(cd xc; make World)
d20 2
a21 1
	(cd contrib; make World)
d26 1
a26 1
	(cd xc; make install && make install.man)
d29 1
a29 1
	(cd contrib; make install && make install.man)
@