comparison Makefile.in.in @ 1314:15a91d7ae2d1

[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.
author ben
date Thu, 20 Feb 2003 08:16:21 +0000
parents f99d3d25df86
children 4542b72c005e
comparison
equal deleted inserted replaced
1313:671b65f2b075 1314:15a91d7ae2d1
1 ## Copyright (C) 2003 Ben Wing.
2
1 ## DIST: This is the distribution Makefile for XEmacs. configure can 3 ## DIST: This is the distribution Makefile for XEmacs. configure can
2 ## DIST: make most of the changes to this file you might want, so try 4 ## DIST: make most of the changes to this file you might want, so try
3 ## DIST: that first. 5 ## DIST: that first.
4 6
5 ## This file is part of XEmacs. 7 ## This file is part of XEmacs.
238 ## avoid nuking an existing dir file, so we don't do that here; 240 ## avoid nuking an existing dir file, so we don't do that here;
239 ## instead, we have written out explicit code in the `install' targets. 241 ## instead, we have written out explicit code in the `install' targets.
240 COPYDIR = ${srcdir}/etc ${srcdir}/lisp 242 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
241 COPYDESTS = ${etcdir} ${lispdir} 243 COPYDESTS = ${etcdir} ${lispdir}
242 GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/config.h lwlib/config.h src/sheap-adjust.h 244 GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/config.h lwlib/config.h src/sheap-adjust.h
243 GENERATED_LISP = lisp/finder-inf.el 245
244 246 ## MAKE_SUBDIR will always be of the form lib-src ... src, where
245 all: Makefile ${PROGNAME} all-elc info 247 ## `...' includes various other directories that may be inserted by
246 248 ## configure.
247 ${PROGNAME}: ${GENERATED_HEADERS} ${MAKE_SUBDIR} ${GENERATED_LISP} 249 all: Makefile ${GENERATED_HEADERS} ${MAKE_SUBDIR} info
248 250
249 ## For performance and consistency, no built-in rules 251 ## For performance and consistency, no built-in rules
250 .SUFFIXES: 252 .SUFFIXES:
251 253
252 .NO_PARALLEL: ${GENERATED_HEADERS} ${MAKE_SUBDIR} dump-elcs 254 .NO_PARALLEL: ${GENERATED_HEADERS} ${MAKE_SUBDIR}
253 .PHONY: ${SUBDIR} all beta all-elc all-elcs dump-elc dump-elcs finder 255 .PHONY: ${SUBDIR} all beta
254 256
255 ## Convenience target for XEmacs beta testers 257 ## Convenience target for XEmacs beta testers
256 beta: clean all-elc finder info 258 beta: clean all
257 259
258 ## Convenience target for XEmacs maintainers 260 ## Convenience target for XEmacs maintainers
259 ## This would run `make-xemacsdist' if I were really confident that everything 261 ## This would run `make-xemacsdist' if I were really confident that everything
260 ## was turnkey. 262 ## was turnkey.
261 dist: all-elc info 263 dist: all
262 264
263 ## Convenience target for XEmacs maintainers 265 ## Convenience target for XEmacs maintainers
264 ## Updates some rarely generated files: 266 ## Updates some rarely generated files:
265 ## - configure from configure.in 267 ## - configure from configure.in
266 ## - config.values.in from configure 268 ## - config.values.in from configure
276 cd ${srcdir} && $(SHELL) lib-src/config.values.sh 278 cd ${srcdir} && $(SHELL) lib-src/config.values.sh
277 279
278 depend ${srcdir}/src/depend: 280 depend ${srcdir}/src/depend:
279 cd ./src && $(RECURSIVE_MAKE) depend 281 cd ./src && $(RECURSIVE_MAKE) depend
280 282
281 batch = -no-packages -batch 283 check:
282 batch_packages = -vanilla -batch 284 cd ./src && $(RECURSIVE_MAKE) $@
283 285
284 ## Build XEmacs and recompile out-of-date and missing .elc files along 286 check-features: all
285 ## the way. 287 cd ./src && $(RECURSIVE_MAKE) $@
286 all-elc all-elcs: lib-src lwlib dump-elcs src
287 ${blddir}/src/${PROGNAME} ${batch} \
288 -no-autoloads -l update-elc-2.el -f batch-update-elc-2 lisp
289
290 ## Sub-target for all-elc.
291 dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs
292 cd ./src && $(RECURSIVE_MAKE) dump-elcs
293
294 finder: src
295 @echo "Building finder database ..."
296 @(cd ./lisp; \
297 ${blddir}/src/${PROGNAME} ${batch} \
298 -eval '(setq finder-compile-keywords-quiet t)' \
299 -l finder -f finder-compile-keywords )
300 @echo "Building finder database ...(done)"
301
302 lisp/finder-inf.el:
303 @echo "Building finder database ..."
304 @(cd ./lisp; \
305 ${blddir}/src/${PROGNAME} ${batch} \
306 -eval '(setq finder-compile-keywords-quiet t)' \
307 -l finder -f finder-compile-keywords )
308 @echo "Building finder database ...(done)"
309 288
310 ## We have to force the building of Emacs.ad.h as well in order to get it 289 ## We have to force the building of Emacs.ad.h as well in order to get it
311 ## updated correctly when VPATH is being used. Since we use move-if-change, 290 ## updated correctly when VPATH is being used. Since we use move-if-change,
312 ## it will only actually change if the user modified ${etcdir}/Emacs.ad. 291 ## it will only actually change if the user modified ${etcdir}/Emacs.ad.
313 src/Emacs.ad.h: ${srcdir}/etc/Emacs.ad 292 src/Emacs.ad.h: ${srcdir}/etc/Emacs.ad
369 348
370 ## On AIX, use tar xBf. 349 ## On AIX, use tar xBf.
371 ## On Xenix, use tar xpf. 350 ## On Xenix, use tar xpf.
372 351
373 .PHONY: install-only install install-arch-dep install-arch-indep gzip.el mkdir 352 .PHONY: install-only install install-arch-dep install-arch-indep gzip.el mkdir
374 .PHONY: check-features 353 .PHONY: check check-features
375 354
376 ## We delete each directory in ${COPYDESTS} before we copy into it; 355 ## We delete each directory in ${COPYDESTS} before we copy into it;
377 ## that way, we can reinstall over directories that have been put in 356 ## that way, we can reinstall over directories that have been put in
378 ## place with their files read-only (perhaps because they are checked 357 ## place with their files read-only (perhaps because they are checked
379 ## into RCS). In order to make this safe, we make sure that the 358 ## into RCS). In order to make this safe, we make sure that the
384 ## 'make install' right off the bat because src/paths.h won't exist. 363 ## 'make install' right off the bat because src/paths.h won't exist.
385 ## And, in XEmacs case, src/Emacs.ad.h won't exist either. I also 364 ## And, in XEmacs case, src/Emacs.ad.h won't exist either. I also
386 ## don't see the point in avoiding modifying paths.h. It creates an 365 ## don't see the point in avoiding modifying paths.h. It creates an
387 ## inconsistency in the build process. So we go ahead and depend on 366 ## inconsistency in the build process. So we go ahead and depend on
388 ## all. --cet 367 ## all. --cet
389
390 check-features: all
391 ${blddir}/src/${PROGNAME} ${batch} -l check-features.el
392 368
393 install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep 369 install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep
394 370
395 install: all check-features install-arch-dep install-arch-indep 371 install: all check-features install-arch-dep install-arch-indep
396 372
618 ## and VC will swiftly let you know if this happens, and it is easily 594 ## and VC will swiftly let you know if this happens, and it is easily
619 ## corrected. 595 ## corrected.
620 SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in.in PROBLEMS \ 596 SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in.in PROBLEMS \
621 README build-install.in configure make-dist move-if-change 597 README build-install.in configure make-dist move-if-change
622 598
623 .PHONY: unlock relock TAGS tags check dist info dvi mcs 599 .PHONY: unlock relock TAGS tags dist info dvi mcs
624 600
625 unlock: 601 unlock:
626 chmod u+w $(SOURCES) cpp/* 602 chmod u+w $(SOURCES) cpp/*
627 -cd ./elisp && chmod u+w Makefile README *.texi 603 -cd ./elisp && chmod u+w Makefile README *.texi
628 for d in src etc lib-src lisp; do (cd ./$$d && $(RECURSIVE_MAKE) $@); done 604 for d in src etc lib-src lisp; do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
649 find src lwlib lib-src modules ${PRUNE_VC} -name '*.[ch]' -print | \ 625 find src lwlib lib-src modules ${PRUNE_VC} -name '*.[ch]' -print | \
650 xargs etags -a -r '/[ ]*DEF\(VAR\|INE\)_[A-Z_]+[ ]*([ ]*"\([^"]+\)"/\2/'; \ 626 xargs etags -a -r '/[ ]*DEF\(VAR\|INE\)_[A-Z_]+[ ]*([ ]*"\([^"]+\)"/\2/'; \
651 find ${tagslisp} ${PRUNE_VC} -name '*.el' ! -name 'auto-autoloads.el' -print | \ 627 find ${tagslisp} ${PRUNE_VC} -name '*.el' ! -name 'auto-autoloads.el' -print | \
652 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/" 628 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/"
653 629
654 check:
655 cd ./src && $(RECURSIVE_MAKE) $@
656
657 info: FRC.info 630 info: FRC.info
658 cd ${srcdir}/man && $(RECURSIVE_MAKE) $@ 631 cd ${srcdir}/man && $(RECURSIVE_MAKE) $@
659 632
660 dvi: 633 dvi:
661 cd ${srcdir}/man && $(RECURSIVE_MAKE) $@ 634 cd ${srcdir}/man && $(RECURSIVE_MAKE) $@