Makefile.am changes

[Tim Janik <timj gtk org>]

hi sopwith,

you're changes to gtk+/gtk/Makefile.am didn't at all *fix* srcdir!=builtdir,
a lot of efford has been put into gtk+ 1.2.5 to actually get this going
reliably. instead you're changes would create new versions of the
built sources and will cause failing builds when the autogenerated sources
don't match the static sources anymore.

for a built setup as complex as gtk's Makefile.am, please post patches
to the development list *before* applying them. also it'd be nice if you
could properly chack the stuff you are committing, so you don't need three
subsequent commits to fix a Makefile portion (it was somewhat tedious to
dig up the correct version again).

i just reverted the resulting patch, revision 1.84.2.19 to revision 1.84.2.21:

--- Makefile.am-1.84.2.18       Fri Oct  8 00:38:33 1999
+++ Makefile.am-1.84.2.21       Fri Dec 24 03:34:18 1999
@@ -354,19 +354,19 @@ stamp-gtktypebuiltins.h: @REBUILD@ maket
         && echo timestamp > $@
 gtktypebuiltins_vars.c: @REBUILD@ maketypes.awk stamp-gtk.defs
         cd $(srcdir) \
-        && $(AWK) -f maketypes.awk gtk.defs variables > xgen-gtbvc \
-        && cp xgen-gtbvc $@ \
-        && rm -f xgen-gtbvc
+        && $(AWK) -f maketypes.awk gtk.defs variables > xgen-gtbvc
+        cp $(srcdir)/xgen-gtbvc gtktypebuiltins_vars.c \
+        && rm -f $(srcdir)/xgen-gtbvc
 gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk stamp-gtk.defs
         cd $(srcdir) \
-        && $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic \
-        && cp xgen-gtbic $@ \
-        && rm -f xgen-gtbic
+        && $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic
+        cp $(srcdir)/xgen-gtbic gtktypebuiltins_ids.c \
+        && rm -f $(srcdir)/xgen-gtbic
 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 $@ \
-        && rm -f xgen-gtbec
+        && $(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) > xgen-gtbec
+        cp $(srcdir)/xgen-gtbec gtktypebuiltins_evals.c \
+        && rm -f $(srcdir)/xgen-gtbec

---
ciaoTJ