diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2010-06-04 16:19:07 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2010-06-04 16:19:07 -0400 |
| commit | d2ba03b40357a15fe3810a74ea9a951441ce38a0 (patch) | |
| tree | 60f4c5024c5281f4cbb15d575a72b4d7e012e411 /libdbusmenu-gtk/Makefile.am | |
| parent | 2397bc7c5beeecfdf7f73fbac0b623ca81e903b7 (diff) | |
| parent | 46b9469ec87422d805a40a3834b9e5ab18f8e909 (diff) | |
| download | libdbusmenu-d2ba03b40357a15fe3810a74ea9a951441ce38a0.tar.gz libdbusmenu-d2ba03b40357a15fe3810a74ea9a951441ce38a0.tar.bz2 libdbusmenu-d2ba03b40357a15fe3810a74ea9a951441ce38a0.zip | |
* New upstream release.
* Add function to get submenu of GTK-ified items
* Fix signal prototype of ID update
* Fixing up VAPI files to build them correctly
* Fixing the version string in the GIR file
* Fix documentation title page
* Reject text nodes early (warnings with Qt integration)
* debian/libdbusmenu-glib-dev.install: Updating gir and vapi file
names for package list.
* debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the
typelib file.
Diffstat (limited to 'libdbusmenu-gtk/Makefile.am')
| -rw-r--r-- | libdbusmenu-gtk/Makefile.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index 9cc557c..2be63b7 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -45,7 +45,10 @@ pkgconfigdir = $(libdir)/pkgconfig -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(top_builddir)/libdbusmenu-glib +INTROSPECTION_SCANNER_ARGS = \ + --add-include-path=$(srcdir) \ + --add-include-path=$(top_builddir)/libdbusmenu-glib \ + $(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib if HAVE_INTROSPECTION @@ -56,7 +59,7 @@ DbusmenuGtk-0.2.gir: libdbusmenu-gtk.la DbusmenuGtk_0_2_gir_INCLUDES = \ GObject-2.0 \ Gtk-2.0 \ - DbusmenuGlib-0.2 + Dbusmenu-Glib-0.2 DbusmenuGtk_0_2_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk.la DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) @@ -87,7 +90,7 @@ DbusmenuGtk-0.2.vapi: DbusmenuGtk-0.2.tmp.gir Makefile.am --pkg gdk-pixbuf-2.0 \ --pkg gtk+-2.0 \ --pkg atk \ - --pkg DbusmenuGlib-0.2 \ + --pkg Dbusmenu-Glib-0.2 \ --vapidir=$(top_builddir)/libdbusmenu-glib \ $< |