xemacs-beta: Makefile.in comparison

comparison Makefile.in @ 159:3bb7ccffb0c0 r20-3b6

Import from CVS: tag r20-3b6

author	cvs
date	Mon, 13 Aug 2007 09:41:43 +0200
parents	43dd3413c7c7
children	0132846995bd

comparison

equal deleted inserted replaced

-:558dfa75ffb3
+:3bb7ccffb0c0
 # expected to be in ${srcdir}/src, and the source code for XEmacs's
 # utility programs is expected to be in ${srcdir}/lib-src.  This is
 # 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
 # based on the values of the standard Make variables above.
 # When installing the info files, we need to do special things to
 # avoid nuking an existing dir file, so we don't do that here;
 # 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}'
 autoloads:	src
 	MAKE='$(MAKE)' sh ${srcdir}/lib-src/update-autoloads.sh
 # something notable, so the only unnecessary work we do is in building
 # src/paths.h.tmp, which isn't much.  Note that sed is not in /bin on
 # 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
+	@-chmod 0644 src/paths.h.tmp
-	@echo '#define PATH_PREFIX "${prefix}"' >> src/paths.h.tmp
+	@(echo '#define PATH_PREFIX "${prefix}"'; \
-	@if [ x"${lispdir_user_defined}" = x"yes" ]; then \
+	 if test "${lispdir_user_defined}" = "yes"; \
-	  echo '#define PATH_LOADSEARCH "${lispdir}"' >> src/paths.h.tmp;\
+	   then echo    '#define PATH_LOADSEARCH "${lispdir}"'; \
-	else \
+	   else echo '/* #define PATH_LOADSEARCH "${lispdir}" */'; \
-	  echo '/* #define PATH_LOADSEARCH "${lispdir}" */' >>src/paths.h.tmp;\
+	 fi; \
-	fi
+	 if test "${archlibdir_user_defined}" = "yes"; \
-	@if [ x"${archlibdir_user_defined}" = x"yes" ]; then \
+	   then echo    '#define PATH_EXEC "${archlibdir}"'; \
-	  echo '#define PATH_EXEC "${archlibdir}"' >> src/paths.h.tmp ;\
+	   else echo '/* #define PATH_EXEC "${archlibdir}" */'; \
-	else \
+	 fi; \
-	  echo '/* #define PATH_EXEC "${archlibdir}" */' >> src/paths.h.tmp ;\
+	 if test "${etcdir_user_defined}" = "yes"; \
-	fi
+	   then echo    '#define PATH_DATA "${etcdir}"'; \
-	@if [ x"${etcdir_user_defined}" = x"yes" ]; then \
+	   else echo '/* #define PATH_DATA "${etcdir}" */'; \
-	  echo '#define PATH_DATA "${etcdir}"' >> src/paths.h.tmp ;\
+	 fi; \
-	else \
+	 if test "${lockdir_user_defined}" = "yes"; \
-	  echo '/* #define PATH_DATA "${etcdir}" */' >> src/paths.h.tmp ;\
+	   then echo    '#define PATH_LOCK "${lockdir}"'; \
-	fi
+	   else echo '/* #define PATH_LOCK "${lockdir}" */'; \
-	@if [ x"${lockdir_user_defined}" = x"yes" ]; then \
+	 fi; \
-	  echo '#define PATH_LOCK "${lockdir}"' >> src/paths.h.tmp ;\
+	 if test "${infodir_user_defined}" = "yes"; \
-	else \
+	   then echo    '#define PATH_INFO "${infodir}"'; \
-	  echo '/* #define PATH_LOCK "${lockdir}" */' >> src/paths.h.tmp ;\
+	   else echo '/* #define PATH_INFO "${infodir}" */'; \
-	fi
+	fi; ) >> src/paths.h.tmp; \
-	@if [ x"${infodir_user_defined}" = x"yes" ]; then \
+	sh ${srcdir}/move-if-change src/paths.h.tmp src/paths.h
-	  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
 # 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,
 # it will only actually change if the user modified ${etcdir}/Emacs.ad.
 src/Emacs.ad.h: ${srcdir}/etc/Emacs.ad
 	  echo "  	Automatically generated from ${srcdir}/etc/Emacs.ad" ; \
 	  echo " */" ; \
 	  /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}'
 Makefile: ${srcdir}/Makefile.in config.status
 	./config.status
 lwlib/Makefile: ${srcdir}/lwlib/Makefile.in.in config.status
 	./config.status
 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
 ## don't have to duplicate the list of utilities to install in
 ## this Makefile as well.
 ## 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
 ## place with their files read-only (perhaps because they are checked
 ## into RCS).  In order to make this safe, we make sure that the
 ### and VC will swiftly let you know if this happens, and it is easily
 ### corrected.
 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/*
 	-(cd elisp && chmod u+w Makefile README *.texi)
 	(cd etc     && $(MAKE) $(MFLAGS) unlock)
 	(cd lisp/term && chmod u+w README *.el)
 	(cd man && chmod u+w *texi* ChangeLog split-man)
 	(cd lwlib && chmod u+w *.[ch] Makefile.in.in)
 	(cd src && $(MAKE) $(MFLAGS) relock)
-.PHONY: TAGS tags check dist
+TAGS tags: FRC.tags
-TAGS 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`."
 	PATH=`pwd`/lib-src:$$PATH ; export PATH; cd ${srcdir} && \
 	etags --regex='/[ 	]*DEF\(VAR\|INE\)_[A-Z_]+[ 	]*([ 	]*"\([^"]+\)"/\2/' src/*.[ch] ; \
 	@echo "We don't have any automated tests for XEmacs yet."
 dist:
 	cd ${srcdir} && make-dist
-.PHONY: info dvi
+info: FRC.info
-force-info:
-info: force-info
 	cd ${srcdir}/man && $(MAKE) $(MFLAGS) $@
 dvi:
 	cd ${srcdir}/man && $(MAKE) $(MFLAGS) $@
 # Fix up version information in executables (Solaris-only)

Mercurial > hg > xemacs-beta

comparison Makefile.in @ 159:3bb7ccffb0c0 r20-3b6