diff src/Makefile.in.in @ 28:1917ad0d78d7 r19-15b97

Import from CVS: tag r19-15b97
author cvs
date Mon, 13 Aug 2007 08:51:55 +0200
parents 441bb1e64a06
children ec9a17fef872
line wrap: on
line diff
--- a/src/Makefile.in.in	Mon Aug 13 08:51:34 2007 +0200
+++ b/src/Makefile.in.in	Mon Aug 13 08:51:55 2007 +0200
@@ -1160,7 +1160,7 @@
         ${lispdir}prim/itimer.elc ${lispdir}prim/itimer-autosave.elc \
 	${lispdir}ediff/ediff-hook.elc \
 	${lispdir}custom/widget.elc \
-	${lispdir}custom/custom.elc ${lispdir}custom/custom-xmas.elc \
+	${lispdir}custom/custom.elc \
 	${lispdir}packages/fontl-hooks.elc SCROLLBAR_LISP \
 	${lispdir}prim/buffer.elc MENUBAR_LISP \
 	${lispdir}packages/buff-menu.elc DIALOG_LISP \
@@ -1218,18 +1218,18 @@
 	-if [ -w ${srcdir}/../lisp ]; then \
 	  w=`pwd`; cd ${srcdir}; $${w}/temacs -nl -batch -l inc-vers; \
 	else true; fi
-	touch SATISFIED
+	@touch SATISFIED
 	-$(DUMPENV) ./temacs -nl -batch -l loadup.el dump
-	if [ -f SATISFIED ]; then \
+	@if [ -f SATISFIED ]; then \
 		$(MAKE) release; \
 	fi
 #else /* ! defined (HAVE_SHM) */
 	-if [ -w ${srcdir}/../lisp ]; then \
 	  w=`pwd`; cd ${srcdir}; $${w}/temacs -batch -l inc-vers; \
 	else true; fi
-	touch SATISFIED
+	@touch SATISFIED
 	-$(DUMPENV) ./temacs -batch -l loadup.el dump
-	if [ -f SATISFIED ]; then \
+	@if [ -f SATISFIED ]; then \
 		$(MAKE) release; \
 	fi
 #endif /* ! defined (HAVE_SHM) */
@@ -1237,16 +1237,16 @@
 #endif /* ! defined (CANNOT_DUMP) */
 
 xemacs: temacs ${libsrc}DOC ${lisp} MOFILE OTHER_FILES
-	touch SATISFIED
+	@touch SATISFIED
 	-$(DUMPENV) ./temacs -batch -l loadup.el dump
-	if [ -f SATISFIED ]; then \
+	@if [ -f SATISFIED ]; then \
 		$(MAKE) xemacs; \
 	fi
 
 xemacs-no-site-file: temacs ${libsrc}DOC ${lisp} MOFILE OTHER_FILES
-	touch SATISFIED
+	@touch SATISFIED
 	-$(DUMPENV) ./temacs -batch -l loadup.el dump no-site-file
-	if [ -f SATISFIED ]; then \
+	@if [ -f SATISFIED ]; then \
 		$(MAKE) xemacs-no-site-file; \
 	fi
 
@@ -1475,6 +1475,11 @@
 	@echo "Consult the file \`INSTALL' for instructions for building Emacs."
 	exit 1
 
+puresize_adjust.h: ${srcdir}/puresize.h
+	@echo "The file puresize_adjust still needs to be generated."
+	@echo "Please run 'make' from the top-level."
+	exit 1
+
 paths.h: ${srcdir}/paths.h.in
 	@echo "The file paths.h needs to be set up from paths.h.in."
 	@echo "Consult the file \`INSTALL' for instructions for building Emacs."
@@ -1576,7 +1581,7 @@
 /**/# This is used in making a distribution.
 /**/# Do not use it on development directories!
 distclean: clean versionclean
-	rm -f config.h paths.h Emacs.ad.h Makefile Makefile.in .pure
+	rm -f config.h paths.h puresize_adjust.h Emacs.ad.h Makefile Makefile.in .pure
 realclean: distclean
 	rm -f TAGS
 versionclean:
@@ -1759,7 +1764,7 @@
 alloc.o: frame.h
 alloc.o: frameslots.h
 alloc.o: glyphs.h
-alloc.o: puresize.h PURESIZE.h
+alloc.o: puresize.h puresize_adjust.h
 alloc.o: redisplay.h
 alloc.o: scrollbar.h
 alloc.o: specifier.h
@@ -2904,7 +2909,7 @@
 pure.o: blocktype.h
 pure.o: config.h
 pure.o: dynarr.h
-pure.o: puresize.h PURESIZE.h
+pure.o: puresize.h puresize_adjust.h
 ralloc.o: blocktype.h
 ralloc.o: config.h
 ralloc.o: dynarr.h