* lib/freeze.mk ($(build_libdir)/m4sugar/version.m4): New, for

parallel builds.

diff --git a/ChangeLog b/ChangeLog
index 73cac5cbcf3cf1b928730e45ef4787674871df5f..168604576ec4198237135bf9303fdac09fac1a15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-04  Akim Demaille  <akim@epita.fr>
+
+       * lib/freeze.mk ($(build_libdir)/m4sugar/version.m4): New, for
+       parallel builds.
+
 2002-03-04  Akim Demaille  <akim@epita.fr>
 
        * doc/autoconf.texi (Transforming Names): Equality between target

diff --git a/Makefile.in b/Makefile.in
index 8a02fdb1cc5d53d41dd6f5dfc299917a184b9fc9..900ca24afd030838f8ecec88e5cba8c8cfdb4485 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.5e from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/aclocal.m4 b/aclocal.m4
index 03f5c0191213c5015b8533710e5278542458dd81..8ff0bc4063af52030be478f9fcc23b2a81cd9adc 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# aclocal.m4 generated automatically by aclocal 1.5c -*- Autoconf -*-
+# aclocal.m4t generated automatically by aclocal 1.5e -*- Autoconf -*-
 
 # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -131,14 +131,14 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX],
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.5c"])
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.5e"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-        [AM_AUTOMAKE_VERSION([1.5c])])
+        [AM_AUTOMAKE_VERSION([1.5e])])
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 
@@ -570,7 +570,7 @@ AC_SUBST([AMDEPBACKSLASH])
 
 # Generate code to set up dependency tracking.   -*- Autoconf -*-
 
-# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -595,10 +595,10 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [for mf in $CONFIG_FILES; do
   # Strip MF so we end up with the name of the file.
   mf=`echo "$mf" | sed -e 's/:.*$//'`
