Mercurial > hg > xemacs-beta

diff src/Makefile.in.in @ 26:441bb1e64a06 r19-15b96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b96
author cvs
date Mon, 13 Aug 2007 08:51:32 +0200
parents 4103f0995bd7
children 1917ad0d78d7
line wrap: on
line diff
--- a/src/Makefile.in.in	Mon Aug 13 08:51:05 2007 +0200
+++ b/src/Makefile.in.in	Mon Aug 13 08:51:32 2007 +0200
@@ -1157,7 +1157,8 @@
         ${lispdir}prim/replace.elc ${lispdir}prim/specifier.elc \
         ${lispdir}modes/auto-show.elc SUNPRO_LISP TTY_LISP \
         ${lispdir}bytecomp/bytecomp-runtime.elc FLOAT_LISP EPOCH_LISP \
-        ${lispdir}prim/itimer.elc ${lispdir}ediff/ediff-hook.elc \
+        ${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}packages/fontl-hooks.elc SCROLLBAR_LISP \
@@ -1217,21 +1218,37 @@
 	-if [ -w ${srcdir}/../lisp ]; then \
 	  w=`pwd`; cd ${srcdir}; $${w}/temacs -nl -batch -l inc-vers; \
 	else true; fi
-	$(DUMPENV) ./temacs -nl -batch -l loadup.el dump
+	touch SATISFIED
+	-$(DUMPENV) ./temacs -nl -batch -l loadup.el dump
+	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
-	$(DUMPENV) ./temacs -batch -l loadup.el dump
+	touch SATISFIED
+	-$(DUMPENV) ./temacs -batch -l loadup.el dump
+	if [ -f SATISFIED ]; then \
+		$(MAKE) release; \
+	fi
 #endif /* ! defined (HAVE_SHM) */
 	touch release
 #endif /* ! defined (CANNOT_DUMP) */
 
 xemacs: temacs ${libsrc}DOC ${lisp} MOFILE OTHER_FILES
-	$(DUMPENV) ./temacs -batch -l loadup.el dump
+	touch SATISFIED
+	-$(DUMPENV) ./temacs -batch -l loadup.el dump
+	if [ -f SATISFIED ]; then \
+		$(MAKE) xemacs; \
+	fi
 
 xemacs-no-site-file: temacs ${libsrc}DOC ${lisp} MOFILE OTHER_FILES
-	$(DUMPENV) ./temacs -batch -l loadup.el dump no-site-file
+	touch SATISFIED
+	-$(DUMPENV) ./temacs -batch -l loadup.el dump no-site-file
+	if [ -f SATISFIED ]; then \
+		$(MAKE) xemacs-no-site-file; \
+	fi
 
 obj_src = $(objs:.o=.c)
 
@@ -1242,7 +1259,8 @@
 ${libsrc}DOC: ${libsrc}make-docfile ${obj_src} ${lisp}
 #endif
 	rm -f ${libsrc}DOC
-	${libsrc}make-docfile -d ${srcdir} ${obj_src} \
+	${libsrc}make-docfile -d ${srcdir} -i ${lispdir}site-packages \
+		${obj_src} \
 	        ${mallocdocsrc} ${rallocdocsrc} ${lispdir}version.el \
 		${lisp} > ${libsrc}DOC
 
@@ -1741,7 +1759,7 @@
 alloc.o: frame.h
 alloc.o: frameslots.h
 alloc.o: glyphs.h
-alloc.o: puresize.h
+alloc.o: puresize.h PURESIZE.h
 alloc.o: redisplay.h
 alloc.o: scrollbar.h
 alloc.o: specifier.h
@@ -2886,7 +2904,7 @@
 pure.o: blocktype.h
 pure.o: config.h
 pure.o: dynarr.h
-pure.o: puresize.h
+pure.o: puresize.h PURESIZE.h
 ralloc.o: blocktype.h
 ralloc.o: config.h
 ralloc.o: dynarr.h