gobject-introspection r450 - in trunk: . gir



Author: johan
Date: Fri Aug 22 17:42:24 2008
New Revision: 450
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=450&view=rev

Log:
2008-08-22  Johan Dahlin  <johan gnome org>

    * gir/Makefile.am:
    Replace glibconfig.h with our own, do some replacement
    for CPP/C features we do not support



Modified:
   trunk/ChangeLog
   trunk/gir/   (props changed)
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Fri Aug 22 17:42:24 2008
@@ -1,9 +1,18 @@
-BUILT_SOURCES = 
+BUILT_SOURCES = glibconfig.h
 
 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.h:
+	cat $(GLIBCONFIG_H) \
+	| 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\ 1/g \
+        > $(builddir)/$@
+
 # glib
 GLIB_INCLUDEDIR=`pkg-config --variable=includedir glib-2.0`/glib-2.0
 GLIB_LIBDIR=`pkg-config --variable=libdir glib-2.0`
@@ -18,8 +27,9 @@
 	    -I$(GLIB_LIBDIR)/glib-2.0/include \
 	    -DGETTEXT_PACKAGE=Dummy \
 	    -D__G_I18N_LIB_H__ \
+	    -D__G_LIBCONFIG_H__ \
+	    $(builddir)/glibconfig.h
 	    $(GLIB_INCLUDEDIR)/glib/*.h \
-	    $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h
 BUILT_SOURCES += GLib.gir
 
 # gobject
@@ -72,3 +82,5 @@
 CLEANFILES += $(typelibs_DATA)
 
 EXTRA_DIST = glib-2.0-good.gir gobject-2.0-good.gir gobject-2.0-gio.gir
+
+.PHONY: glibconfig.h



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]