From 3e1dcab4c01c35b73429c6e044b9643fe34ddbf1 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Tue, 17 Nov 1998 09:59:26 +0000 Subject: [PATCH] gtk/genmarshal.pl check for unchanged autogenerated files, so we don't * gtk/genmarshal.pl * gtk/Makefile.am: check for unchanged autogenerated files, so we don't rebuild everything just for adding a new function -Yosh --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/.cvsignore | 2 ++ gtk/Makefile.am | 29 +++++++++++++++++++---------- gtk/genmarshal.pl | 8 ++++---- 10 files changed, 67 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35e9a4b802..cda6cabdf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Nov 17 01:37:53 PST 1998 Manish Singh + + * gtk/genmarshal.pl + * gtk/Makefile.am: check for unchanged autogenerated files, so + we don't rebuild everything just for adding a new function + Mon Nov 16 19:19:00 CST 1998 Shawn T. Amundson * gtk/gtkpixmap.h diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 35e9a4b802..cda6cabdf8 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Tue Nov 17 01:37:53 PST 1998 Manish Singh + + * gtk/genmarshal.pl + * gtk/Makefile.am: check for unchanged autogenerated files, so + we don't rebuild everything just for adding a new function + Mon Nov 16 19:19:00 CST 1998 Shawn T. Amundson * gtk/gtkpixmap.h diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 35e9a4b802..cda6cabdf8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Tue Nov 17 01:37:53 PST 1998 Manish Singh + + * gtk/genmarshal.pl + * gtk/Makefile.am: check for unchanged autogenerated files, so + we don't rebuild everything just for adding a new function + Mon Nov 16 19:19:00 CST 1998 Shawn T. Amundson * gtk/gtkpixmap.h diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 35e9a4b802..cda6cabdf8 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Tue Nov 17 01:37:53 PST 1998 Manish Singh + + * gtk/genmarshal.pl + * gtk/Makefile.am: check for unchanged autogenerated files, so + we don't rebuild everything just for adding a new function + Mon Nov 16 19:19:00 CST 1998 Shawn T. Amundson * gtk/gtkpixmap.h diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 35e9a4b802..cda6cabdf8 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Tue Nov 17 01:37:53 PST 1998 Manish Singh + + * gtk/genmarshal.pl + * gtk/Makefile.am: check for unchanged autogenerated files, so + we don't rebuild everything just for adding a new function + Mon Nov 16 19:19:00 CST 1998 Shawn T. Amundson * gtk/gtkpixmap.h diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 35e9a4b802..cda6cabdf8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Tue Nov 17 01:37:53 PST 1998 Manish Singh + + * gtk/genmarshal.pl + * gtk/Makefile.am: check for unchanged autogenerated files, so + we don't rebuild everything just for adding a new function + Mon Nov 16 19:19:00 CST 1998 Shawn T. Amundson * gtk/gtkpixmap.h diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 35e9a4b802..cda6cabdf8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Tue Nov 17 01:37:53 PST 1998 Manish Singh + + * gtk/genmarshal.pl + * gtk/Makefile.am: check for unchanged autogenerated files, so + we don't rebuild everything just for adding a new function + Mon Nov 16 19:19:00 CST 1998 Shawn T. Amundson * gtk/gtkpixmap.h diff --git a/gtk/.cvsignore b/gtk/.cvsignore index 8aedc0a288..8312b5cc68 100644 --- a/gtk/.cvsignore +++ b/gtk/.cvsignore @@ -22,3 +22,5 @@ gtktypebuiltins_vars.c gtktypebuiltins_evals.c gtk.defs testdnd +stamp-d +stamp-m diff --git a/gtk/Makefile.am b/gtk/Makefile.am index ddada2835f..fd06f46168 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -230,13 +230,14 @@ gtkinclude_HEADERS = \ gtkmarshal.h \ gtktypebuiltins.h +# note gtk.defs and gtkmarshal.[ch] aren't here, but their stamps are BUILT_SOURCES = \ - gtktypebuiltins.h \ - gtktypebuiltins_evals.c \ - gtktypebuiltins_ids.c \ - gtktypebuiltins_vars.c \ - gtkmarshal.c \ - gtkmarshal.h + stamp-d \ + stamp-m \ + gtktypebuiltins.h \ + gtktypebuiltins_evals.c \ + gtktypebuiltins_ids.c \ + gtktypebuiltins_vars.c # cause the built sources to be rebuild when possible, even with --include-deps $(static_sources): $(BUILT_SOURCES) @@ -247,11 +248,14 @@ gdk_headers = \ ../gdk/gdkrgb.h # generate gtk.defs file from gtk-boxed.defs and *.h -gtk.defs: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers) +gtk.defs: @REBUILD@ stamp-d + @: +stamp-d: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers) cd $(srcdir) \ && $(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) > s-gd \ && cat gtk-boxed.defs >> s-gd \ - && mv s-gd gtk.defs + && (cmp -s s-gd gtk.defs || mv s-gd gtk.defs) && rm -f s-gd \ + && echo timestamp > stamp-d # generate type identifier header (GTK_TYPE_WIDGET_FLAGS) gtktypebuiltins.h: @REBUILD@ gtk.defs maketypes.awk @@ -278,8 +282,13 @@ gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs s-gtbe \ && mv s-gtbe gtktypebuiltins_evals.c -gtkmarshal.c gtkmarshal.h: @REBUILD@ gtkmarshal.list genmarshal.pl - srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl +gtkmarshal.c gtkmarshal.h: @REBUILD@ stamp-m + @: +stamp-m: @REBUILD@ gtkmarshal.list genmarshal.pl + srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl \ + && (cmp -s s-gmc gtkmarshal.c || mv s-gmc gtkmarshal.c) && rm -f s-gmc \ + && (cmp -s s-gmh gtkmarshal.h || mv s-gmh gtkmarshal.h) && rm -f s-gmh \ + && echo timestamp > stamp-m libgtk_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) diff --git a/gtk/genmarshal.pl b/gtk/genmarshal.pl index ec1bea23a3..5ae52879e7 100755 --- a/gtk/genmarshal.pl +++ b/gtk/genmarshal.pl @@ -33,8 +33,8 @@ sub indent { } open(IL, "<$srcdir/gtkmarshal.list") || die("Open failed: $!"); -open(OH, ">$srcdir/gtkmarshal.h") || die("Open failed: $!"); -open(OS, ">$srcdir/gtkmarshal.c") || die("Open failed: $!"); +open(OH, ">$srcdir/s-gmh") || die("Open failed: $!"); +open(OS, ">$srcdir/s-gmc") || die("Open failed: $!"); print OH <