Mercurial > hg > xemacs-beta

diff src/Makefile.in.in @ 1346:01c57eb70ae9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2003-03-09 02:27:27 by ben] To: xemacs-patches@xemacs.org i.c: Sleep between calls to check for I/O, since these calls are non-blocking. behavior.el: Allow other keywords for forward compatibility. cl-macs.el: Rewrite to eliminate byte-compiler warning when `return' is used without `finally'. cmdloop.el: Avoid truncated error messages for `end-of-file' and the like. cmdloop.el: Avoid char-int error after syncing. files.el: Eliminate byte-compile warnings. printer.el: Fix line-width calculations. #### This used to work. Someone's changes (perhaps by Michael Sperber?) seem to have messed something up. simple.el: Use new clear-left-side functions to avoid messages ending up on the same line as other output. xemacs.mak: Add override for info/ as well when separate source/build dirs. xemacs.mak: Order sections in main build process and add comments. Add additional dependencies to try and prevent later steps from happening when failures in earlier steps have occurred. Makefile.in.in: Order sections in main build process and add comments. Add additional dependencies to try and prevent later steps from happening when failures in earlier steps have occurred. alloc.c: Don't arbitrarily clear Vconfigure_info_directory since it messes up separate build/source dirs. console.c, console.h, device-msw.c, device.c: Add accidentally omitted msprinter console and data descriptions. print.c, console-msw.c: Add clear-left-side functionality to help keep stdio/stderr output from separate sources on separate lines. Generalize the different kinds of debugging output. Add dpa(). profile.c: Add better docs on Unix/Windows differences. regex.c: Fix problems with rel-alloc compilation caused by previous patch. emacs.c: Seg fault rather than abort on Cygwin, since gdb doesn't trap aborts properly. console-gtk-impl.h, console-gtk.h, console-msw.h, console-x-impl.h, console-x.h, dialog-gtk.c, dialog-x.c, event-msw.c, frame-gtk.c, frame-x.c, frameslots.h, glyphs-gtk.c, glyphs-x.c, gui-gtk.c, gui-x.c, inline.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, scrollbar-gtk.c, scrollbar-x.c, ui-gtk.c: Delete popup-data object. Delete menubar_data field from frames, since its usage is frame-specific. Delete menubar-msw.h, gui-x.h, gui-gtk.h. Clean up handling of lwlib callback data GCPRO'ing and add missing GCPRO recomputation in widget code.
author ben
date Sun, 09 Mar 2003 02:27:46 +0000
parents 4542b72c005e
children c88a785b01d8
line wrap: on
line diff
--- a/src/Makefile.in.in	Sat Mar 08 22:52:26 2003 +0000
+++ b/src/Makefile.in.in	Sun Mar 09 02:27:46 2003 +0000
@@ -498,53 +498,9 @@
 ## -ben
 
 .PHONY: build-the-mofo
-build-the-mofo: $(DUMP_TARGET) $(mo_file) $(other_files) update-elc-2 $(LISP)/finder-inf.el load-shadows
-.NO_PARALLEL: $(DUMP_TARGET) update-elc-2 $(LISP)/finder-inf.el load-shadows
-
-release: all
-	-if [ -w $(LISP) ]; then \
-	  w=`pwd`; cd $(SRC) && $$w/$(RAW_EXE) -nd $(BATCH) -l $(LISP)/inc-vers; \
-	else true; fi
-	-$(dump_temacs)
-	touch release
-
-## Update out-of-date .elcs, other than needed for dumping.
-.PHONY: update-elc-2
-update-elc-2:
-	$(XEMACS_BATCH) -no-autoloads -l update-elc-2.el -f batch-update-elc-2 $(LISP)
-
-$(LISP)/finder-inf.el:
-	@echo "Building finder database ..."
-	$(XEMACS_BATCH)	-eval "(setq finder-compile-keywords-quiet t)" \
-		-l finder -f finder-compile-keywords
-	@echo "Building finder database ...(done)"
+build-the-mofo: update-elc-2 $(mo_file) $(other_files) $(LISP)/finder-inf.el load-shadows
 
