diff options
| author | Jason Rumney | 2008-02-11 09:18:19 +0000 |
|---|---|---|
| committer | Jason Rumney | 2008-02-11 09:18:19 +0000 |
| commit | 4134dd158a17b84fcccef356934559c90ce4a100 (patch) | |
| tree | 15a00885f222bf265936eea5f1dd31dc82d386fa | |
| parent | 9fe219e349b41658c85c75ec92a4f85841c31928 (diff) | |
| download | emacs-4134dd158a17b84fcccef356934559c90ce4a100.tar.gz emacs-4134dd158a17b84fcccef356934559c90ce4a100.zip | |
Remove unidata-gen related rules.
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/makefile.w32-in | 30 |
2 files changed, 4 insertions, 30 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index b724c7cd2fa..5aca8fbeddc 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-02-11 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in: Remove unidata-gen related rules. | ||
| 4 | |||
| 1 | 2008-02-09 Eli Zaretskii <eliz@gnu.org> | 5 | 2008-02-09 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * configure.bat (dontCopy): Do not rename admin/unidata/Makefile. | 7 | * configure.bat (dontCopy): Do not rename admin/unidata/Makefile. |
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 551418755f1..1d9ada44b4a 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in | |||
| @@ -143,43 +143,15 @@ maybe-bootstrap-SH: doit | |||
| 143 | bootstrap: addsection cmdproxy bootstrap-$(MAKETYPE) | 143 | bootstrap: addsection cmdproxy bootstrap-$(MAKETYPE) |
| 144 | $(MAKE) $(MFLAGS) $(XMFLAGS) all | 144 | $(MAKE) $(MFLAGS) $(XMFLAGS) all |
| 145 | 145 | ||
| 146 | unidatagen-nmake: | ||
| 147 | cd ..\admin\unidata | ||
| 148 | $(MAKE) $(MFLAGS) | ||
| 149 | cd ..\..\nt | ||
| 150 | |||
| 151 | unidatagen-clean-nmake: | ||
| 152 | cd ..\admin\unidata | ||
| 153 | $(MAKE) $(MFLAGS) clean | ||
| 154 | cd ..\..\nt | ||
| 155 | |||
| 156 | unidatagen-CMD: | ||
| 157 | if exist ..\admin\unidata\UnicodeData.txt \ | ||
| 158 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../admin/unidata | ||
| 159 | |||
| 160 | unidatagen-clean-CMD: | ||
| 161 | if exist ..\admin\unidata\UnicodeData.txt \ | ||
| 162 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../admin/unidata clean | ||
| 163 | |||
| 164 | unidatagen-SH: | ||
| 165 | - test -f ../admin/unidata/UnicodeData.txt && \ | ||
| 166 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../admin/unidata | ||
| 167 | |||
| 168 | unidatagen-clean-SH: | ||
| 169 | - test -f ../admin/unidata/UnicodeData.txt && \ | ||
| 170 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../admin/unidata clean | ||
| 171 | |||
| 172 | bootstrap-nmake: addsection cmdproxy | 146 | bootstrap-nmake: addsection cmdproxy |
| 173 | cd ..\lisp | 147 | cd ..\lisp |
| 174 | $(MAKE) $(MFLAGS) bootstrap-clean | 148 | $(MAKE) $(MFLAGS) bootstrap-clean |
| 175 | cd ..\src | 149 | cd ..\src |
| 176 | $(MAKE) $(MFLAGS) clean | 150 | $(MAKE) $(MFLAGS) clean |
| 177 | if exist ..\admin $(MAKE) unidatagen-clean-nmake | ||
| 178 | cd ..\lib-src | 151 | cd ..\lib-src |
| 179 | $(MAKE) $(MFLAGS) clean | 152 | $(MAKE) $(MFLAGS) clean |
| 180 | cd ..\src | 153 | cd ..\src |
| 181 | $(MAKE) $(MFLAGS) bootstrap | 154 | $(MAKE) $(MFLAGS) bootstrap |
| 182 | if exist ..\admin $(MAKE) unidatagen-nmake | ||
| 183 | $(MAKE) $(MFLAGS) bootstrap-clean | 155 | $(MAKE) $(MFLAGS) bootstrap-clean |
| 184 | cd ..\nt | 156 | cd ..\nt |
| 185 | $(CP) $(BLD)/cmdproxy.exe ../bin | 157 | $(CP) $(BLD)/cmdproxy.exe ../bin |
| @@ -192,10 +164,8 @@ bootstrap-nmake: addsection cmdproxy | |||
| 192 | bootstrap-gmake: addsection cmdproxy | 164 | bootstrap-gmake: addsection cmdproxy |
| 193 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean | 165 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean |
| 194 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean | 166 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean |
| 195 | $(MAKE) $(MFLAGS) $(XMFLAGS) unidatagen-clean-$(SHELLTYPE) | ||
| 196 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean | 167 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean |
| 197 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap | 168 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap |
| 198 | $(MAKE) $(MFLAGS) $(XMFLAGS) unidatagen-$(SHELLTYPE) | ||
| 199 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean | 169 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean |
| 200 | $(CP) $(BLD)/cmdproxy.exe ../bin | 170 | $(CP) $(BLD)/cmdproxy.exe ../bin |
| 201 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap | 171 | $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap |