DBus Menu

Merge lp:~ken-vandine/libdbusmenu/export_packages into lp:libdbusmenu/0.5

  1. export_packages
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Merged at revision: 185
Proposed branch: lp:~ken-vandine/libdbusmenu/export_packages
Merge into: lp:libdbusmenu/0.5
Diff against target: 33 lines (+3/-3)
2 files modified
libdbusmenu-glib/Makefile.am (+1/-1)
libdbusmenu-gtk/Makefile.am (+2/-2)
To merge this branch: bzr merge lp:~ken-vandine/libdbusmenu/export_packages
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+46614@code.launchpad.net

Description of the change

Use EXPORT_PACKAGES instead of PACKAGES to prevent circular build depends

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve

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 2011-01-14 16:30:30 +0000
3+++ libdbusmenu-glib/Makefile.am 2011-01-18 15:11:09 +0000
4@@ -143,7 +143,7 @@
5 Dbusmenu_Glib_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
6 Dbusmenu_Glib_0_4_gir_NAMESPACE = Dbusmenu
7 Dbusmenu_Glib_0_4_gir_VERSION = Glib-0.4
8-Dbusmenu_Glib_0_4_gir_PACKAGES = dbusmenu-glib-0.4
9+Dbusmenu_Glib_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4
10 Dbusmenu_Glib_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
11
12 INTROSPECTION_GIRS += Dbusmenu-Glib-0.4.gir
13
14=== modified file 'libdbusmenu-gtk/Makefile.am'
15--- libdbusmenu-gtk/Makefile.am 2011-01-13 15:57:37 +0000
16+++ libdbusmenu-gtk/Makefile.am 2011-01-18 15:11:09 +0000
17@@ -95,7 +95,7 @@
18 DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
19 DbusmenuGtk_0_4_gir_NAMESPACE = DbusmenuGtk$(VER)
20 DbusmenuGtk_0_4_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS)
21-DbusmenuGtk_0_4_gir_PACKAGES = dbusmenu-gtk$(VER)-0.4
22+DbusmenuGtk_0_4_gir_EXPORT_PACKAGES = dbusmenu-gtk$(VER)-0.4
23
24 # We duplicate these for the same reason as libdbusmenu_gtk3includedir above
25 DbusmenuGtk3_0_4_gir_INCLUDES = $(DbusmenuGtk_0_4_gir_INCLUDES)
26@@ -104,7 +104,7 @@
27 DbusmenuGtk3_0_4_gir_FILES = $(DbusmenuGtk_0_4_gir_FILES)
28 DbusmenuGtk3_0_4_gir_NAMESPACE = $(DbusmenuGtk_0_4_gir_NAMESPACE)
29 DbusmenuGtk3_0_4_gir_SCANNERFLAGS = $(DbusmenuGtk_0_4_gir_SCANNERFLAGS)
30-DbusmenuGtk3_0_4_gir_PACKAGES = $(DbusmenuGtk_0_4_gir_PACKAGES)
31+DbusmenuGtk3_0_4_gir_EXPORT_PACKAGES = $(DbusmenuGtk_0_4_gir_EXPORT_PACKAGES)
32
33 INTROSPECTION_GIRS += DbusmenuGtk$(VER)-0.4.gir
34

Subscribers

People subscribed via source and target branches