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
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) Approve
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.
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
=== modified file 'docs/libdbusmenu-gtk/reference/Makefile.am'
--- docs/libdbusmenu-gtk/reference/Makefile.am 2010-06-09 16:24:31 +0000
+++ docs/libdbusmenu-gtk/reference/Makefile.am 2010-11-23 21:23:11 +0000
@@ -1,5 +1,12 @@
1
1## Process this file with automake to produce Makefile.in2## Process this file with automake to produce Makefile.in
23
4if USE_GTK3
5VER=3
6else
7VER=
8endif
9
3# We require automake 1.6 at least.10# We require automake 1.6 at least.
4AUTOMAKE_OPTIONS = 1.611AUTOMAKE_OPTIONS = 1.6
512
@@ -9,7 +16,7 @@
9# of using the various options.16# of using the various options.
1017
11# The name of the module, e.g. 'glib'.18# The name of the module, e.g. 'glib'.
12DOC_MODULE=libdbusmenu-gtk19DOC_MODULE=libdbusmenu-gtk$(VER)
1320
14# The top-level SGML file. You can change this if you want to.21# The top-level SGML file. You can change this if you want to.
15DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml22DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
@@ -68,7 +75,7 @@
68# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)75# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
69# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)76# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
70INCLUDES=-I$(top_srcdir) $(DBUSMENUGLIB_CFLAGS) $(DBUSMENUGTK_CFLAGS)77INCLUDES=-I$(top_srcdir) $(DBUSMENUGLIB_CFLAGS) $(DBUSMENUGTK_CFLAGS)
71GTKDOC_LIBS=$(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk.la 78GTKDOC_LIBS=$(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk$(VER).la $(DBUSMENUGLIB_LIBS) $(DBUSMENUGTK_LIBS)
7279
73# This includes the standard gtk-doc make rules, copied by gtkdocize.80# This includes the standard gtk-doc make rules, copied by gtkdocize.
74include $(top_srcdir)/gtk-doc.local.make81include $(top_srcdir)/gtk-doc.local.make
7582
=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am 2010-08-18 01:42:22 +0000
+++ libdbusmenu-glib/Makefile.am 2010-11-23 21:23:11 +0000
@@ -114,9 +114,12 @@
114114
115-include $(INTROSPECTION_MAKEFILE)115-include $(INTROSPECTION_MAKEFILE)
116INTROSPECTION_GIRS = 116INTROSPECTION_GIRS =
117INTROSPECTION_SCANNER_ARGS = \117INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
118 --add-include-path=$(srcdir) \118 --add-include-path=$(srcdir) \
119 $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources))119 $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \
120 --symbol-prefix=dbusmenu \
121 --identifier-prefix=Dbusmenu
122
120INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)123INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
121124
122if HAVE_INTROSPECTION125if HAVE_INTROSPECTION
@@ -131,6 +134,8 @@
131Dbusmenu_Glib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))134Dbusmenu_Glib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
132Dbusmenu_Glib_0_2_gir_NAMESPACE = Dbusmenu135Dbusmenu_Glib_0_2_gir_NAMESPACE = Dbusmenu
133Dbusmenu_Glib_0_2_gir_VERSION = Glib-0.2136Dbusmenu_Glib_0_2_gir_VERSION = Glib-0.2
137Dbusmenu_Glib_0_2_gir_PACKAGES = dbusmenu-glib
138Dbusmenu_Glib_0_2_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
134139
135INTROSPECTION_GIRS += Dbusmenu-Glib-0.2.gir140INTROSPECTION_GIRS += Dbusmenu-Glib-0.2.gir
136141
137142
=== modified file 'libdbusmenu-gtk/Makefile.am'
--- libdbusmenu-gtk/Makefile.am 2010-10-13 12:42:42 +0000
+++ libdbusmenu-gtk/Makefile.am 2010-11-23 21:23:11 +0000
@@ -66,10 +66,11 @@
6666
67-include $(INTROSPECTION_MAKEFILE)67-include $(INTROSPECTION_MAKEFILE)
68INTROSPECTION_GIRS = 68INTROSPECTION_GIRS =
69INTROSPECTION_SCANNER_ARGS = \69INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
70 --add-include-path=$(srcdir) \
71 --add-include-path=$(top_builddir)/libdbusmenu-glib \70 --add-include-path=$(top_builddir)/libdbusmenu-glib \
72 $(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources))71 $(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \
72 --symbol-prefix=dbusmenu \
73 --identifier-prefix=DbusmenuGtk
73INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib74INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib
7475
75if HAVE_INTROSPECTION76if HAVE_INTROSPECTION
@@ -80,16 +81,22 @@
80DbusmenuGtk_0_2_gir_INCLUDES = \81DbusmenuGtk_0_2_gir_INCLUDES = \
81 GObject-2.0 \82 GObject-2.0 \
82 $(GTKGIR) \83 $(GTKGIR) \
83 Dbusmenu-Glib-0.284 Dbusmenu-Glib-0.2
84DbusmenuGtk_0_2_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)85DbusmenuGtk_0_2_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
85DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk$(VER).la86DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk$(VER).la
86DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))87DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
88DbusmenuGtk_0_2_gir_NAMESPACE = DbusmenuGtk$(VER)
89DbusmenuGtk_0_2_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS)
90DbusmenuGtk_0_2_gir_PACKAGES = dbusmenu-gtk$(VER)
8791
88# We duplicate these for the same reason as libdbusmenu_gtk3includedir above92# We duplicate these for the same reason as libdbusmenu_gtk3includedir above
89DbusmenuGtk3_0_2_gir_INCLUDES = $(DbusmenuGtk_0_2_gir_INCLUDES)93DbusmenuGtk3_0_2_gir_INCLUDES = $(DbusmenuGtk_0_2_gir_INCLUDES)
90DbusmenuGtk3_0_2_gir_CFLAGS = $(DbusmenuGtk_0_2_gir_CFLAGS)94DbusmenuGtk3_0_2_gir_CFLAGS = $(DbusmenuGtk_0_2_gir_CFLAGS)
91DbusmenuGtk3_0_2_gir_LIBS = $(DbusmenuGtk_0_2_gir_LIBS)95DbusmenuGtk3_0_2_gir_LIBS = $(DbusmenuGtk_0_2_gir_LIBS)
92DbusmenuGtk3_0_2_gir_FILES = $(DbusmenuGtk_0_2_gir_FILES)96DbusmenuGtk3_0_2_gir_FILES = $(DbusmenuGtk_0_2_gir_FILES)
97DbusmenuGtk3_0_2_gir_NAMESPACE = $(DbusmenuGtk_0_2_gir_NAMESPACE)
98DbusmenuGtk3_0_2_gir_SCANNERFLAGS = $(DbusmenuGtk_0_2_gir_SCANNERFLAGS)
99DbusmenuGtk3_0_2_gir_PACKAGES = $(DbusmenuGtk_0_2_gir_PACKAGES)
93100
94INTROSPECTION_GIRS += DbusmenuGtk$(VER)-0.2.gir101INTROSPECTION_GIRS += DbusmenuGtk$(VER)-0.2.gir
95102

Subscribers

People subscribed via source and target branches