Improve VPATH builds. `$@' is valid only in the build dir, not after we've

* gtk/Makefile.am (gen_sources): Improve VPATH builds. `$@' is valid only in the build dir, not after we've done `cd $srcdir'. Also use `test -f' instead of less portable `test -e'.
1999-09-03 22:59:25 +00:00
parent 2c331c9fdf
commit 59724766af
8 changed files with 56 additions and 6 deletions
--- a/7
+++ b/7
@@ -1,3 +1,10 @@
+1999-09-03  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gtk/Makefile.am (gen_sources): Improve VPATH builds.
+	`$@' is valid only in the build dir, not after we've done 
+	`cd $srcdir'.  Also use `test -f' instead of less portable
+	`test -e'.
+
 Fri Sep  3 17:20:57 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

 	* Released GTK+ 1.2.5-pre1  (test release)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+1999-09-03  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gtk/Makefile.am (gen_sources): Improve VPATH builds.
+	`$@' is valid only in the build dir, not after we've done 
+	`cd $srcdir'.  Also use `test -f' instead of less portable
+	`test -e'.
+
 Fri Sep  3 17:20:57 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

 	* Released GTK+ 1.2.5-pre1  (test release)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+1999-09-03  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gtk/Makefile.am (gen_sources): Improve VPATH builds.
+	`$@' is valid only in the build dir, not after we've done 
+	`cd $srcdir'.  Also use `test -f' instead of less portable
+	`test -e'.
+
 Fri Sep  3 17:20:57 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

 	* Released GTK+ 1.2.5-pre1  (test release)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+1999-09-03  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gtk/Makefile.am (gen_sources): Improve VPATH builds.
+	`$@' is valid only in the build dir, not after we've done 
+	`cd $srcdir'.  Also use `test -f' instead of less portable
+	`test -e'.
+
 Fri Sep  3 17:20:57 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

 	* Released GTK+ 1.2.5-pre1  (test release)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+1999-09-03  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gtk/Makefile.am (gen_sources): Improve VPATH builds.
+	`$@' is valid only in the build dir, not after we've done 
+	`cd $srcdir'.  Also use `test -f' instead of less portable
+	`test -e'.
+
 Fri Sep  3 17:20:57 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

 	* Released GTK+ 1.2.5-pre1  (test release)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+1999-09-03  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gtk/Makefile.am (gen_sources): Improve VPATH builds.
+	`$@' is valid only in the build dir, not after we've done 
+	`cd $srcdir'.  Also use `test -f' instead of less portable
+	`test -e'.
+
 Fri Sep  3 17:20:57 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

 	* Released GTK+ 1.2.5-pre1  (test release)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+1999-09-03  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gtk/Makefile.am (gen_sources): Improve VPATH builds.
+	`$@' is valid only in the build dir, not after we've done 
+	`cd $srcdir'.  Also use `test -f' instead of less portable
+	`test -e'.
+
 Fri Sep  3 17:20:57 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

 	* Released GTK+ 1.2.5-pre1  (test release)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -325,9 +325,10 @@ gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen
 CLEANFILES += $(gen_sources)
 COPYING: $(gtk_built_public_sources) $(gtk_built_sources)
 $(OBJECTS): COPYING 	# this is our oldest-source-stamp
+
 # initial creation of the real stamp-* files
 gtk.defs gtkmarshal.h gtktypebuiltins.h:          # never add deps here
-	-test -e "$(srcdir)/$@" || touch $(srcdir)/$@
+	-test -f $@ || test -f "$(srcdir)/$@" || (:) > $(srcdir)/$@
 # normal autogeneration rules
 stamp-gtk.defs: @REBUILD@ makeenums.pl gtk.defs gtk-boxed.defs $(gtk_public_h_sources) $(gdk_headers)
 	cd $(srcdir) \
@@ -335,7 +336,7 @@ stamp-gtk.defs: @REBUILD@ makeenums.pl gtk.defs gtk-boxed.defs $(gtk_public_h_so
 	&& cat gtk-boxed.defs >> xgen-gdef \
 	&& (cmp -s xgen-gdef gtk.defs || cp xgen-gdef gtk.defs) \
 	&& rm -f xgen-gdef \
-	&& echo timestamp > $@
+	&& echo timestamp > stamp-gtk.defs
 gtkmarshal.c: stamp-gtkmarshal.h
 gtkmarshal.c stamp-gtkmarshal.h: @REBUILD@ genmarshal.pl gtkmarshal.list gtkmarshal.h
 	cd $(srcdir) \
@@ -351,21 +352,21 @@ stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk stamp-gtk.defs gtktypebuiltins.
 	&& $(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 > $@
+	&& echo timestamp > stamp-gtktypebuiltins.h
 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 gtktypebuiltins_vars.c \
 	&& rm -f 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 $@ \
+	&& cp xgen-gtbic gtktypebuiltins_ids.c \
 	&& rm -f 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 $@ \
+	&& cp xgen-gtbec gtktypebuiltins_evals.c \
 	&& rm -f xgen-gtbec