[xemacs-hg @ 2003-02-20 08:16:21 by ben] check in makefile fixes et al Makefile.in.in: Major surgery. Move all stuff related to building anything in the src/ directory into src/. Simplify the dependencies -- everything in src/ is dependent on the single entry `src' in MAKE_SUBDIRS. Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. mule/mule-msw-init.el: Removed. Delete this file. mule/mule-win32-init.el: New file, with stuff from mule-msw-init.el -- not just for MS Windows native, boys and girls! bytecomp.el: Change code inserted to catch trying to load a Mule-only .elc file in a non-Mule XEmacs. Formerly you got the rather cryptic "The required feature `mule' cannot be provided". Now you get "Loading this file requires Mule support". finder.el: Remove dependency on which directory this function is invoked from. update-elc.el: Don't mess around with ../src/BYTECOMPILE_CHANGE. Now that Makefile.in.in and xemacs.mak are in sync, both of them use NEEDTODUMP and the other one isn't used. dumped-lisp.el: Rewrite in terms of `list' and `nconc' instead of assemble-list, so we can have arbitrary forms, not just `when-feature'. very-early-lisp.el: Nuke this file. finder-inf.el, packages.el, update-elc.el, update-elc-2.el, loadup.el, make-docfile.el: Eliminate references to very-early-lisp. msw-glyphs.el: Comment clarification. xemacs.mak: Add macros DO_TEMACS, DO_XEMACS, and a few others; this macro section is now completely in sync with src/Makefile.in.in. Copy check-features, load-shadows, and rebuilding finder-inf.el from src/Makefile.in.in. The main build/dump/recompile process is now synchronized with src/Makefile.in.in. Change `WARNING' to `NOTE' and `error checking' to `error-checking' TO avoid tripping faux warnings and errors in the VC++ IDE. Makefile.in.in: Major surgery. Move all stuff related to building anything in the src/ directory from top-level Makefile.in.in to here. Simplify the dependencies. Rearrange into logical subsections. Synchronize the main compile/dump/build-elcs section with xemacs.mak, which is already clean and in good working order. Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. Add additional levels of macros \(e.g. DO_TEMACS, DO_XEMACS, TEMACS_BATCH, XEMACS_BATCH, XEMACS_BATCH_PACKAGES) to factor out duplicated stuff. Clean up handling of "HEAP_IN_DATA" (Cygwin) so it doesn't need to ignore the return value from dumping. Add .NO_PARALLEL since various aspects of building and dumping must be serialized but do not always have dependencies between them (this is impossible in some cases). Everything related to src/ now gets built in one pass in this directory by just running `make' (except the Makefiles themselves and config.h, paths.h, Emacs.ad.h, and other generated .h files). console.c: Update list of possibly valid console types. emacs.c: Rationalize the specifying and handling of the type of the first frame. This was originally prompted by a workspace in which I got GTK to compile under C++ and in the process fixed it so it could coexist with X in the same build -- hence, a combined TTY/X/MS-Windows/GTK build is now possible under Cygwin. (However, you can't simultaneously *display* more than one kind of device connection -- but getting that to work is not that difficult. Perhaps a project for a bored grad student. I (ben) would do it but don't see the use.) To make sense of this, I added new switches that can be used to specifically indicate the window system: -x [aka --use-x], -tty \[aka --use-tty], -msw [aka --use-ms-windows], -gtk [aka --use-gtk], and -gnome [aka --use-gnome, same as --use-gtk]. -nw continues as an alias for -tty. When none have been given, XEmacs checks for other parameters implying particular device types (-t -> tty, -display -> x [or should it have same treatment as DISPLAY below?]), and has ad-hoc logic afterwards: if env var DISPLAY is set, use x (or gtk? perhaps should check whether gnome is running), else MS Windows if it exsits, else TTY if it exists, else stream, and you must be running in batch mode. This also fixes an existing bug whereby compiling with no x, no mswin, no tty, when running non- interactively (e.g. to dump) I get "sorry, must have TTY support". emacs.c: Turn on Vstack_trace_on_error so that errors are debuggable even when occurring extremely early in reinitialization. emacs.c: Try to make sure that the user can see message output under Windows (i.e. it doesn't just disappear right away) regardless of when it occurs, e.g. in the middle of creating the first frame. emacs.c: Define new function `emacs-run-status', indicating whether XEmacs is noninteractive or interactive, whether raw, post-dump/pdump-load or run-temacs, whether we are dumping, whether pdump is in effect. event-stream.c: It's "mommas are fat", not "momas are fat". Fix other typo. event-stream.c: Conditionalize in_menu_callback check on HAVE_MENUBARS, because it won't exist on w/o menubar support, lisp.h: More hackery on RETURN_NOT_REACHED. Cygwin v3.2 DOES complain here if RETURN_NOT_REACHED() is blank, as it is for GCC 2.5+. So make it blank only for GCC 2.5 through 2.999999999999999. Declare Vstack_trace_on_error. profile.c: Need to include "profile.h" to fix warnings. sheap.c: Don't fatal() when need to rerun Make, just stderr_out() and exit(0). That way we can distinguish between a dumping failing expectedly (due to lack of stack space, triggering another dump) and unexpectedly, in which case, we want to stop building. (or go on, if -K is given) syntax.c, syntax.h: Use ints where they belong, and enum syntaxcode's where they belong, and fix warnings thereby. syntax.h: Fix crash caused by an edge condition in the syntax-cache macros. text.h: Spacing fixes. xmotif.h: New file, to get around shadowing warnings. EmacsManager.c, event-Xt.c, glyphs-x.c, gui-x.c, input-method-motif.c, xmmanagerp.h, xmprimitivep.h: Include xmotif.h. alloc.c: Conditionalize in_malloc on ERROR_CHECK_MALLOC. config.h.in, file-coding.h, fileio.c, getloadavg.c, select-x.c, signal.c, sysdep.c, sysfile.h, systime.h, text.c, unicode.c: Eliminate HAVE_WIN32_CODING_SYSTEMS, use WIN32_ANY instead. Replace defined (WIN32_NATIVE) || defined (CYGWIN) with WIN32_ANY. lisp.h: More futile attempts to walk and chew gum at the same time when dealing with subr's that don't return.

--- a/ChangeLog	Thu Feb 20 01:12:26 2003 +0000
+++ b/ChangeLog	Thu Feb 20 08:16:21 2003 +0000
@@ -1,3 +1,25 @@
+2003-02-19  Ben Wing  <ben@xemacs.org>
+
+	* Makefile.in.in:
+	* Makefile.in.in (GENERATED_HEADERS):
+	* Makefile.in.in (GENERATED_LISP): Removed.
+	* Makefile.in.in (.NO_PARALLEL):
+	* Makefile.in.in (beta):
+	* Makefile.in.in (dist):
+	* Makefile.in.in (batch): Removed.
+	* Makefile.in.in (batch_packages): Removed.
+	* Makefile.in.in (check): New.
+	* Makefile.in.in (finder): Removed.
+	* Makefile.in.in (check-features): New.
+	* Makefile.in.in (.PHONY):
+	* Makefile.in.in (install-only):
+	* Makefile.in.in (tagslisp):
+	* Makefile.in.in (info):
+	Major surgery.  Move all stuff related to building anything in the
+	src/ directory into src/.  Simplify the dependencies -- everything
+	in src/ is dependent on the single entry `src' in MAKE_SUBDIRS.
+	Remove weirdo targets like `all-elc[s]', dump-elc[s], etc.
+
 2003-02-16  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.11 "cabbage" is released.

--- a/Makefile.in.in	Thu Feb 20 01:12:26 2003 +0000
+++ b/Makefile.in.in	Thu Feb 20 08:16:21 2003 +0000
@@ -1,3 +1,5 @@
+## Copyright (C) 2003 Ben Wing.
+
 ## DIST: This is the distribution Makefile for XEmacs.  configure can
 ## DIST: make most of the changes to this file you might want, so try
 ## DIST: that first.
@@ -240,25 +242,25 @@
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
 GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/config.h lwlib/config.h src/sheap-adjust.h
-GENERATED_LISP = lisp/finder-inf.el
 
-all: Makefile ${PROGNAME} all-elc info
-
-${PROGNAME}:	${GENERATED_HEADERS} ${MAKE_SUBDIR} ${GENERATED_LISP}
+## MAKE_SUBDIR will always be of the form lib-src ... src, where
+## `...' includes various other directories that may be inserted by
+## configure.
+all: Makefile ${GENERATED_HEADERS} ${MAKE_SUBDIR} info
 
 ## 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 finder
+.NO_PARALLEL: ${GENERATED_HEADERS} ${MAKE_SUBDIR}
+.PHONY: ${SUBDIR} all beta
 
 ## Convenience target for XEmacs beta testers
-beta: clean all-elc finder info
+beta: clean all
 
 ## Convenience target for XEmacs maintainers
 ## This would run `make-xemacsdist' if I were really confident that everything
 ## was turnkey.
-dist: all-elc info
+dist: all
 
 ## Convenience target for XEmacs maintainers
 ## Updates some rarely generated files:
@@ -278,34 +280,11 @@
 depend ${srcdir}/src/depend:
 	cd ./src && $(RECURSIVE_MAKE) depend
 
-batch = -no-packages -batch
-batch_packages = -vanilla -batch
-
-## Build XEmacs and recompile out-of-date and missing .elc files along
-## the way.
-all-elc all-elcs: lib-src lwlib dump-elcs src
-	${blddir}/src/${PROGNAME} ${batch} \
-		-no-autoloads -l update-elc-2.el -f batch-update-elc-2 lisp
-
-## Sub-target for all-elc.
-dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs
-	cd ./src && $(RECURSIVE_MAKE) dump-elcs
+check:
+	cd ./src && $(RECURSIVE_MAKE) $@
 
-finder: src
-	@echo "Building finder database ..."
-	@(cd ./lisp; \
-		${blddir}/src/${PROGNAME} ${batch} \
-		-eval '(setq finder-compile-keywords-quiet t)' \
-		-l finder -f finder-compile-keywords )
-	@echo "Building finder database ...(done)"
-
-lisp/finder-inf.el:
-	@echo "Building finder database ..."
-	@(cd ./lisp; \
-		${blddir}/src/${PROGNAME} ${batch} \
-		-eval '(setq finder-compile-keywords-quiet t)' \
-		-l finder -f finder-compile-keywords )
-	@echo "Building finder database ...(done)"
+check-features: all
+	cd ./src && $(RECURSIVE_MAKE) $@
 
 ## 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,
@@ -371,7 +350,7 @@
 ## On Xenix, use tar xpf.
 
 .PHONY: install-only install install-arch-dep install-arch-indep gzip.el mkdir
-.PHONY: check-features
+.PHONY: check check-features
 
 ## We delete each directory in ${COPYDESTS} before we copy into it;
 ## that way, we can reinstall over directories that have been put in
@@ -387,9 +366,6 @@
 ## inconsistency in the build process.  So we go ahead and depend on
 ## all.  --cet
 
-check-features: all
-	${blddir}/src/${PROGNAME} ${batch} -l check-features.el
-
 install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep
 
 install: all check-features install-arch-dep install-arch-indep
@@ -620,7 +596,7 @@
 SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in.in PROBLEMS \
 	README build-install.in configure make-dist move-if-change
 
-.PHONY: unlock relock TAGS tags check dist info dvi mcs
+.PHONY: unlock relock TAGS tags dist info dvi mcs
 
 unlock:
 	chmod u+w $(SOURCES) cpp/*
@@ -651,9 +627,6 @@
 	find ${tagslisp} ${PRUNE_VC} -name '*.el' ! -name 'auto-autoloads.el' -print | \
 	  xargs etags -a -l none -r "/^(def\\(var\\|un\\|alias\\|const\\|macro\\|subst\\|struct\\|face\\|group\\|custom\\|ine-\\(function\\|compiler-macro\\|[a-z-]+alias\\)\\)[ 	]+'?\\([^ 	]+\\)/\\3/"
 
-check:
-	cd ./src && $(RECURSIVE_MAKE) $@
-
 info: FRC.info
 	cd ${srcdir}/man && $(RECURSIVE_MAKE) $@