--- a/Makefile.in	Mon Aug 13 09:40:48 2007 +0200
+++ b/Makefile.in	Mon Aug 13 09:41:43 2007 +0200
@@ -123,9 +123,6 @@
 # set by the configure script's `--srcdir' option.
 srcdir=@srcdir@
 
-# Tell make where to find source files; this is needed for the makefiles.
-VPATH=@srcdir@
-
 # ==================== XEmacs-specific directories ====================
 
 # These variables hold the values XEmacs will actually use.  They are
@@ -216,21 +213,26 @@
 # instead, we have written out explicit code in the `install' targets.
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
+GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/config.h src/puresize_adjust.h
 
-.NO_PARALLEL:	src/paths.h src/Emacs.ad.h ${MAKE_SUBDIR} dump-elcs
+all:	${GENERATED_HEADERS} ${MAKE_SUBDIR}
 
-all:	src/paths.h src/Emacs.ad.h ${MAKE_SUBDIR}
+# For performance and consistency, no built-in rules
+.SUFFIXES:
+
+.NO_PARALLEL:	${GENERATED_HEADERS} ${MAKE_SUBDIR} dump-elcs
+.PHONY: ${SUBDIR} all beta all-elc all-elcs dump-elc dump-elcs autoloads
 
 # Convenience target for XEmacs beta testers
 beta:	clean all-elc
 
 # Build XEmacs and recompile out-of-date and missing .elc files along
 # the way.
-all-elc all-elcs:  src/paths.h src/Emacs.ad.h lib-src lwlib dump-elcs src
+all-elc all-elcs:   lib-src lwlib dump-elcs src
 	MAKE='$(MAKE)' sh ${srcdir}/lib-src/update-elc.sh
 
 # Sub-target for all-elc.
-dump-elc dump-elcs:  FRC.dump-elcs
+dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs
 	cd src && $(MAKE) dump-elcs $(MFLAGS) \
 		CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}'
 
@@ -245,36 +247,31 @@
 # 386bsd.
 src/paths.h: Makefile ${srcdir}/src/paths.h.in FRC.src.paths.h
 	@echo "Producing \`src/paths.h' from \`src/paths.h.in'."
-	-rm -f src/paths.h.tmp
+	@-rm -f src/paths.h.tmp
 	@cp ${srcdir}/src/paths.h.in src/paths.h.tmp
-	-chmod 0644 src/paths.h.tmp
-	@echo '#define PATH_PREFIX "${prefix}"' >> src/paths.h.tmp
-	@if [ x"${lispdir_user_defined}" = x"yes" ]; then \
-	  echo '#define PATH_LOADSEARCH "${lispdir}"' >> src/paths.h.tmp;\
-	else \
-	  echo '/* #define PATH_LOADSEARCH "${lispdir}" */' >>src/paths.h.tmp;\
-	fi
-	@if [ x"${archlibdir_user_defined}" = x"yes" ]; then \
-	  echo '#define PATH_EXEC "${archlibdir}"' >> src/paths.h.tmp ;\
-	else \
-	  echo '/* #define PATH_EXEC "${archlibdir}" */' >> src/paths.h.tmp ;\
-	fi
-	@if [ x"${etcdir_user_defined}" = x"yes" ]; then \
-	  echo '#define PATH_DATA "${etcdir}"' >> src/paths.h.tmp ;\
-	else \
-	  echo '/* #define PATH_DATA "${etcdir}" */' >> src/paths.h.tmp ;\
-	fi
-	@if [ x"${lockdir_user_defined}" = x"yes" ]; then \
-	  echo '#define PATH_LOCK "${lockdir}"' >> src/paths.h.tmp ;\
-	else \
-	  echo '/* #define PATH_LOCK "${lockdir}" */' >> src/paths.h.tmp ;\
-	fi
-	@if [ x"${infodir_user_defined}" = x"yes" ]; then \
-	  echo '#define PATH_INFO "${infodir}"' >> src/paths.h.tmp ;\
-	else \
-	  echo '/* #define PATH_INFO "${infodir}" */' >> src/paths.h.tmp ;\
-	fi
-	@sh ${srcdir}/move-if-change src/paths.h.tmp src/paths.h
+	@-chmod 0644 src/paths.h.tmp
+	@(echo '#define PATH_PREFIX "${prefix}"'; \
+	 if test "${lispdir_user_defined}" = "yes"; \
+	   then echo    '#define PATH_LOADSEARCH "${lispdir}"'; \
+	   else echo '/* #define PATH_LOADSEARCH "${lispdir}" */'; \
+	 fi; \
+	 if test "${archlibdir_user_defined}" = "yes"; \
+	   then echo    '#define PATH_EXEC "${archlibdir}"'; \
+	   else echo '/* #define PATH_EXEC "${archlibdir}" */'; \
+	 fi; \
+	 if test "${etcdir_user_defined}" = "yes"; \
+	   then echo    '#define PATH_DATA "${etcdir}"'; \
+	   else echo '/* #define PATH_DATA "${etcdir}" */'; \
+	 fi; \
+	 if test "${lockdir_user_defined}" = "yes"; \
+	   then echo    '#define PATH_LOCK "${lockdir}"'; \
+	   else echo '/* #define PATH_LOCK "${lockdir}" */'; \
+	 fi; \
+	 if test "${infodir_user_defined}" = "yes"; \
+	   then echo    '#define PATH_INFO "${infodir}"'; \
+	   else echo '/* #define PATH_INFO "${infodir}" */'; \
+	fi; ) >> src/paths.h.tmp; \
+	sh ${srcdir}/move-if-change src/paths.h.tmp src/paths.h
 
 # We have to force the building of Emacs.ad.h as well in order to get it
 # updated correctly when VPATH is being used.  Since we use move-if-change,
