X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/f9d80c51100e230f37df6bd3864e607f6b145cc7..5fbd17e369ca30a47ab8a2eda0b2f2ea9b690bb4:/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index c858220c43..a2754eadac 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2014 Free Software +# Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2015 Free Software # Foundation, Inc. # This file is part of GNU Emacs. @@ -28,12 +28,11 @@ SHELL = @SHELL@ # Here are the things that we expect ../configure to edit. # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. srcdir = @srcdir@ +top_srcdir = @top_srcdir@ # MinGW CPPFLAGS may use this. abs_top_srcdir=@abs_top_srcdir@ -ntsource = $(srcdir)/../nt VPATH = $(srcdir) CC = @CC@ -WINDRES = @WINDRES@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ @@ -48,7 +47,7 @@ MKDIR_P = @MKDIR_P@ # LIBS = @LIBS@ LIBOBJS = @LIBOBJS@ -lispsource = $(srcdir)/../lisp +lispsource = $(top_srcdir)/lisp lib = ../lib libsrc = ../lib-src etc = ../etc @@ -115,6 +114,8 @@ TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) ## around this, newer ones setfattr. See Bug#11398 and Bug#16343. PAXCTL = @PAXCTL@ SETFATTR = @SETFATTR@ +PAXCTL_if_present = $(or $(PAXCTL),: paxctl) +SETFATTR_if_present = $(or $(SETFATTR),: setfattr) ## Some systems define this to request special libraries. LIBS_SYSTEM=@LIBS_SYSTEM@ @@ -249,7 +250,7 @@ MSDOS_OBJ = MSDOS_X_OBJ = NS_OBJ=@NS_OBJ@ -## nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o macfont.o if HAVE_NS. +## nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o ns_fontfile if HAVE_NS. NS_OBJC_OBJ=@NS_OBJC_OBJ@ ## Only set if NS_IMPL_GNUSTEP. GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@ @@ -263,8 +264,6 @@ W32_LIBS=@W32_LIBS@ ## emacs.res if HAVE_W32 EMACSRES = @EMACSRES@ -## emacs-*.manifest if HAVE_W32 -EMACS_MANIFEST = @EMACS_MANIFEST@ ## If HAVE_W32, compiler arguments for including ## the resource file in the binary. ## Cygwin: -Wl,emacs.res @@ -296,13 +295,33 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ RUN_TEMACS = ./temacs -## Static heap size for temacs on MinGW. -EMACS_HEAPSIZE = @EMACS_HEAPSIZE@ - UNEXEC_OBJ = @UNEXEC_OBJ@ CANNOT_DUMP=@CANNOT_DUMP@ +# 'make' verbosity. +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = + +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = + +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = + +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = + DEPDIR=deps ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. DEPFLAGS=@DEPFLAGS@ @@ -319,7 +338,7 @@ MKDEPDIR=@MKDEPDIR@ ## ## FIXME? MYCPPFLAGS only referenced in etc/DEBUG. ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \ - -I$(lib) -I$(srcdir)/../lib \ + -I$(lib) -I$(top_srcdir)/lib \ $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \ $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \ @@ -333,10 +352,10 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) .SUFFIXES: .m .c.o: @$(MKDEPDIR) - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(PROFILING_CFLAGS) $< + $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(PROFILING_CFLAGS) $< .m.o: @$(MKDEPDIR) - $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $(PROFILING_CFLAGS) $< + $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $(PROFILING_CFLAGS) $< ## lastfile must follow all files whose initialized data areas should ## be dumped as pure by dump-emacs. @@ -414,11 +433,15 @@ all: emacs$(EXEEXT) $(OTHER_FILES) .PHONY: all $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) - cd ../leim && $(MAKE) leim-list.el EMACS="$(bootstrap_exe)" + $(MAKE) -C ../leim leim-list.el EMACS="$(bootstrap_exe)" +## FORCE it so that admin/unidata can decide whether these files +## are up-to-date. Although since charprop depends on bootstrap-emacs, +## and emacs (which recreates bootstrap-emacs) depends on charprop, +## in practice this rule was always run anyway. $(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \ - bootstrap-emacs$(EXEEXT) - cd ../admin/unidata && $(MAKE) all EMACS="../$(bootstrap_exe)" + bootstrap-emacs$(EXEEXT) FORCE + $(MAKE) -C ../admin/unidata all EMACS="../$(bootstrap_exe)" ## The dumped Emacs is as functional and more efficient than ## bootstrap-emacs, so we replace the latter with the former. @@ -428,15 +451,13 @@ $(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \ emacs$(EXEEXT): temacs$(EXEEXT) \ $(etc)/DOC $(lisp) $(leimdir)/leim-list.el \ $(lispsource)/international/charprop.el - if test "$(CANNOT_DUMP)" = "yes"; then \ - rm -f emacs$(EXEEXT); \ - ln temacs$(EXEEXT) emacs$(EXEEXT); \ - else \ - LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \ - test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \ - rm -f bootstrap-emacs$(EXEEXT); \ - ln emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ - fi +ifeq ($(CANNOT_DUMP),yes) + ln -f temacs$(EXEEXT) $@ +else + LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump + $(PAXCTL_if_present) -zex $@ + ln -f $@ bootstrap-emacs$(EXEEXT) +endif ## We run make-docfile twice because the command line may get too long ## on some systems. The sed command operating on lisp.mk also reduces @@ -453,34 +474,37 @@ emacs$(EXEEXT): temacs$(EXEEXT) \ ## in the contents of the DOC file. ## $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) - $(MKDIR_P) $(etc) - -rm -f $(etc)/DOC - $(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC - $(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) `sed -n -e 's| \\\\||' -e 's|^[ ]*$$(lispsource)/||p' $(srcdir)/lisp.mk` + $(AM_V_GEN)$(MKDIR_P) $(etc) + -$(AM_V_at)rm -f $(etc)/DOC + $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \ + $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC + $(AM_V_at)$(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) \ + `sed -n -e 's| \\\\||' -e 's|^[ ]*$$(lispsource)/||p' \ + $(srcdir)/lisp.mk` $(libsrc)/make-docfile$(EXEEXT): - cd $(libsrc); $(MAKE) make-docfile$(EXEEXT) + $(MAKE) -C $(libsrc) make-docfile$(EXEEXT) buildobj.h: Makefile - for i in $(ALLOBJS); do \ + $(AM_V_GEN)for i in $(ALLOBJS); do \ echo "$$i" | sed 's,.*/,,; s/\.obj$$/\.o/; s/^/"/; s/$$/",/' \ || exit; \ done >$@.tmp - mv $@.tmp $@ + $(AM_V_at)mv $@.tmp $@ globals.h: gl-stamp; @true GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) - $(libsrc)/make-docfile -d $(srcdir) -g $(obj) > gl.tmp - $(srcdir)/../build-aux/move-if-change gl.tmp globals.h - echo timestamp > $@ + $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) > gl.tmp + $(AM_V_at)$(top_srcdir)/build-aux/move-if-change gl.tmp globals.h + $(AM_V_at)echo timestamp > $@ $(ALLOBJS): globals.h $(lib)/libgnu.a: $(config_h) - cd $(lib) && $(MAKE) libgnu.a + $(MAKE) -C $(lib) libgnu.a ## We have to create $(etc) here because init_cmdargs tests its ## existence when setting Vinstallation_directory (FIXME?). @@ -488,44 +512,48 @@ $(lib)/libgnu.a: $(config_h) ## to start if Vinstallation_directory has the wrong value. temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \ $(lib)/libgnu.a $(EMACSRES) - $(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \ + $(AM_V_CCLD)$(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \ -o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES) $(MKDIR_P) $(etc) - test "$(CANNOT_DUMP)" = "yes" || \ - test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT) - test "$(CANNOT_DUMP)" = "yes" || test -z "$(SETFATTR)" || \ - $(SETFATTR) -n user.pax.flags -v r $@ +ifneq ($(CANNOT_DUMP),yes) + $(PAXCTL_if_present) -r $@ + $(SETFATTR_if_present) -n user.pax.flags -v er $@ +endif ## The following oldxmenu-related rules are only (possibly) used if ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them. $(lwlibdir)/liblw.a: $(config_h) globals.h lisp.h FORCE - cd $(lwlibdir) && $(MAKE) liblw.a + $(MAKE) -C $(lwlibdir) liblw.a $(oldXMenudir)/libXMenu11.a: FORCE - cd $(oldXMenudir) && $(MAKE) libXMenu11.a + $(MAKE) -C $(oldXMenudir) libXMenu11.a FORCE: .PHONY: FORCE -../config.status: config.in epaths.in - @echo "The file ${?:.in=.h} needs to be set up from $?." - @echo "Please run the 'configure' script again." - exit 1 +ACLOCAL_INPUTS = $(top_srcdir)/configure.ac $(top_srcdir)/m4/*.m4 +AUTOCONF_INPUTS = $(top_srcdir)/configure.ac $(top_srcdir)/aclocal.m4 +$(top_srcdir)/aclocal.m4: $(ACLOCAL_INPUTS) +$(top_srcdir)/configure config.in: $(AUTOCONF_INPUTS) +.PRECIOUS: ../config.status Makefile +../config.status: $(top_srcdir)/configure $(top_srcdir)/lisp/version.el +Makefile: ../config.status $(srcdir)/Makefile.in +$(top_srcdir)/aclocal.m4 $(top_srcdir)/configure config.in ../config.status \ + Makefile: + $(MAKE) -C .. am--refresh doc.o: buildobj.h -emacs.res: $(ntsource)/emacs.rc \ - $(ntsource)/icons/emacs.ico \ - $(ntsource)/$(EMACS_MANIFEST) - $(WINDRES) -O COFF --include-dir=$(srcdir)/../nt \ - -o $@ $(ntsource)/emacs.rc +emacs.res: FORCE + $(MAKE) -C ../nt ../src/emacs.res +.PHONY: ns-app ns-app: emacs$(EXEEXT) - cd ../nextstep && $(MAKE) all + $(MAKE) -C ../nextstep all .PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean .PHONY: versionclean extraclean mostlyclean: - rm -f temacs$(EXEEXT) core *.core \#* *.o libXMenu11.a liblw.a + rm -f temacs$(EXEEXT) core *.core \#* *.o rm -f ../etc/DOC rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT) rm -f buildobj.h @@ -578,10 +606,10 @@ TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) $(srcdir)/$(ctagsfiles3) ## Arrange to make tags tables for ../lisp and ../lwlib, ## which the above TAGS file for the C files includes by reference. ../lisp/TAGS: - cd ../lisp && $(MAKE) TAGS ETAGS="$(ETAGS)" + $(MAKE) -C ../lisp TAGS ETAGS="$(ETAGS)" $(lwlibdir)/TAGS: - cd $(lwlibdir) && $(MAKE) TAGS ETAGS="$(ETAGS)" + $(MAKE) -C $(lwlibdir) TAGS ETAGS="$(ETAGS)" tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS .PHONY: tags @@ -594,57 +622,43 @@ tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS ## such as loaddefs.el or *.elc can typically be produced by any old ## Emacs executable, so we would like to avoid rebuilding them whenever ## we build a new Emacs executable. +## +## (In other words, changing a single file src/foo.c would force +## dumping a new bootstrap-emacs, then re-byte-compiling all preloaded +## elisp files, and only then dump the actual src/emacs, which is not +## wrong, but is overkill in 99.99% of the cases.) +## ## To solve the circularity, we use 2 different Emacs executables, ## "emacs" is the main target and "bootstrap-emacs" is the one used ## to build the *.elc and loaddefs.el files. -## To solve the freshness issue, we used to use a third file "witness-emacs" -## which was used to witness the fact that there is a bootstrap-emacs -## executable, and then have dependencies on witness-emacs rather than -## bootstrap-emacs, but that lead to problems in parallel builds (because -## witness-emacs needed to be free from dependencies (to avoid rebuilding -## it), so it was compiled in parallel, leading typically to having 2 -## processes dumping bootstrap-emacs at the same time). -## So instead, we replace the witness-emacs dependencies by conditional -## bootstrap-dependencies (via $(BOOTSTRAPEMACS)). Of course, since we do -## not want to rely on GNU Make features, we have to rely on an external -## script to do the conditional part of the dependency -## (i.e. see the $(SUBDIR) rule ../Makefile.in). - -.SUFFIXES: .elc .el - -## These suffix rules do not allow additional dependencies, sadly, so -## instead of adding a $(BOOTSTRAPEMACS) dependency here, we add it -## separately below. -## With GNU Make, we would just say "%.el : %.elc $(BOOTSTRAPEMACS)" -.el.elc: - @cd ../lisp && $(MAKE) compile-onefile \ - THEFILE=$< EMACS="$(bootstrap_exe)" - -## Since the .el.elc rule cannot specify an extra dependency, we do it here. -$(lisp): $(BOOTSTRAPEMACS) +## To solve the freshness issue, in the past we tried various clever tricks, +## but now that we require GNU make, we can simply specify +## bootstrap-emacs$(EXEEXT) as an order-only prerequisite. + +%.elc: %.el | bootstrap-emacs$(EXEEXT) + @$(MAKE) -C ../lisp EMACS="$(bootstrap_exe)" THEFILE=$< $