aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-09-20 12:00:54 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-09-20 12:00:54 -0500
commit597c8d7e60d266ad995bdc7a87db5ce64de0c646 (patch)
tree704d4ebf2be7c2971077e3daf428e7403e38b87a
parentddaa8926d360ed0b6714aab4c06f4b91580bddbc (diff)
downloadlibdbusmenu-597c8d7e60d266ad995bdc7a87db5ce64de0c646.tar.gz
libdbusmenu-597c8d7e60d266ad995bdc7a87db5ce64de0c646.tar.bz2
libdbusmenu-597c8d7e60d266ad995bdc7a87db5ce64de0c646.zip
revert r417 so that we don't change the vapi name at the last minute for 12.10 (LP: #978687)
-rw-r--r--libdbusmenu-glib/Makefile.am6
-rw-r--r--libdbusmenu-gtk/Makefile.am8
2 files changed, 7 insertions, 7 deletions
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index 7fe8030..b2e796c 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-glib-0.4.vapi
+vapi_DATA = Dbusmenu-0.4.vapi
-dbusmenu-glib-0.4.vapi: Dbusmenu-0.4.gir
- $(VALA_API_GEN) --library=dbusmenu-glib-0.4 $<
+Dbusmenu-0.4.vapi: Dbusmenu-0.4.gir
+ $(VALA_API_GEN) --library=Dbusmenu-0.4 $<
CLEANFILES += $(vapi_DATA)
diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am
index a255a69..b52098f 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 = dbusmenu-gtk$(VER)-0.4.vapi
+vapi_DATA = DbusmenuGtk$(VER)-0.4.vapi
-dbusmenu-gtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
- $(VALA_API_GEN) --library=dbusmenu-gtk$(VER)-0.4 \
+DbusmenuGtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
+ $(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.4 \
--pkg gdk-pixbuf-2.0 \
--pkg $(GTKVALA) \
--pkg atk \
- --pkg dbusmenu-glib-0.4 \
+ --pkg Dbusmenu-0.4 \
--vapidir=$(top_builddir)/libdbusmenu-glib \
$<