diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-02-19 18:53:10 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-02-19 18:53:10 +0200 |
| commit | 219463da10f01fece14351d6ccecccb43a27885f (patch) | |
| tree | a8ab269c1b011d47de6bfb79df08d59e0e97e816 | |
| parent | 152be435b98c485f75160e86f67d250122b7e1bd (diff) | |
| download | emacs-219463da10f01fece14351d6ccecccb43a27885f.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | config.bat | 3 | ||||
| -rw-r--r-- | msdos/ChangeLog | 5 | ||||
| -rw-r--r-- | msdos/depfiles.bat | 25 | ||||
| -rw-r--r-- | msdos/sedlibmk.inp | 2 |
5 files changed, 36 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 906bb38c340..e6675449001 100644 --- 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 730a33770e9..7ebfc74b801 100644 --- 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
sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile
rm -f makefile.tmp
+If Not Exist deps\stamp mkdir deps
+If Not Exist deps\stamp for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f
+If Not Exist deps\stamp echo deps-stamp > deps\stamp
cd ..
rem ----------------------------------------------------------------------
Echo Configuring the lisp directory...
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 9a98352ff23..7a4d107eebe 100644 --- 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 index 00000000000..22fcfc3dcd6 --- /dev/null +++ b/msdos/depfiles.bat @@ -0,0 +1,25 @@ +@echo off
+rem ----------------------------------------------------------------------
+rem Auxiliary script for MSDOS, run by ../config.bat
+rem Copyright (C) 2011 Free Software Foundation, Inc.
+
+rem This file is part of GNU Emacs.
+
+rem GNU Emacs is free software: you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License as published by
+rem the Free Software Foundation, either version 3 of the License, or
+rem (at your option) any later version.
+
+rem GNU Emacs is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+rem GNU General Public License for more details.
+
+rem You should have received a copy of the GNU General Public License
+rem along with GNU Emacs. If not, see http://www.gnu.org/licenses/.
+
+rem ----------------------------------------------------------------------
+
+echo %1 | sed -e "s,^,@echo # dummy > deps\\," -e "s,\.c,.Po," > tdepfile.bat
+call tdepfile
+del tdepfile.bat
diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index 2ee342eb29a..becdbfb598a 100644 --- 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 |