[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103201: Update the Windows build acc
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103201: Update the Windows build according to revisions 103189 and 103199. |
Date: |
Wed, 09 Feb 2011 22:50:17 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103201
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2011-02-09 22:50:17 +0200
message:
Update the Windows build according to revisions 103189 and 103199.
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.
modified:
nt/ChangeLog
nt/makefile.w32-in
src/ChangeLog
src/makefile.w32-in
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2011-02-04 09:17:36 +0000
+++ b/nt/ChangeLog 2011-02-09 20:50:17 +0000
@@ -1,3 +1,10 @@
+2011-02-09 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* config.nt (inline) [__GNUC__]: Define (for gnulib).
=== modified file 'nt/makefile.w32-in'
--- a/nt/makefile.w32-in 2011-01-29 13:41:34 +0000
+++ b/nt/makefile.w32-in 2011-02-09 20:50:17 +0000
@@ -160,7 +160,7 @@
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-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
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-09 17:04:43 +0000
+++ b/src/ChangeLog 2011-02-09 20:50:17 +0000
@@ -1,3 +1,10 @@
+2011-02-09 Eli Zaretskii <address@hidden>
+
+ * makefile.w32-in (GLOBAL_SOURCES, SOME_MACHINE_OBJECTS, obj): New
+ macros.
+ (globals.h, gl-stamp): New targets.
+ (clean): Clean gl-stamp and globals.h.
+
2011-02-09 Andreas Schwab <address@hidden>
* Makefile.in (gl-stamp): Create globals.h here.
=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in 2011-02-04 15:32:34 +0000
+++ b/src/makefile.w32-in 2011-02-09 20:50:17 +0000
@@ -203,6 +203,38 @@
echo $(OBJ2) '\' >> buildobj.h
echo '$(DQUOTE)' >> buildobj.h
+GLOBAL_SOURCES = dosfns.c msdos.c \
+ xterm.c xfns.c xmenu.c xselect.c xrdb.c xsmfns.c fringe.c image.c \
+ fontset.c menu.c dbusbind.c \
+ w32.c w32console.c w32fns.c w32heap.c w32inevt.c \
+ w32menu.c w32proc.c w32reg.c w32select.c w32term.c w32xfns.c \
+ font.c w32font.c w32uniscribe.c \
+ dispnew.c frame.c scroll.c xdisp.c window.c bidi.c \
+ charset.c coding.c category.c ccl.c character.c chartab.c \
+ cm.c term.c terminal.c xfaces.c \
+ emacs.c keyboard.c macros.c keymap.c sysdep.c \
+ buffer.c filelock.c insdel.c marker.c \
+ minibuf.c fileio.c dired.c filemode.c \
+ cmds.c casetab.c casefiddle.c indent.c search.c regex.c undo.c \
+ alloc.c data.c doc.c editfns.c callint.c \
+ eval.c floatfns.c fns.c print.c lread.c \
+ syntax.c bytecode.c \
+ process.c callproc.c unexw32.c \
+ region-cache.c sound.c atimer.c \
+ doprnt.c intervals.c textprop.c composite.c md5.c
+SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
+ xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o dbusbind.o
+obj = $(GLOBAL_SOURCES:.c=.o)
+
+globals.h: gl-stamp
+
+gl-stamp: ../lib-src/$(BLD)/make-docfile.exe $(GLOBAL_SOURCES)
+ - $(DEL) gl-tmp
+ "../lib-src/$(BLD)/make-docfile" -d . -g $(SOME_MACHINE_OBJECTS) $(obj)
> gl-tmp
+ cmd /c "fc /b gl-tmp globals.h >nul 2>&1 || $(CP) gl-tmp globals.h"
+ - $(DEL) gl-tmp
+ echo timestamp > $@
+
bootstrap: bootstrap-emacs
#
@@ -279,7 +311,7 @@
- $(DEL) "s/*.h~" "m/*.h~"
- $(DEL) $(COMPILER_TEMP_FILES)
- $(DEL_TREE) $(OBJDIR)
- - $(DEL) stamp_BLD
+ - $(DEL) stamp_BLD gl-stamp globals.h
- $(DEL) buildobj.h
distclean: cleanall
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103201: Update the Windows build according to revisions 103189 and 103199.,
Eli Zaretskii <=