[Emacs-diffs] /srv/bzr/emacs/trunk r104355: Auto-commit of generated files.

[Glenn Morris]

------------------------------------------------------------
revno: 104355
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-05-24 13:24:15 -0400
message:
  Auto-commit of generated files.
modified:
  autogen/Makefile.in
  autogen/configure

=== modified file 'autogen/Makefile.in'
--- a/autogen/Makefile.in       2011-05-24 16:31:25 +0000
+++ b/autogen/Makefile.in       2011-05-24 17:24:15 +0000
@@ -508,7 +508,6 @@
 OLDXMENU = @OLDXMENU@
 OLDXMENU_DEPS = @OLDXMENU_DEPS@
 OLDXMENU_TARGET = @OLDXMENU_TARGET@
-OPT_MAKEFILES_IN = @OPT_MAKEFILES_IN@
 OTHER_FILES = @OTHER_FILES@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -625,6 +624,7 @@
 STDDEF_H = @STDDEF_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
+SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@
 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 S_FILE = @S_FILE@
 TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@

=== modified file 'autogen/configure'
--- a/autogen/configure 2011-05-24 16:31:25 +0000
+++ b/autogen/configure 2011-05-24 17:24:15 +0000
@@ -603,7 +603,7 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-OPT_MAKEFILES_IN
+SUBDIR_MAKEFILES_IN
 LIB_GCC
 LD_FIRSTFLAG
 LD_SWITCH_SYSTEM_TEMACS
@@ -20909,16 +20909,17 @@
 test "${exec_prefix}" != NONE &&
   exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`
 
-ac_config_files="$ac_config_files Makefile lib/Makefile lib-src/Makefile 
oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile 
doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile"
-
-
-if test -f $srcdir/test/automated/Makefile.in; then
-  OPT_MAKEFILES_IN="\$(srcdir)/test/automated/Makefile.in"
-  ac_config_files="$ac_config_files test/automated/Makefile"
-
-else
-  OPT_MAKEFILES_IN=
-fi
+SUBDIR_MAKEFILES="lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile 
doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile 
lwlib/Makefile lisp/Makefile leim/Makefile"
+
+opt_makefile=test/automated/Makefile
+
+test -f $srcdir/${opt_makefile}.in && \
+  SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $opt_makefile"
+
+SUBDIR_MAKEFILES_IN=`echo " lib/Makefile ${SUBDIR_MAKEFILES}" | sed -e 's| | 
$(srcdir)/|g' -e 's|Makefile|Makefile.in|g'`
+
+
+ac_config_files="$ac_config_files Makefile lib/Makefile ${SUBDIR_MAKEFILES}"
 
 
 ac_config_commands="$ac_config_commands mkdirs"
@@ -21719,17 +21720,7 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-    "lib-src/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile" ;;
-    "oldXMenu/Makefile") CONFIG_FILES="$CONFIG_FILES oldXMenu/Makefile" ;;
-    "doc/emacs/Makefile") CONFIG_FILES="$CONFIG_FILES doc/emacs/Makefile" ;;
-    "doc/misc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/misc/Makefile" ;;
-    "doc/lispintro/Makefile") CONFIG_FILES="$CONFIG_FILES 
doc/lispintro/Makefile" ;;
-    "doc/lispref/Makefile") CONFIG_FILES="$CONFIG_FILES doc/lispref/Makefile" 
;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "lwlib/Makefile") CONFIG_FILES="$CONFIG_FILES lwlib/Makefile" ;;
-    "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;;
-    "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;;
-    "test/automated/Makefile") CONFIG_FILES="$CONFIG_FILES 
test/automated/Makefile" ;;
+    "${SUBDIR_MAKEFILES}") CONFIG_FILES="$CONFIG_FILES ${SUBDIR_MAKEFILES}" ;;
     "mkdirs") CONFIG_COMMANDS="$CONFIG_COMMANDS mkdirs" ;;
     "epaths") CONFIG_COMMANDS="$CONFIG_COMMANDS epaths" ;;
     "gdbinit") CONFIG_COMMANDS="$CONFIG_COMMANDS gdbinit" ;;