1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-11 16:08:13 +00:00

* src/Makefile.in ($(otherobj)): Depend on globals.h.

This commit is contained in:
Paul Eggert 2011-02-08 16:44:29 -08:00
parent 64df8c1098
commit f9f2e7f540
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2011-02-09 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in ($(otherobj)): Depend on globals.h.
Otherwise 'make -j10' failed on my host, because the build lacked
necessary dependencies, e.g., vm-limit.o depends on globals.h.
2011-02-08 Tom Tromey <tromey@redhat.com>
* Makefile.in (NS_OBJC_OBJ): New variable.

View File

@ -106,7 +106,7 @@ LD_SWITCH_SYSTEM=@LD_SWITCH_SYSTEM@
## This holds any special options for linking temacs only (ie, not
## used by configure). Not used elsewhere because it sometimes
## contains options that have to do with using Emacs's crt0,
## contains options that have to do with using Emacs's crt0,
## which are only good with temacs.
LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@
@ -190,7 +190,7 @@ OLDXMENU=@OLDXMENU@
## If HAVE_X11 && !USE_GTK, $(OLDXMENU) ../src/$(OLDXMENU); else empty.
## We use stamp-xmenu with these two deps to both ensure that lwlib
## gets remade based on its dependencies in its own makefile,
## and remake temacs if lwlib gets changed by this.
## and remake temacs if lwlib gets changed by this.
OLDXMENU_DEPS=@OLDXMENU_DEPS@
## If !HAVE_X11 && HAVE_X_WINDOWS, -lXMenu (this case no longer possible).
@ -241,7 +241,7 @@ MSDOS_SUPPORT_REAL = $(lispsource)/ls-lisp.elc $(lispsource)/disp-table.elc \
$(lispsource)/dos-fns.elc $(lispsource)/dos-w32.elc $(lispsource)/dos-vars.elc \
$(lispsource)/term/internal.elc $(lispsource)/term/pc-win.elc
## $MSDOS_SUPPORT_REAL if MSDOS.
MSDOS_SUPPORT =
MSDOS_SUPPORT =
ns_appdir=@ns_appdir@
ns_appbindir=@ns_appbindir@
@ -657,7 +657,7 @@ gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES)
$(libsrc)/make-docfile -d $(srcdir) -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp
$(srcdir)/../move-if-change gl-tmp gl-stamp
$(obj): globals.h
$(obj) $(otherobj): globals.h
$(lib)/libgnu.a: $(config_h)
cd $(lib) && $(MAKE) libgnu.a