@@ -288,13 +285,19 @@
 	  /bin/sh ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \
 	  src/Emacs.ad.h
 
+src/puresize_adjust.h:	${srcdir}/src/puresize.h
+	@echo "Resetting \`src/puresize_adjust.h'."; \
+	(echo "/*	Do not edit this file!" ; \
+	 echo "  	Automatically generated by XEmacs */" ; \
+	 echo "#define PURESIZE_ADJUSTMENT 0") > $@
+
 src:	@SRC_SUBDIR_DEPS@ FRC.src
 lib-src: FRC.lib-src
 lwlib:	FRC.lwlib
 
 .RECURSIVE: ${SUBDIR}
 
-${SUBDIR}: ${SUBDIR_MAKEFILES} src/config.h src/puresize_adjust.h FRC
+${SUBDIR}: ${SUBDIR_MAKEFILES} ${GENERATED_HEADERS} FRC
 	cd $@ && $(MAKE) all $(MFLAGS) \
 		CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}'
 
@@ -313,12 +316,6 @@
 src/config.h: ${srcdir}/src/config.h.in
 	./config.status
 
-src/puresize_adjust.h:	${srcdir}/src/puresize.h
-	@echo "Resetting \`src/puresize_adjust.h'."
-	@echo '/* This file is generated by XEmacs, DO NOT MODIFY!!! */' > src/puresize_adjust.h
-	@echo '#define PURESIZE_ADJUSTMENT 0' >> src/puresize_adjust.h
-
-
 # ==================== Installation ====================
 
 ## If we let lib-src do its own installation, that means we
@@ -328,7 +325,7 @@
 ## On AIX, use tar xBf.
 ## On Xenix, use tar xpf.
 
-.PHONY: install install-arch-dep install-arch-indep mkdir
+.PHONY: install-only install install-arch-dep install-arch-indep gzip.el mkdir
 
 ## We delete each directory in ${COPYDESTS} before we copy into it;
 ## that way, we can reinstall over directories that have been put in
@@ -542,7 +539,7 @@
 SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in PROBLEMS \
 	README build-install.in configure make-dist move-if-change
 
-.PHONY: unlock relock
+.PHONY: unlock relock TAGS tags check dist info dvi mcs
 
 unlock:
 	chmod u+w $(SOURCES) cpp/*
@@ -566,9 +563,7 @@
 	(cd lwlib && chmod u+w *.[ch] Makefile.in.in)
 	(cd src && $(MAKE) $(MFLAGS) relock)
 
-.PHONY: TAGS tags check dist
-
-TAGS tags:
+TAGS tags: FRC.tags
 	@echo "If you don't have a copy of etags around, then do 'make lib-src' first."
 	@PATH=`pwd`/lib-src:$$PATH HOME=/-=-; export PATH HOME; \
 	  echo "Using etags from `which etags`."
@@ -585,9 +580,7 @@
 dist:
 	cd ${srcdir} && make-dist
 
-.PHONY: info dvi
-force-info:
-info: force-info
+info: FRC.info
 	cd ${srcdir}/man && $(MAKE) $(MFLAGS) $@
 dvi:
 	cd ${srcdir}/man && $(MAKE) $(MFLAGS) $@