diff options
| author | Florian Müllner <fmuellner@src.gnome.org> | 2010-03-10 10:07:01 +0100 |
|---|---|---|
| committer | Vincent Untz <vuntz@gnome.org> | 2010-04-08 15:36:23 +0200 |
| commit | ebb7a3be83e41631027f03be5958c7b2a4086732 (patch) | |
| tree | 3d12b91d7f21d2e0a16effd9ce68b8c3c6989ac5 | |
| parent | 82c7342531d4f991d436c220825a68c9e5868eef (diff) | |
| download | gconf-ebb7a3be83e41631027f03be5958c7b2a4086732.tar.gz | |
Add introspection support
Generate .git and .typelib files.
https://bugzilla.gnome.org/show_bug.cgi?id=613247
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | gconf/.gitignore | 2 | ||||
| -rw-r--r-- | gconf/Makefile.am | 26 |
3 files changed, 31 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 793c117d..113c081e 100644 --- a/configure.in +++ b/configure.in @@ -266,6 +266,8 @@ AM_GLIB_GNU_GETTEXT AC_CHECK_FUNCS(bind_textdomain_codeset) +GOBJECT_INTROSPECTION_CHECK([0.6.7]) + AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) @@ -297,5 +299,6 @@ echo " gtk+: ${HAVE_GTK} ldap: ${have_ldap} policykit: ${HAVE_POLKIT} + introspection: ${found_introspection} " diff --git a/gconf/.gitignore b/gconf/.gitignore index 104c2d44..fd18c4a0 100644 --- a/gconf/.gitignore +++ b/gconf/.gitignore @@ -1,3 +1,5 @@ +/GConf-2.0.gir +/GConf-2.0.typelib /GConfX-common.c /GConfX-skels.c /GConfX-stubs.c diff --git a/gconf/Makefile.am b/gconf/Makefile.am index 2bcc8e87..3f8bea70 100644 --- a/gconf/Makefile.am +++ b/gconf/Makefile.am @@ -29,6 +29,11 @@ else SANITY_CHECK= endif +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +INTROSPECTION_COMPILER_ARGS= \ + --includedir=$(srcdir) + lib_LTLIBRARIES = libgconf-2.la bin_PROGRAMS = gconftool-2 @@ -120,6 +125,27 @@ libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) +if HAVE_INTROSPECTION +introspection_files = \ + $(gconf_headers) +GConf-2.0.gir: $(INTROSPECTION_SCANNER) libgconf-2.la Makefile +GConf_2_0_gir_SCANNERFLAGS = --strip-prefix=GConf +GConf_2_0_gir_INCLUDES = GObject-2.0 +GConf_2_0_gir_CFLAGS = \ + $(INCLUDES) +GConf_2_0_gir_LIBS = libgconf-2.la +GConf_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) +INTROSPECTION_GIRS += GConf-2.0.gir + +girdir = $(INTROSPECTION_GIRDIR) +dist_gir_DATA = $(INTROSPECTION_GIRS) + +typelibsdir = $(INTROSPECTION_TYPELIBDIR) +typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + +CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA) +endif + EXTRA_DIST=GConfX.idl default.path.in org.gnome.GConf.service.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh default.path: $(srcdir)/default.path.in |