diff options
author | Ken VanDine <ken.vandine@canonical.com> | 2010-11-24 14:07:15 -0500 |
---|---|---|
committer | Ken VanDine <ken.vandine@canonical.com> | 2010-11-24 14:07:15 -0500 |
commit | 0d98749cbe9f405e4579adf0c30d534c277c2686 (patch) | |
tree | f970fd79e9b237626aabdbc03c2454cdfc828143 /docs/libdbusmenu-gtk | |
parent | d5fcf6e23110f1ce1e753dc78da6b425dab0c713 (diff) | |
download | libdbusmenu-0d98749cbe9f405e4579adf0c30d534c277c2686.tar.gz libdbusmenu-0d98749cbe9f405e4579adf0c30d534c277c2686.tar.bz2 libdbusmenu-0d98749cbe9f405e4579adf0c30d534c277c2686.zip |
* debian/rules
- Added build targets to build with gtk3 enabled in additional to
default build with gtk2
* debian/control
- Updated build depends to support building with gtk+-3.0
- Added dh-autoreconf build depends
- Added libdbusmenu-gtk3-2, libdbusmenu-gtk3-dev, gir1.0-dbusmenu-gtk3-0.2
binaries
- build depend on libgdk-pixbuf2.0-dev >= 2.22.1-0ubuntu4, needed
for GIR fixes
* docs/libdbusmenu-gtk/reference/Makefile.am, libdbusmenu-glib/Makefile.am,
libdbusmenu-gtk/Makefile.am
- Fixes needed for building with-gtk=3
Diffstat (limited to 'docs/libdbusmenu-gtk')
-rw-r--r-- | docs/libdbusmenu-gtk/reference/Makefile.am | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/docs/libdbusmenu-gtk/reference/Makefile.am b/docs/libdbusmenu-gtk/reference/Makefile.am index ec1bd28..6e44a23 100644 --- a/docs/libdbusmenu-gtk/reference/Makefile.am +++ b/docs/libdbusmenu-gtk/reference/Makefile.am @@ -1,5 +1,12 @@ + ## Process this file with automake to produce Makefile.in +if USE_GTK3 +VER=3 +else +VER= +endif + # We require automake 1.6 at least. AUTOMAKE_OPTIONS = 1.6 @@ -9,7 +16,7 @@ AUTOMAKE_OPTIONS = 1.6 # of using the various options. # The name of the module, e.g. 'glib'. -DOC_MODULE=libdbusmenu-gtk +DOC_MODULE=libdbusmenu-gtk$(VER) # The top-level SGML file. You can change this if you want to. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml @@ -68,7 +75,7 @@ expand_content_files= # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) INCLUDES=-I$(top_srcdir) $(DBUSMENUGLIB_CFLAGS) $(DBUSMENUGTK_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk.la +GTKDOC_LIBS=$(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk$(VER).la $(DBUSMENUGLIB_LIBS) $(DBUSMENUGTK_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.local.make |