Fix generation of auto-dependency files in lib/.

 .bzrignore: Add lib/deps/.
 config.bat: Generate *.Po files in lib/deps.
 msdos/sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Fix editing of *-clean
 rules.
 msdos/depfiles.bat: New file.

diff --git a/ChangeLog b/ChangeLog
index 906bb38c3401f20eb5c803853bc0d9fafb0cde8d..e6675449001f79be596d6c2e8da89c59786443e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,10 @@
 2011-02-19  Eli Zaretskii  <eliz@gnu.org>
 
        * .bzrignore: Ignore cxxdefs.h and lib/*.in-h files.
+       Add lib/deps/.
 
        * config.bat: Configure in `lib'.
+       Generate *.Po files in lib/deps.
 
 2011-02-18  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/config.bat b/config.bat
index 730a33770e9f4bded923b0174d37aabfe9290247..7ebfc74b801605b5cb355ce22550d192dfca1532 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -288,6 +288,9 @@ If Exist unistd.in.h update unistd.in.h unistd.in-h
 sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp\r
 sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile\r
 rm -f makefile.tmp\r
+If Not Exist deps\stamp mkdir deps\r
+If Not Exist deps\stamp for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f\r
+If Not Exist deps\stamp echo deps-stamp > deps\stamp\r
 cd ..\r
 rem   ----------------------------------------------------------------------\r
 Echo Configuring the lisp directory...\r

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 9a98352ff23c9974f50facb956e4d751cdc54296..7a4d107eebe75ddea2bb859df429622d7bb2c688 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,5 +1,10 @@
 2011-02-19  Eli Zaretskii  <eliz@gnu.org>
 
+       * sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Fix editing of *-clean
+       rules.
+
+       * depfiles.bat: New file.
+
        * sedlibmk.inp: New file.
 
        * sedlibcf.inp: New file.

diff --git a/msdos/depfiles.bat b/msdos/depfiles.bat
new file mode 100644 (file)
index 0000000..22fcfc3
--- /dev/null
+++ b/msdos/depfiles.bat
@@ -0,0 +1,25 @@
+@echo off\r
+rem   ----------------------------------------------------------------------\r
+rem   Auxiliary script for MSDOS, run by ../config.bat\r
+rem   Copyright (C) 2011  Free Software Foundation, Inc.\r
+\r
+rem   This file is part of GNU Emacs.\r
+\r
+rem   GNU Emacs is free software: you can redistribute it and/or modify\r
+rem   it under the terms of the GNU General Public License as published by\r
+rem   the Free Software Foundation, either version 3 of the License, or\r
+rem   (at your option) any later version.\r
+\r
+rem   GNU Emacs is distributed in the hope that it will be useful,\r
+rem   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+rem   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+rem   GNU General Public License for more details.\r
+\r
+rem   You should have received a copy of the GNU General Public License\r
+rem   along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.\r
+\r
+rem   ----------------------------------------------------------------------\r
+\r
+echo %1 | sed -e "s,^,@echo # dummy > deps\\," -e "s,\.c,.Po," > tdepfile.bat\r
+call tdepfile\r
+del tdepfile.bat\r

diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index 2ee342eb29ad1f626b4d309caa5419ad6ee1e9dc..becdbfb598a4c72650c75292cf6f2c29f8607d35 100644 (file)
--- a/msdos/sedlibmk.inp
+++ b/msdos/sedlibmk.inp
@@ -285,7 +285,7 @@ s/^@am__fastdepCC_FALSE/\#/
 CONFIG_CLEAN_FILES = xyzzy
 /^CONFIG_CLEAN_VPATH_FILES *= *$/c\
 CONFIG_CLEAN_VPATH_FILES = xyzzy
-s/^    -*test -z.*|| rm/ -rm/
+s/^    -*test -z.*|| rm/        -rm/
 s/@echo /@djecho/
 #
 # Fix the recipes for header files