Merge from origin/emacs-24

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3c389b6e837cc5641b19129a2fa1018f11a8d01e..4cdd293ebd4e4eac016879b42243b78efc2b9a8c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 1992-2014 Free Software Foundation, Inc.
+# Copyright (C) 1992-2015 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -94,6 +94,19 @@ configuration=@configuration@
 ### The nt/ subdirectory gets built only for MinGW
 NTDIR=@NTDIR@
 
+# 'make' verbosity.
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+
+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 =
+
 # ==================== Where To Install Things ====================
 
 # Location to install Emacs.app under GNUstep / Mac OS X.
@@ -259,7 +272,7 @@ MKDIR_P = @MKDIR_P@
 # Create a link to a file in the same directory as the target.
 LN_S_FILEONLY = @LN_S_FILEONLY@
 
-# We use gzip to compress installed .el files.
+# We use gzip to compress installed .el and some .txt files.
 GZIP_PROG = @GZIP_PROG@
 
 # ============================= Targets ==============================
@@ -371,15 +384,18 @@ lisp: src
 lib lib-src lisp nt: Makefile
        $(MAKE) -C $@ all
 
-# Note the use of single quotes in the value of vcswitness.
-# This passes an unexpanded $srcdir to src's Makefile, which then
+# Ideally, VCSWITNESS should be a file that is modified whenever the
+# repository registers a commit from either a local checkin or a
+# repository pull. In git there is no single file that guarantees
+# this, but the local log for the current head should be close enough.
+#
+# Pass an unexpanded $srcdir to src's Makefile, which then
 # expands it using its own value of srcdir (which points to the
 # source directory of src/).
+dirstate = .git/logs/HEAD
+VCSWITNESS = $(if $(wildcard $(srcdir)/$(dirstate)),$$(srcdir)/../$(dirstate))
 src: Makefile
-       dirstate='.bzr/checkout/dirstate';                              \
-       vcswitness='$$(srcdir)/../'$$dirstate;                          \
-       [ -r "$(srcdir)/$$dirstate" ] || vcswitness='';                 \
-       $(MAKE) -C $@ all VCSWITNESS="$$vcswitness"
+       $(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' all
 
 blessmail: Makefile src
        $(MAKE) -C lib-src maybe-blessmail
@@ -403,7 +419,7 @@ $(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \
 # Don't erase these files if make is interrupted while refreshing them.
 .PRECIOUS: Makefile config.status
 
-config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
+config.status: ${srcdir}/configure
        if [ -x ./config.status ]; then \
            $(CFG) ./config.status --recheck;   \
        else                            \
@@ -436,11 +452,11 @@ $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
        @ # because stamp-h.in has changed (since building stamp-h.in
        @ # refreshes config.in as well), but if config.in is missing
        @ # then we really need to do something more.
-       [ -r "$@" ] || ( cd ${srcdir} && ${AUTOHEADER} )
+       $(if $(wildcard $@),,cd $(srcdir) && $(AUTOHEADER))
 $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
        cd ${srcdir} && ${AUTOHEADER}
-       rm -f $(srcdir)/src/stamp-h.in
-       echo timestamp > $(srcdir)/src/stamp-h.in
+       rm -f $@
+       echo timestamp > $@
 
 # ==================== Installation ====================
 
@@ -595,11 +611,12 @@ install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
        subdir="$(DESTDIR)${datadir}/emacs/site-lisp" ; \
          ${write_subdir} || true
        [ -z "${GZIP_PROG}" ] || { \
-         echo "Compressing *.el ..." && \
+         echo "Compressing *.el etc. ..." && \
          cd "$(DESTDIR)${lispdir}" && \
          for f in `find . -name "*.elc" -print | sed 's/.elc$$/.el/'`; do \
            ${GZIP_PROG} -9n "$$f"; \
          done; \
+         ${GZIP_PROG} -9n "../etc/publicsuffix.txt"; \
        }
        -chmod -R a+r "$(DESTDIR)${datadir}/emacs/${version}" ${COPYDESTS}
 
@@ -958,8 +975,8 @@ info_dir_deps = \
 ## but then we would need to depend on info-real, which would
 ## slow down parallelization.
 ${srcdir}/info/dir: ${info_dir_deps}
-       ${MKDIR_P} ${srcdir}/info
-       tempfile=info-dir.$$$$; \
+       $(AM_V_at)${MKDIR_P} ${srcdir}/info
+       $(AM_V_GEN)tempfile=info-dir.$$$$; \
        rm -f $${tempfile}; \
        (cd ${srcdir}/doc && \
         AWK='${AWK}' ../build-aux/make-info-dir ${info_dir_inputs} \
@@ -1026,11 +1043,9 @@ uninstall-ps: $(UNINSTALL_PS)
 # and it's not worth it.  This case is only relevant if you download a
 # release, then change the .texi files.
 info:
-       @if test "$(HAVE_MAKEINFO)" = "no"; then \
-         echo "Configured --without-makeinfo, not building manuals" ; \
-       else \
-         $(MAKE) info-real info-dir; \
-       fi
+  ifneq ($(HAVE_MAKEINFO),no)
+       $(MAKE) info-real info-dir
+  endif
 
 ## build-aux/make-info-dir expects only certain dircategories.
 check-info: info