From 080b9b56c99cfdfa286fb6b8c3099626688dc8ae Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sat, 31 Jan 2015 09:38:07 +0100 Subject: [PATCH] Don't reimplement move-if-change badly * Makefile.in (gl-stamp): Generate globals.h through the use of move-if-change. (globals.h): Replace with empty command. --- src/ChangeLog | 6 ++++++ src/Makefile.in | 12 +++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 61d1067750a..6208738cc57 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-01-31 Andreas Schwab + + * Makefile.in (gl-stamp): Generate globals.h through the use of + move-if-change. + (globals.h): Replace with empty command. + 2015-01-31 Eli Zaretskii * keyboard.c (kbd_buffer_store_event_hold): Ignore FOCUS_OUT_EVENT diff --git a/src/Makefile.in b/src/Makefile.in index 2ac34f5c44d..32615c848a7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -494,11 +494,17 @@ buildobj.h: Makefile GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) +AM_V_GLOBALS = $(am__v_GLOBALS_@AM_V@) +am__v_GLOBALS_ = $(am__v_GLOBALS_@AM_DEFAULT_V@) +am__v_GLOBALS_0 = @echo " GEN " globals.h; +am__v_GLOBALS_1 = + gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) - $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) >$@ + $(AM_V_GLOBALS)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) > globals.tmp + $(AM_V_at)$(top_srcdir)/build-aux/move-if-change globals.tmp globals.h + $(AM_V_at)echo timestamp > $@ -globals.h: gl-stamp - $(AM_V_GEN)cmp $< $@ >/dev/null || cp $< $@ +globals.h: gl-stamp; @true $(ALLOBJS): globals.h -- 2.39.2