diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-04-26 14:47:55 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-04-26 14:47:55 -0500 |
| commit | 8093d960da6b3d32549ba3fc58f2bdb58bffa768 (patch) | |
| tree | b87db679939ba4a24afdaa44662cd9d0993aa0d7 | |
| parent | 934614f783a0bc437888320e9d0d4eaf631f65b6 (diff) | |
| parent | 39d4b10daeee829c8568491fd5268a15ecff4bf9 (diff) | |
| download | libdbusmenu-8093d960da6b3d32549ba3fc58f2bdb58bffa768.tar.gz libdbusmenu-8093d960da6b3d32549ba3fc58f2bdb58bffa768.tar.bz2 libdbusmenu-8093d960da6b3d32549ba3fc58f2bdb58bffa768.zip | |
Evan Nemerson's patch to make the Vala bindings use pkg-config names, rather than GIR names, so that valac can automatically pick up the relevant libraries and flags.
| -rw-r--r-- | libdbusmenu-glib/Makefile.am | 6 | ||||
| -rw-r--r-- | libdbusmenu-gtk/Makefile.am | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index b2e796c..7fe8030 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -216,10 +216,10 @@ if HAVE_VALA if HAVE_INTROSPECTION vapidir = $(datadir)/vala/vapi -vapi_DATA = Dbusmenu-0.4.vapi +vapi_DATA = dbusmenu-glib-0.4.vapi -Dbusmenu-0.4.vapi: Dbusmenu-0.4.gir - $(VALA_API_GEN) --library=Dbusmenu-0.4 $< +dbusmenu-glib-0.4.vapi: Dbusmenu-0.4.gir + $(VALA_API_GEN) --library=dbusmenu-glib-0.4 $< CLEANFILES += $(vapi_DATA) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index b52098f..a255a69 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -160,14 +160,14 @@ if HAVE_VALA if HAVE_INTROSPECTION vapidir = $(datadir)/vala/vapi -vapi_DATA = DbusmenuGtk$(VER)-0.4.vapi +vapi_DATA = dbusmenu-gtk$(VER)-0.4.vapi -DbusmenuGtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am - $(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.4 \ +dbusmenu-gtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am + $(VALA_API_GEN) --library=dbusmenu-gtk$(VER)-0.4 \ --pkg gdk-pixbuf-2.0 \ --pkg $(GTKVALA) \ --pkg atk \ - --pkg Dbusmenu-0.4 \ + --pkg dbusmenu-glib-0.4 \ --vapidir=$(top_builddir)/libdbusmenu-glib \ $< |