diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-02-09 22:50:17 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-02-09 22:50:17 +0200 |
| commit | d37f40ed383c9244d499c3770f9649d2399d40ba (patch) | |
| tree | 199b0e82be49c92302b1e0c90d63692832069bdc /nt | |
| parent | ccded26c1e57045a8941dd69b2566ac9a49cfe4b (diff) | |
| download | emacs-d37f40ed383c9244d499c3770f9649d2399d40ba.tar.gz | |
Update the Windows build according to 2011-02-08T21:42:56Z!tromey@redhat.com and 2011-02-09T17:04:43Z!schwab@linux-m68k.org.
src/makefile.w32-in (GLOBAL_SOURCES, SOME_MACHINE_OBJECTS, obj): New
macros.
(globals.h, gl-stamp): New targets.
(clean): Clean gl-stamp and globals.h.
nt/makefile.w32-in (bootstrap-nmake, bootstrap-gmake): Make the
"make-docfile" target in lib-src, before bootstrapping the src
directory. Needed since building in src needs to run make-docfile
to produce globals.h.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 7 | ||||
| -rw-r--r-- | nt/makefile.w32-in | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index e7f005cce61..41273114429 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,10 @@ +2011-02-09 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (bootstrap-nmake, bootstrap-gmake): Make the + "make-docfile" target in lib-src, before bootstrapping the src + directory. Needed since building in src needs to run make-docfile + to produce globals.h. + 2011-02-04 Eli Zaretskii <eliz@gnu.org> * config.nt (inline) [__GNUC__]: Define (for gnulib). diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 28ee8b6e09c..31ca3143fb8 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -160,7 +160,7 @@ bootstrap-nmake: addsection cmdproxy cd ..\src
$(MAKE) $(MFLAGS) clean
cd ..\lib-src
- $(MAKE) $(MFLAGS) clean
+ $(MAKE) $(MFLAGS) clean make-docfile
cd ..\lib
$(MAKE) $(MFLAGS) clean all
cd ..\src
@@ -177,7 +177,7 @@ bootstrap-nmake: addsection cmdproxy bootstrap-gmake: addsection cmdproxy
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
- $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean make-docfile
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean all
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean
|