Merge branch 'master' into xwidget

1 files changed, 9 insertions, 3 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 079e0e41c9f..81977dbfec2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -504,11 +504,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