DBus Menu

Merge lp:~ken-vandine/libdbusmenu/natty-gtk3-fixes into lp:libdbusmenu/0.5

  1. natty-gtk3-fixes
  2. Merge into trunk
Proposed by Ken VanDine on 2010-11-23
Status: Merged
Merged at revision: 172
Proposed branch: lp:~ken-vandine/libdbusmenu/natty-gtk3-fixes
Merge into: lp:libdbusmenu/0.5
Diff against target: 105 lines (+28/-9)
3 files modified
docs/libdbusmenu-gtk/reference/Makefile.am (+9/-2)
libdbusmenu-glib/Makefile.am (+8/-3)
libdbusmenu-gtk/Makefile.am (+11/-4)
To merge this branch: bzr merge lp:~ken-vandine/libdbusmenu/natty-gtk3-fixes
Reviewer Review Type Date Requested Status
Ted Gould (community) 2010-11-23 Approve on 2010-11-23
Review via email: mp+41658@code.launchpad.net

Description of the Change

Some fixes for building for gtk2 and gtk3 and GIR fixes

To post a comment you must log in.
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 'docs/libdbusmenu-gtk/reference/Makefile.am'
2--- docs/libdbusmenu-gtk/reference/Makefile.am 2010-06-09 16:24:31 +0000
3+++ docs/libdbusmenu-gtk/reference/Makefile.am 2010-11-23 21:23:11 +0000
4@@ -1,5 +1,12 @@
5+
6 ## Process this file with automake to produce Makefile.in
7
8+if USE_GTK3
9+VER=3
10+else
11+VER=
12+endif
13+
14 # We require automake 1.6 at least.
15 AUTOMAKE_OPTIONS = 1.6
16
17@@ -9,7 +16,7 @@
18 # of using the various options.
19
20 # The name of the module, e.g. 'glib'.
21-DOC_MODULE=libdbusmenu-gtk
22+DOC_MODULE=libdbusmenu-gtk$(VER)
23
24 # The top-level SGML file. You can change this if you want to.
25 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
26@@ -68,7 +75,7 @@
27 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
28 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
29 INCLUDES=-I$(top_srcdir) $(DBUSMENUGLIB_CFLAGS) $(DBUSMENUGTK_CFLAGS)
30-GTKDOC_LIBS=$(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk.la
31+GTKDOC_LIBS=$(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk$(VER).la $(DBUSMENUGLIB_LIBS) $(DBUSMENUGTK_LIBS)
32
33 # This includes the standard gtk-doc make rules, copied by gtkdocize.
34 include $(top_srcdir)/gtk-doc.local.make
35
36=== modified file 'libdbusmenu-glib/Makefile.am'
37--- libdbusmenu-glib/Makefile.am 2010-08-18 01:42:22 +0000
38+++ libdbusmenu-glib/Makefile.am 2010-11-23 21:23:11 +0000
39@@ -114,9 +114,12 @@
40
41 -include $(INTROSPECTION_MAKEFILE)
42 INTROSPECTION_GIRS =
43-INTROSPECTION_SCANNER_ARGS = \
44- --add-include-path=$(srcdir) \
45- $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources))
46+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
47+ --add-include-path=$(srcdir) \
48+ $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \
49+ --symbol-prefix=dbusmenu \
50+ --identifier-prefix=Dbusmenu
51+
52 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
53
54 if HAVE_INTROSPECTION
55@@ -131,6 +134,8 @@
56 Dbusmenu_Glib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
57 Dbusmenu_Glib_0_2_gir_NAMESPACE = Dbusmenu
58 Dbusmenu_Glib_0_2_gir_VERSION = Glib-0.2
59+Dbusmenu_Glib_0_2_gir_PACKAGES = dbusmenu-glib
60+Dbusmenu_Glib_0_2_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
61
62 INTROSPECTION_GIRS += Dbusmenu-Glib-0.2.gir
63
64
65=== modified file 'libdbusmenu-gtk/Makefile.am'
66--- libdbusmenu-gtk/Makefile.am 2010-10-13 12:42:42 +0000
67+++ libdbusmenu-gtk/Makefile.am 2010-11-23 21:23:11 +0000
68@@ -66,10 +66,11 @@
69
70 -include $(INTROSPECTION_MAKEFILE)
71 INTROSPECTION_GIRS =
72-INTROSPECTION_SCANNER_ARGS = \
73- --add-include-path=$(srcdir) \
74+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
75 --add-include-path=$(top_builddir)/libdbusmenu-glib \
76- $(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources))
77+ $(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \
78+ --symbol-prefix=dbusmenu \
79+ --identifier-prefix=DbusmenuGtk
80 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib
81
82 if HAVE_INTROSPECTION
83@@ -80,16 +81,22 @@
84 DbusmenuGtk_0_2_gir_INCLUDES = \
85 GObject-2.0 \
86 $(GTKGIR) \
87- Dbusmenu-Glib-0.2
88+ Dbusmenu-Glib-0.2
89 DbusmenuGtk_0_2_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
90 DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk$(VER).la
91 DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
92+DbusmenuGtk_0_2_gir_NAMESPACE = DbusmenuGtk$(VER)
93+DbusmenuGtk_0_2_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS)
94+DbusmenuGtk_0_2_gir_PACKAGES = dbusmenu-gtk$(VER)
95
96 # We duplicate these for the same reason as libdbusmenu_gtk3includedir above
97 DbusmenuGtk3_0_2_gir_INCLUDES = $(DbusmenuGtk_0_2_gir_INCLUDES)
98 DbusmenuGtk3_0_2_gir_CFLAGS = $(DbusmenuGtk_0_2_gir_CFLAGS)
99 DbusmenuGtk3_0_2_gir_LIBS = $(DbusmenuGtk_0_2_gir_LIBS)
100 DbusmenuGtk3_0_2_gir_FILES = $(DbusmenuGtk_0_2_gir_FILES)
101+DbusmenuGtk3_0_2_gir_NAMESPACE = $(DbusmenuGtk_0_2_gir_NAMESPACE)
102+DbusmenuGtk3_0_2_gir_SCANNERFLAGS = $(DbusmenuGtk_0_2_gir_SCANNERFLAGS)
103+DbusmenuGtk3_0_2_gir_PACKAGES = $(DbusmenuGtk_0_2_gir_PACKAGES)
104
105 INTROSPECTION_GIRS += DbusmenuGtk$(VER)-0.2.gir
106

Subscribers

People subscribed via source and target branches