Merges from gtk-1-2

[~andy/gtk] / gtk / Makefile.am

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 6950ef035412830e527de2d232c9996b3baa9e6b..adbd671998f8f3bcfa43bb68ce29dec3549eedf8 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -350,15 +350,20 @@ $(OBJECTS): OLD_STAMP     # this is our oldest-source-stamp
 gtk.defs gtkmarshal.h gtktypebuiltins.h:          # never add deps here
        test -f "$(srcdir)/$@" || touch $(srcdir)/$@
 # normal autogeneration rules
-stamp-gtk.defs: @REBUILD@ makeenums.pl gtk.defs gtk-boxed.defs $(gtk_public_h_sources) $(gdk_headers)
+# all autogenerated files need to generated in the srcdir,
+# so old versions get remade and are not confused with newer
+# versions in the build dir. thus a development setup requires
+# srcdir to be writable, passing --disable-rebuilds to
+# ../configure will supress all autogeneration rules.
+$(srcdir)/stamp-gtk.defs: @REBUILD@ makeenums.pl gtk.defs gtk-boxed.defs $(gtk_public_h_sources) $(gdk_headers)
        cd $(srcdir) \
        && $(PERL) makeenums.pl defs $(gtk_public_h_sources) $(gdk_headers) > xgen-gdef \
        && cat gtk-boxed.defs >> xgen-gdef \
        && (cmp -s xgen-gdef gtk.defs || cp xgen-gdef gtk.defs) \
        && rm -f xgen-gdef \
-       && echo timestamp > $@
-gtkmarshal.c: stamp-gtkmarshal.h
-gtkmarshal.c stamp-gtkmarshal.h: @REBUILD@ genmarshal.pl gtkmarshal.list gtkmarshal.h
+       && echo timestamp > $(@F)
+$(srcdir)/gtkmarshal.c: stamp-gtkmarshal.h
+$(srcdir)/gtkmarshal.c $(srcdir)/stamp-gtkmarshal.h: @REBUILD@ genmarshal.pl gtkmarshal.list gtkmarshal.h
        cd $(srcdir) \
        && $(PERL) genmarshal.pl gtkmarshal.list xgen-gmh xgen-gmc \
        && (test -z "$(INDENT)" || $(INDENT) xgen-gmh) \
@@ -367,26 +372,26 @@ gtkmarshal.c stamp-gtkmarshal.h: @REBUILD@ genmarshal.pl gtkmarshal.list gtkmars
        && (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \
        && rm -f xgen-gmh xgen-gmc xgen-gmh~ xgen-gmc~ \
        && echo timestamp > stamp-gtkmarshal.h
-stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk stamp-gtk.defs gtktypebuiltins.h
+$(srcdir)/stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk stamp-gtk.defs gtktypebuiltins.h
        cd $(srcdir) \
        && $(AWK) -f maketypes.awk gtk.defs macros > xgen-gtbh \
        && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h) \
        && rm -f xgen-gtbh \
-       && echo timestamp > $@
-gtktypebuiltins_vars.c: @REBUILD@ maketypes.awk stamp-gtk.defs
+       && echo timestamp > $(@F)
+$(srcdir)/gtktypebuiltins_vars.c: @REBUILD@ maketypes.awk stamp-gtk.defs
        cd $(srcdir) \
        && $(AWK) -f maketypes.awk gtk.defs variables > xgen-gtbvc \
-       && cp xgen-gtbvc $@ \
+       && cp xgen-gtbvc $(@F) \
        && rm -f xgen-gtbvc
-gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk stamp-gtk.defs
+$(srcdir)/gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk stamp-gtk.defs
        cd $(srcdir) \
        && $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic \
-       && cp xgen-gtbic $@ \
+       && cp xgen-gtbic $(@F) \
        && rm -f xgen-gtbic
-gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl $(gtk_public_h_sources) $(gdk_headers)
+$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl $(gtk_public_h_sources) $(gdk_headers)
        cd $(srcdir) \
        && $(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) > xgen-gtbec \
-       && cp xgen-gtbec $@ \
+       && cp xgen-gtbec $(@F) \
        && rm -f xgen-gtbec
 
 
@@ -478,7 +483,7 @@ EXTRA_DIST += @STRIP_BEGIN@         \
        testgtk.1               \
        testgtkrc               \
        testgtkrc2              \
-        circles.xbm            \
+       circles.xbm             \
        line-arrow.xbm          \
        line-wrap.xbm           \
        tree_plus.xbm           \