Merge lp:~tintou/libdbusmenu/fix-vapi into lp:libdbusmenu

Proposed by Corentin Noël on 2018-03-05
Status: Needs review
Proposed branch: lp:~tintou/libdbusmenu/fix-vapi
Merge into: lp:libdbusmenu
Diff against target: 39 lines (+7/-7)
2 files modified
libdbusmenu-glib/Makefile.am (+3/-3)
libdbusmenu-gtk/Makefile.am (+4/-4)
To merge this branch: bzr merge lp:~tintou/libdbusmenu/fix-vapi
Reviewer Review Type Date Requested Status
DBus Menu Team 2018-03-05 Pending
Review via email: mp+340771@code.launchpad.net

Commit message

vala: use the right .vapi name

To post a comment you must log in.

Unmerged revisions

489. By Corentin Noël on 2018-03-05

vala: use the right .vapi name

Vala strongly recommends that libraries use the same .vapi name as the pkg-config name

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-glib/Makefile.am'
2--- libdbusmenu-glib/Makefile.am 2014-10-30 13:56:39 +0000
3+++ libdbusmenu-glib/Makefile.am 2018-03-05 22:44:15 +0000
4@@ -213,10 +213,10 @@
5 if HAVE_INTROSPECTION
6
7 vapidir = $(datadir)/vala/vapi
8-vapi_DATA = Dbusmenu-0.4.vapi
9+vapi_DATA = dbusmenu-glib-0.4.vapi
10
11-Dbusmenu-0.4.vapi: Dbusmenu-0.4.gir
12- $(VALA_API_GEN) --library=Dbusmenu-0.4 $<
13+dbusmenu-glib-0.4.vapi: Dbusmenu-0.4.gir
14+ $(VALA_API_GEN) --library=dbusmenu-glib-0.4 $<
15
16 CLEANFILES += $(vapi_DATA)
17
18
19=== modified file 'libdbusmenu-gtk/Makefile.am'
20--- libdbusmenu-gtk/Makefile.am 2014-10-30 13:56:39 +0000
21+++ libdbusmenu-gtk/Makefile.am 2018-03-05 22:44:15 +0000
22@@ -157,14 +157,14 @@
23 if HAVE_INTROSPECTION
24
25 vapidir = $(datadir)/vala/vapi
26-vapi_DATA = DbusmenuGtk$(VER)-0.4.vapi
27+vapi_DATA = dbusmenu-gtk$(VER)-0.4.vapi
28
29-DbusmenuGtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
30- $(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.4 \
31+dbusmenu-gtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
32+ $(VALA_API_GEN) --library=dbusmenu-gtk$(VER)-0.4 \
33 --pkg gdk-pixbuf-2.0 \
34 --pkg $(GTKVALA) \
35 --pkg atk \
36- --pkg Dbusmenu-0.4 \
37+ --pkg dbusmenu-glib-0.4 \
38 --vapidir=$(top_builddir)/libdbusmenu-glib \
39 $<
40

Subscribers

People subscribed via source and target branches

to all changes: