gobject-introspection r455 - trunk/gir

[johan svn gnome org]

Author: johan
Date: Fri Aug 22 19:13:39 2008
New Revision: 455
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=455&view=rev

Log:
Make it work again, clean up the mess I made

Modified:
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Fri Aug 22 19:13:39 2008
@@ -4,10 +4,9 @@
 G_IR_SCANNER_FILES = $(top_srcdir)/giscanner/*.py \
 	$(top_builddir)/giscanner/libgiscanner.la
 
-GLIBCONFIG_H = `pkg-config --variable=libdir glib-2.0`/glib-2.0/include/glibconfig.h
-
+GLIBCONFIG=`pkg-config --variable=libdir glib-2.0`/glib-2.0/include/glibconfig.h
 glibconfig.h:
-	cat $(GLIBCONFIG_H) \
+	cat $(GLIBCONFIG) \
 	| sed s/__G_LIBCONFIG_H__/__G_LIBCONFIG_GI_COPY_H__/g \
 	| sed s/define\ G_HAVE_ISO_VARARGS\ 1/define\ G_HAVE_ISO_VARARGS\ 0/g \
 	| sed s/define\ G_HAVE_GNUC_VARARGS\ 1/define\ G_HAVE_GNUC_VARARGS\ 0/g \
@@ -28,8 +27,8 @@
 	    -DGETTEXT_PACKAGE=Dummy \
 	    -D__G_I18N_LIB_H__ \
 	    -D__G_LIBCONFIG_H__ \
-	    $(top_builddir)/gir/glibconfig.h
-	    $(GLIB_INCLUDEDIR)/glib/*.h \
+	    $(top_builddir)/gir/glibconfig.h \
+	    $(GLIB_INCLUDEDIR)/glib/*.h
 BUILT_SOURCES += GLib.gir
 
 # gobject
@@ -82,5 +81,3 @@
 CLEANFILES += $(typelibs_DATA)
 
 EXTRA_DIST = glib-2.0-good.gir gobject-2.0-good.gir gobject-2.0-gio.gir
-
-.PHONY: glibconfig.h