-.PHONY: load-shadows
-load-shadows:
-#ifndef QUICK_BUILD
-	@echo "Testing for Lisp shadows ..."
-	@$(XEMACS_BATCH) -f list-load-path-shadows
-#endif
-
-.PHONY: FRC.needtodump
-FRC.needtodump:
-
-## This file is touched by update-elc.el when redumping is necessary.
-## We use $(BLDSRC) == `.' here to help keep sync with nt/xemacs.mak,
-## where $(BLDSRC) is not `.'.
-$(BLDSRC)/NEEDTODUMP: FRC.needtodump
-	$(TEMACS_BATCH) -l $(LISP)/update-elc.el
-
-$(DUMP_TARGET): $(RAW_EXE) $(BLDSRC)/NEEDTODUMP $(LIB_SRC)/DOC
-#ifdef HEAP_IN_DATA
-	@$(RM) $@ && touch SATISFIED
-	$(dump_temacs)
-	@if test -f SATISFIED; then $(RM) SATISFIED; else $(RM) $@; \
-	$(RECURSIVE_MAKE) $@; fi
-#else
-	@$(RM) $@
-	$(dump_temacs)
-#endif
+## (1) Compile all dependencies of the XEmacs executable
 
 #ifdef HAVE_X_WINDOWS
 lwlib_deps = $(lwlib_lib)
@@ -560,6 +516,14 @@
 
 link_deps = $(start_files) $(objs) $(otherobjs) $(lwlib_deps) $(dynodump_deps)
 
+$(LIB_SRC)/make-dump-id:
+	cd $(LIB_SRC) && $(RECURSIVE_MAKE) make-dump-id
+
+dump-id.c: $(LIB_SRC)/make-dump-id $(link_deps)
+	$(LIB_SRC)/make-dump-id
+
+## (2) Link the XEmacs executable
+
 temacs_deps = $(link_deps) $(DUMP_ID)
 
 temacs_link_args = \
@@ -569,11 +533,24 @@
 $(RAW_EXE): $(temacs_deps)
 	$(LD) $(temacs_link_args)
 
-dump-id.c: $(LIB_SRC)/make-dump-id $(link_deps)
-	$(LIB_SRC)/make-dump-id
+## (3) Update the .elc's needed for dumping
+
+.PHONY: FRC.needtodump
+FRC.needtodump:
+
+## This file is touched by update-elc.el when redumping is necessary.
+## We use $(BLDSRC) == `.' here to help keep sync with nt/xemacs.mak,
+## where $(BLDSRC) is not `.'.
+$(BLDSRC)/NEEDTODUMP: FRC.needtodump
+	$(TEMACS_BATCH) -l $(LISP)/update-elc.el
+
+## (4) Build the DOC file
 
 obj_src = $(objs:.o=.c)
 
+$(LIB_SRC)/make-docfile:
+	cd $(LIB_SRC) && $(RECURSIVE_MAKE) make-docfile
+
 $(LIB_SRC)/DOC: $(LIB_SRC)/make-docfile $(BLDSRC)/NEEDTODUMP $(temacs_deps)
 #ifdef QUICK_BUILD
 	if test ! -f $@ ; then \
@@ -585,11 +562,48 @@
 		$(obj_src) $(mallocdocsrc) $(rallocdocsrc) \
 		$(extra_doc_files) ; fi
 
-$(LIB_SRC)/make-dump-id:
-	cd $(LIB_SRC) && $(RECURSIVE_MAKE) make-dump-id
+## (5) Dump
+
+$(DUMP_TARGET): $(RAW_EXE) $(BLDSRC)/NEEDTODUMP $(LIB_SRC)/DOC
+#ifdef HEAP_IN_DATA
+	@$(RM) $@ && touch SATISFIED
+	$(dump_temacs)
+	@if test -f SATISFIED; then $(RM) SATISFIED; else $(RM) $@; \
+	$(RECURSIVE_MAKE) $@; fi
+#else
+	@$(RM) $@
+	$(dump_temacs)
+#endif
+
+## (6) Update the remaining .elc's, post-dumping
+
+.PHONY: update-elc-2
+update-elc-2: $(DUMP_TARGET)
+	$(XEMACS_BATCH) -no-autoloads -l update-elc-2.el -f batch-update-elc-2 $(LISP)
+
+## (7) Other random stuff
 
-$(LIB_SRC)/make-docfile:
-	cd $(LIB_SRC) && $(RECURSIVE_MAKE) make-docfile
+$(LISP)/finder-inf.el: update-elc-2
+	@echo "Building finder database ..."
+	$(XEMACS_BATCH)	-eval "(setq finder-compile-keywords-quiet t)" \
+		-l finder -f finder-compile-keywords
+	@echo "Building finder database ...(done)"
+
+.PHONY: load-shadows
+load-shadows: update-elc-2
+#ifndef QUICK_BUILD
+	@echo "Testing for Lisp shadows ..."
+	@$(XEMACS_BATCH) -f list-load-path-shadows
+#endif
+
+###################### Misc targets
+
+release: all
+	-if [ -w $(LISP) ]; then \
+	  w=`pwd`; cd $(SRC) && $$w/$(RAW_EXE) -nd $(BATCH) -l $(LISP)/inc-vers; \
+	else true; fi
+	-$(dump_temacs)
+	touch release
 
 .PHONY: fastdump
 fastdump: $(RAW_EXE)