diff options
| author | Johan Dahlin <johan@gnome.org> | 2008-08-22 19:46:03 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2008-08-22 19:46:03 +0000 |
| commit | d63fa8f926d209d3580e61e733d292cf6b1e316d (patch) | |
| tree | 5b61bb6da6ecc22455590bf8ae16fda31bd42715 /gir | |
| parent | 450d9b88d4a285bb6063b905d570ab08f1380317 (diff) | |
| download | gobject-introspection-d63fa8f926d209d3580e61e733d292cf6b1e316d.tar.gz | |
Use the generated glibconfig.h for all scanner invokations. Rename it to
2008-08-22 Johan Dahlin <johan@gnome.org>
* configure.ac:
* gir/Makefile.am:
* giscanner/Makefile.am:
* giscanner/config.py.in:
* giscanner/sourcescanner.py:
Use the generated glibconfig.h for all scanner invokations.
Rename it to glibconfig-scanner.h and install it.
Add a config.py which so far contains the include dir.
svn path=/trunk/; revision=456
Diffstat (limited to 'gir')
| -rw-r--r-- | gir/Makefile.am | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gir/Makefile.am b/gir/Makefile.am index 7789c103..14be0521 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -1,17 +1,9 @@ -BUILT_SOURCES = glibconfig.h +BUILT_SOURCES = G_IR_SCANNER = $(top_srcdir)/tools/g-ir-scanner G_IR_SCANNER_FILES = $(top_srcdir)/giscanner/*.py \ $(top_builddir)/giscanner/libgiscanner.la -GLIBCONFIG=`pkg-config --variable=libdir glib-2.0`/glib-2.0/include/glibconfig.h -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 \ - > $(top_builddir)/gir/$@ - # glib GLIB_INCLUDEDIR=`pkg-config --variable=includedir glib-2.0`/glib-2.0 GLIB_LIBDIR=`pkg-config --variable=libdir glib-2.0` @@ -27,7 +19,7 @@ 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 \ + $(top_builddir)/giscanner/glibconfig-scanner.h \ $(GLIB_INCLUDEDIR)/glib/*.h BUILT_SOURCES += GLib.gir |