From: Johan Dahlin <johan@src.gnome.org>
Date: Fri, 22 Aug 2008 19:13:39 +0000 (+0000)
Subject: Make it work again, clean up the mess I made
X-Git-Tag: GOBJECT_INTROSPECTION_0_5_0~112
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=450d9b88d4a285bb6063b905d570ab08f1380317;p=platform%2Fupstream%2Fgobject-introspection.git

Make it work again, clean up the mess I made

svn path=/trunk/; revision=455
---

diff --git a/gir/Makefile.am b/gir/Makefile.am
index 0871c52..7789c10 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -4,10 +4,9 @@ G_IR_SCANNER = $(top_srcdir)/tools/g-ir-scanner
 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 @@ GLib.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES)
 	    -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 @@ typelibs_DATA = GLib.typelib GObject.typelib Gio.typelib
 CLEANFILES += $(typelibs_DATA)
 
 EXTRA_DIST = glib-2.0-good.gir gobject-2.0-good.gir gobject-2.0-gio.gir
-
-.PHONY: glibconfig.h