Remove references to $(top_srcdir). (gtk.defs,

* gtk/Makefile.am (gdk_headers):
Remove references to $(top_srcdir).
(gtk.defs, gtktypebuiltins{.h,_vars.c,_ids.c,_evals.c}): Simplify.
* gtk/makeenums.pl (parse_entries): Don't look for $srcdir.

1 files changed, 18 insertions, 23 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 0374d3398..5a394c3f3 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -227,44 +227,39 @@ BUILT_SOURCES = \
 
 # More headers to use when autogenerating.
 gdk_headers = \
-	$(top_srcdir)/gdk/gdktypes.h \
-	$(top_srcdir)/gdk/gdkrgb.h
+	../gdk/gdktypes.h \
+	../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)
-	src_headers=`echo $(source_headers) | sed s%gtk%$(srcdir)/gtk%g` ; \
-	srcdir=$(srcdir) \
-	  perl $(srcdir)/makeenums.pl defs $$src_headers \
-               $(gdk_headers) > gd.tmp
-	cat $(srcdir)/gtk-boxed.defs >> gd.tmp
-	cp gd.tmp $(srcdir)/gtk.defs
-	rm -f gd.tmp
+	cd $(srcdir) \
+	&& perl makeenums.pl defs $(source_headers) $(gdk_headers) > s-gd \
+	&& cat gtk-boxed.defs >> s-gd \
+	&& mv s-gd gtk.defs
 
 # generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
 gtktypebuiltins.h: @REBUILD@ gtk.defs maketypes.awk
-	awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs macros > gtb.tmp
-	cp gtb.tmp $(srcdir)/gtktypebuiltins.h
-	rm -f gtb.tmp
+	cd $(srcdir) \
+	&& awk -f maketypes.awk gtk.defs macros > s-gtb \
+	&& mv s-gtb gtktypebuiltins.h
 
 # generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
 gtktypebuiltins_vars.c: @REBUILD@ gtk.defs maketypes.awk
-	awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs variables > gtbv.tmp
-	cp gtbv.tmp $(srcdir)/gtktypebuiltins_vars.c
-	rm -f gtbv.tmp
+	cd $(srcdir) \
+	&& awk -f maketypes.awk gtk.defs variables > s-gtbv \
+	&& mv s-gtbv gtktypebuiltins_vars.c
 
 # generate type entries for type-id registration
 gtktypebuiltins_ids.c: @REBUILD@ gtk.defs maketypes.awk
-	awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs entries > gtbi.tmp
-	cp gtbi.tmp $(srcdir)/gtktypebuiltins_ids.c
-	rm -f gtbi.tmp
+	cd $(srcdir) \
+	&& awk -f maketypes.awk gtk.defs entries > s-gtbi \
+	&& mv s-gtbi gtktypebuiltins_ids.c 
 
 # generate enum value arrays
 gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs
-	srcdir=$(srcdir) \
-	  perl $(srcdir)/makeenums.pl arrays $(srcdir)/gtk*.h \
-               $(top_srcdir)/gdk/gdk*.h > gtbe.tmp
-	cp gtbe.tmp $(srcdir)/gtktypebuiltins_evals.c
-	rm -f gtbe.tmp
+	cd $(srcdir) \
+	&& perl makeenums.pl arrays $(source_headers) $(gdk_headers) > s-gtbe \
+	&& mv s-gtbe gtktypebuiltins_evals.c
 
 gtkmarshal.c gtkmarshal.h: @REBUILD@ gtkmarshal.list genmarshal.pl
 	srcdir=$(srcdir) perl $(srcdir)/genmarshal.pl