aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorJoakim Verona2015-01-15 14:54:25 +0100
committerJoakim Verona2015-01-15 14:54:25 +0100
commit0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d (patch)
tree6c7ea25ac137f5764d931e841598a3c1ea434ab0 /src/Makefile.in
parenta1124bc117e41019de49c82d13d1a72a50df977d (diff)
parent0e97c44c3699c4606a04f589828acdf9c03f447e (diff)
downloademacs-0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d.tar.gz
emacs-0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d.zip
merge master
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 9bd86d54793..079e0e41c9f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -502,14 +502,13 @@ buildobj.h: Makefile
502 done >$@.tmp 502 done >$@.tmp
503 $(AM_V_at)mv $@.tmp $@ 503 $(AM_V_at)mv $@.tmp $@
504 504
505globals.h: gl-stamp; @true
506
507GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) 505GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m)
508 506
509gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) 507gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES)
510 $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) > gl.tmp 508 $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) >$@
511 $(AM_V_at)$(top_srcdir)/build-aux/move-if-change gl.tmp globals.h 509
512 $(AM_V_at)echo timestamp > $@ 510globals.h: gl-stamp
511 $(AM_V_GEN)cmp $< $@ >/dev/null || cp $< $@
513 512
514$(ALLOBJS): globals.h 513$(ALLOBJS): globals.h
515 514