-  if (head -1 $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
+  if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
-    dirpart=
+    dirpart=.
   fi
   grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
   # Extract the definition of DEP_FILES from the Makefile without
@@ -798,13 +798,13 @@ fi])])
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 4
+# serial 5
 
 # AM_PATH_LISPDIR
 # ---------------
 AC_DEFUN([AM_PATH_LISPDIR],
 [AC_ARG_WITH(lispdir,
- [   --with-lispdir            Override the default lisp directory ],
+ [  --with-lispdir          Override the default lisp directory ],
  [ lispdir="$withval"
    AC_MSG_CHECKING([where .elc files should go])
    AC_MSG_RESULT([$lispdir])],
@@ -816,7 +816,12 @@ AC_DEFUN([AM_PATH_LISPDIR],
  if test $EMACS != "no"; then
    if test x${lispdir+set} != xset; then
      AC_CACHE_CHECK([where .elc files should go], [am_cv_lispdir],
-       [AC_RUN_LOG([$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' >conftest.out])
+       [# If $EMACS isn't GNU Emacs or XEmacs, this can blow up pretty badly
+  # Some emacsen will start up in interactive mode, requiring C-x C-c to exit,
+  #  which is non-obvious for non-emacs users.
+  # Redirecting /dev/null should help a bit; pity we can't detect "broken"
+  #  emacsen earlier and avoid running this altogether.
+  AC_RUN_LOG([$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' </dev/null >conftest.out])
         am_cv_lispdir=`sed -n \
        -e 's,/$,,' \
        -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' \

diff --git a/bin/Makefile.in b/bin/Makefile.in
index 4408b27305495870b016c8e949dfc13d21bee36d..647eda5a2ddd22b60ba8fcc4f749d534791274f6 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.5e from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/config/Makefile.in b/config/Makefile.in
index e17e59b6adfc9c158224798b8a40c88e63c7d3b9..be3709edc78d74a64c22949f3f5c3a2ae12836ae 100644 (file)
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.5e from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/configure b/configure
index fe47347672a356911d07985cd0032925af195174..5bb21a80218f2f9ed0845c192cee9c21b0ac50c4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.52h for GNU Autoconf 2.52i.
+# Generated by GNU Autoconf 2.52i for GNU Autoconf 2.52i.
 #
 # Report bugs to <bug-autoconf@gnu.org>.
 #
@@ -773,7 +773,7 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-   --with-lispdir            Override the default lisp directory
+  --with-lispdir          Override the default lisp directory
 
 Report bugs to <bug-autoconf@gnu.org>.
 _ACEOF
@@ -839,7 +839,7 @@ test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU Autoconf configure 2.52i
-generated by GNU Autoconf 2.52h
+generated by GNU Autoconf 2.52i
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 Free Software Foundation, Inc.
@@ -854,7 +854,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU Autoconf $as_me 2.52i, which was
-generated by GNU Autoconf 2.52h.  Invocation command line was
+generated by GNU Autoconf 2.52i.  Invocation command line was
 
   $ $0 $@
 
@@ -1161,7 +1161,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 ac_config_files="$ac_config_files config/Makefile"
 
 
-am__api_version="1.5c"
+am__api_version="1.5e"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1774,8 +1774,13 @@ echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6
 if test "${am_cv_lispdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  { (echo "$as_me:$LINENO: \$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) \"\\n\")) (setq load-path (cdr load-path)))' >conftest.out") >&5
-  ($EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' >conftest.out) 2>&5
+  # If $EMACS isn't GNU Emacs or XEmacs, this can blow up pretty badly
+  # Some emacsen will start up in interactive mode, requiring C-x C-c to exit,
+  #  which is non-obvious for non-emacs users.
+  # Redirecting /dev/null should help a bit; pity we can't detect "broken"
+  #  emacsen earlier and avoid running this altogether.
+  { (echo "$as_me:$LINENO: \$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) \"\\n\")) (setq load-path (cdr load-path)))' </dev/null >conftest.out") >&5
+  ($EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' </dev/null >conftest.out) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
@@ -2166,7 +2171,7 @@ _ASBOX
 cat >&5 <<_CSEOF
 
 This file was extended by GNU Autoconf $as_me 2.52i, which was
-generated by GNU Autoconf 2.52h.  Invocation command line was
+generated by GNU Autoconf 2.52i.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2223,7 +2228,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 GNU Autoconf config.status 2.52i
-configured by $0, generated by GNU Autoconf 2.52h,
+configured by $0, generated by GNU Autoconf 2.52i,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001

diff --git a/doc/Makefile.in b/doc/Makefile.in
index ee149bdf853cdf924ebfafa48bf479c9aedbe6ed..806bab3b579382c2d1da462aee74c34422b904d2 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.5e from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/lib/Autom4te/Makefile.in b/lib/Autom4te/Makefile.in
index a1aec7683296634ed1913babd852240bd89f0719..17fabe38b5f4f372a5c113b168ac5646631d7dd7 100644 (file)
--- a/lib/Autom4te/Makefile.in
+++ b/lib/Autom4te/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.5e from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 831b23a4a35ae899a6e8ea7ccadf5b6306a80546..61fe9a5c74d0100ac94f100f3cec65907effe7a5 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.5e from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/lib/autoconf/Makefile.in b/lib/autoconf/Makefile.in
index 1da90e7aa2bf052cbc645d29874054b930d1b0d7..0b27c20ad54a1bef0b033dd8dbac3c60648ff632 100644 (file)
--- a/lib/autoconf/Makefile.in
+++ b/lib/autoconf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.5e from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -377,6 +377,10 @@ $(AUTOM4TE_CFG):
                --include=$(srcdir)/..          \
                --include=..                    \
                --output=$@
+
+# For parallel builds.
+$(build_libdir)/m4sugar/version.m4:
+       cd $(build_libdir)/m4sugar && $(MAKE) $(AM_MAKEFLAGS) version.m4
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/lib/autoscan/Makefile.in b/lib/autoscan/Makefile.in
index dcabff692eff4a3a2c39d314bb73c305e91ab1e6..92a6cc7dcbbc740fedc7141c7d1815b945272559 100644 (file)
--- a/lib/autoscan/Makefile.in
+++ b/lib/autoscan/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.5e from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/lib/autotest/Makefile.in b/lib/autotest/Makefile.in
index 0ea0d96590863ab01fa94c3a393334a1204605b4..ecf2eb0d5e6d18e9b1e8f1161d54502929ab5700 100644 (file)
--- a/lib/autotest/Makefile.in
+++ b/lib/autotest/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.5e from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -370,6 +370,10 @@ $(AUTOM4TE_CFG):
                --include=$(srcdir)/..          \
                --include=..                    \
                --output=$@
+
+# For parallel builds.
+$(build_libdir)/m4sugar/version.m4:
+       cd $(build_libdir)/m4sugar && $(MAKE) $(AM_MAKEFLAGS) version.m4
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/lib/emacs/Makefile.in b/lib/emacs/Makefile.in
index ec017ff296a66b103782e16f50c779021bac030c..170ba1732806a90e5e91ad1733b49d3fa84c223a 100644 (file)
--- a/lib/emacs/Makefile.in
+++ b/lib/emacs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.5e from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/lib/freeze.mk b/lib/freeze.mk
index 074acdf243deb059c8b75a968eeb658b33ba5241..251b4afaf1d4a16ac9bde872497b12d72e398dad 100644 (file)
--- a/lib/freeze.mk
+++ b/lib/freeze.mk
@@ -53,6 +53,10 @@ build_libdir = $(top_builddir)/lib
 
 m4f_dependencies = $(MY_AUTOM4TE) $(AUTOM4TE_CFG)
 
+# For parallel builds.
+$(build_libdir)/m4sugar/version.m4:
+       cd $(build_libdir)/m4sugar && $(MAKE) $(AM_MAKEFLAGS) version.m4
+
 m4sugar_m4f_dependencies =                     \
        $(m4f_dependencies)                     \
        $(src_libdir)/m4sugar/m4sugar.m4        \

diff --git a/lib/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in
index 587d7785c09a5d271b2f35dc999ab914a17e4e78..500e00555e1989e027ee2e708e700cb7069f3ffb 100644 (file)
--- a/lib/m4sugar/Makefile.in
+++ b/lib/m4sugar/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.5e from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -385,6 +385,10 @@ $(AUTOM4TE_CFG):
                --include=$(srcdir)/..          \
                --include=..                    \
                --output=$@
+
+# For parallel builds.
+$(build_libdir)/m4sugar/version.m4:
+       cd $(build_libdir)/m4sugar && $(MAKE) $(AM_MAKEFLAGS) version.m4
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/man/Makefile.in b/man/Makefile.in
index a41ef0314b0f2a5e4b14c97fbe6f3f803184dd34..0e0eab927ad134342633cb4de30bf4374892ac45 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.5e from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/tests/Makefile.in b/tests/Makefile.in
index c72281f753551f01a1ca754348d839b8499c3c3b..8c5272e072f5ea0cd6588cf4a1a791d57554feb6 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.5e from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002