diff options
| author | Ted Gould <ted@gould.cx> | 2010-12-07 09:26:30 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-12-07 09:26:30 -0600 |
| commit | 9b53f1fd5c2452f40ac079ece4d673b4b4d1bb57 (patch) | |
| tree | c61ab4e083aeece4759fca86b46dca3ec7f84b08 /libdbusmenu-glib | |
| parent | ffb9d313cf4f588fc6958eb7e4e30b272b00d10e (diff) | |
| parent | cc7b24b14152407bbaec45924da989bb8692a2c2 (diff) | |
| download | libdbusmenu-9b53f1fd5c2452f40ac079ece4d673b4b4d1bb57.tar.gz libdbusmenu-9b53f1fd5c2452f40ac079ece4d673b4b4d1bb57.tar.bz2 libdbusmenu-9b53f1fd5c2452f40ac079ece4d673b4b4d1bb57.zip | |
Updating to trunk with introspection fixes
Diffstat (limited to 'libdbusmenu-glib')
| -rw-r--r-- | libdbusmenu-glib/Makefile.am | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 0020d59..e6aecd6 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -116,9 +116,19 @@ menuitem-marshal.c: $(srcdir)/menuitem-marshal.list -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = \ - --add-include-path=$(srcdir) \ - $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) + +if INTROSPECTION_TEN +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \ + --add-include-path=$(srcdir) \ + $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \ + --symbol-prefix=dbusmenu \ + --identifier-prefix=Dbusmenu +else +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \ + --add-include-path=$(srcdir) \ + $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) +endif + INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) if HAVE_INTROSPECTION @@ -133,6 +143,8 @@ Dbusmenu_Glib_0_4_gir_LIBS = libdbusmenu-glib.la Dbusmenu_Glib_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) Dbusmenu_Glib_0_4_gir_NAMESPACE = Dbusmenu Dbusmenu_Glib_0_4_gir_VERSION = Glib-0.2 +Dbusmenu_Glib_0_4_gir_PACKAGES = dbusmenu-glib +Dbusmenu_Glib_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS) INTROSPECTION_GIRS += Dbusmenu-Glib-0.4.gir |