aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2010-11-23 16:06:30 -0500
committerKen VanDine <ken.vandine@canonical.com>2010-11-23 16:06:30 -0500
commitd9d3f22c4240b7b1479299167e8ce184fd0c5f3a (patch)
treeece7ff163d8cdb4170ad02bb270f31c5ce1a9336
parenta7a7326946d7dd13c0ef5027d460662dfd04b1e7 (diff)
downloadlibdbusmenu-d9d3f22c4240b7b1479299167e8ce184fd0c5f3a.tar.gz
libdbusmenu-d9d3f22c4240b7b1479299167e8ce184fd0c5f3a.tar.bz2
libdbusmenu-d9d3f22c4240b7b1479299167e8ce184fd0c5f3a.zip
Cleaned up the scanner flags some
-rw-r--r--libdbusmenu-glib/Makefile.am3
-rw-r--r--libdbusmenu-gtk/Makefile.am5
2 files changed, 4 insertions, 4 deletions
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index 3d031dd..adf4607 100644
--- a/libdbusmenu-glib/Makefile.am
+++ b/libdbusmenu-glib/Makefile.am
@@ -118,8 +118,7 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
--add-include-path=$(srcdir) \
$(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \
--symbol-prefix=dbusmenu \
- --identifier-prefix=Dbusmenu \
- --pkg-export=dbusmenu-glib
+ --identifier-prefix=Dbusmenu
INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am
index bb3890e..e539aa6 100644
--- a/libdbusmenu-gtk/Makefile.am
+++ b/libdbusmenu-gtk/Makefile.am
@@ -70,8 +70,7 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
--add-include-path=$(top_builddir)/libdbusmenu-glib \
$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \
--symbol-prefix=dbusmenu \
- --identifier-prefix=DbusmenuGtk \
- --pkg-export=dbusmenu-gtk$(VER)
+ --identifier-prefix=DbusmenuGtk
INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib
if HAVE_INTROSPECTION
@@ -88,6 +87,7 @@ DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk$(VER).la
DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
DbusmenuGtk_0_2_gir_NAMESPACE = DbusmenuGtk$(VER)
DbusmenuGtk_0_2_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS)
+DbusmenuGtk_0_2_gir_PACKAGES = dbusmenu-gtk$(VER)
# We duplicate these for the same reason as libdbusmenu_gtk3includedir above
DbusmenuGtk3_0_2_gir_INCLUDES = $(DbusmenuGtk_0_2_gir_INCLUDES)
@@ -96,6 +96,7 @@ DbusmenuGtk3_0_2_gir_LIBS = $(DbusmenuGtk_0_2_gir_LIBS)
DbusmenuGtk3_0_2_gir_FILES = $(DbusmenuGtk_0_2_gir_FILES)
DbusmenuGtk3_0_2_gir_NAMESPACE = $(DbusmenuGtk_0_2_gir_NAMESPACE)
DbusmenuGtk3_0_2_gir_SCANNERFLAGS = $(DbusmenuGtk_0_2_gir_SCANNERFLAGS)
+DbusmenuGtk3_0_2_gir_PACKAGES = $(DbusmenuGtk_0_2_gir_PACKAGES)
INTROSPECTION_GIRS += DbusmenuGtk$(VER)-0.2.gir