Merge lp:~ballogy/libdbusmenu/diff-dir-for-gtk3 into lp:libdbusmenu/0.6

[Balló György]

This change moves libdbusmenu-gtk3 header files
from /usr/include/libdbusmenu-0.4/libdbusmenu-gtk3
to /usr/include/libdbusmenu3-0.4/libdbusmenu-gtk.

The main benefit of this change is that applications which can be built with both GTK2 and GTK3 could use the same path for header files <libdbusmenu-gtk/*.h> without checking the GTK version. It is also consistent with bamf and ido naming schema for include dir.

However, this change requires to modify all apps that depend on libdbusmenu-gtk3, so I recommend this change for the next development circle.

[Ted Gould (ted)]

The problem is that the .pc file includes the dbusmenu-glib pc file, which will include the other directory. So, in general, we'd end up pulling in two places where the GTK headers could be found.

I was chatting about this with mterry who did the initial work here, and we were batting around some ideas. The only one that I could see working is that we establish three high level directories:

  /usr/include/libdbusmenu-glib-0.4/
  /usr/include/libdbusmenu-gtk-0.4/
  /usr/include/libdbusmenu-gtk3-0.4/

Then the .pc files could point to each individual one. What do you think of a solution like that?

review: Needs Information

[lp:~ballogy/libdbusmenu/diff-dir-for-gtk3]

346. By Balló György on 2012-01-05

Separate libdbusmenu-glib and libdbusmenu-gtk include directories

[Balló György (ballogy)]

OK, your solution looks good. Now I modified my proposal, so
- libdbusmenu-glib and libdbusmenu-jsonloader uses /usr/include/libdbusmenu-glib-0.4/
- gtk2-based libdbusmenu-gtk uses /usr/include/libdbusmenu-gtk-0.4/
- gtk3-based libdbusmenu-gtk uses /usr/include/libdbusmenu-gtk3-0.4/

I modified also my proposal for libindicate according to this change:
https://code.launchpad.net/~ballogy/libindicate/diff-dir-for-gtk3/+merge/82846

[Ted Gould (ted)]

review: Approve

=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am	2011-12-16 21:43:22 +0000
+++ libdbusmenu-glib/Makefile.am	2012-01-05 19:51:24 +0000
@@ -15,7 +15,7 @@
 lib_LTLIBRARIES = \
 	libdbusmenu-glib.la
 
-libdbusmenu_glibincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-glib/
+libdbusmenu_glibincludedir=$(includedir)/libdbusmenu-glib-0.4/libdbusmenu-glib/
 
 
 EXPORTED_OBJECTS = \

=== modified file 'libdbusmenu-glib/dbusmenu-glib-0.4.pc.in'
--- libdbusmenu-glib/dbusmenu-glib-0.4.pc.in	2010-12-08 15:27:48 +0000
+++ libdbusmenu-glib/dbusmenu-glib-0.4.pc.in	2012-01-05 19:51:24 +0000
@@ -4,7 +4,7 @@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libdbusmenu-0.4
+Cflags: -I${includedir}/libdbusmenu-glib-0.4
 Requires:
 Libs: -L${libdir} -ldbusmenu-glib
 

=== modified file 'libdbusmenu-gtk/Makefile.am'
--- libdbusmenu-gtk/Makefile.am	2011-09-20 04:39:39 +0000
+++ libdbusmenu-gtk/Makefile.am	2012-01-05 19:51:24 +0000
@@ -33,7 +33,7 @@
 # Include Directory
 #####################
 
-libdbusmenu_gtkincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-gtk$(VER)/
+libdbusmenu_gtkincludedir=$(includedir)/libdbusmenu-gtk$(VER)-0.4/libdbusmenu-gtk/
 
 libdbusmenu_gtkinclude_HEADERS = \
 	dbusmenu-gtk.h \

=== modified file 'libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in'
--- libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in	2011-03-15 13:52:58 +0000
+++ libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in	2012-01-05 19:51:24 +0000
@@ -4,7 +4,7 @@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libdbusmenu-0.4
+Cflags: -I${includedir}/libdbusmenu-gtk-0.4
 Requires: dbusmenu-glib-0.4 gdk-pixbuf-2.0 gtk+-2.0
 Libs: -L${libdir} -ldbusmenu-gtk
 

=== modified file 'libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in'
--- libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in	2011-03-15 13:52:58 +0000
+++ libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in	2012-01-05 19:51:24 +0000
@@ -4,7 +4,7 @@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libdbusmenu-0.4
+Cflags: -I${includedir}/libdbusmenu-gtk3-0.4
 Requires: dbusmenu-glib-0.4 gdk-pixbuf-2.0 gtk+-3.0
 Libs: -L${libdir} -ldbusmenu-gtk3
 

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2011-10-26 15:14:59 +0000
+++ tests/Makefile.am	2012-01-05 19:51:24 +0000
@@ -83,7 +83,7 @@
 
 lib_LTLIBRARIES = libdbusmenu-jsonloader.la
 
-libdbusmenu_jsonloaderincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-jsonloader/
+libdbusmenu_jsonloaderincludedir=$(includedir)/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/
 
 libdbusmenu_jsonloaderinclude_HEADERS = \
 	json-loader.h

=== modified file 'tests/dbusmenu-jsonloader-0.4.pc.in'
--- tests/dbusmenu-jsonloader-0.4.pc.in	2010-12-08 15:27:48 +0000
+++ tests/dbusmenu-jsonloader-0.4.pc.in	2012-01-05 19:51:24 +0000
@@ -4,7 +4,7 @@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libdbusmenu-0.1
+Cflags: -I${includedir}/libdbusmenu-glib-0.4
 Requires: dbusmenu-glib-0.4 json-glib-1.0
 Libs: -L${libdir} -ldbusmenu-jsonloader