From 2a3f37670e9572bb5997a400fd0400a8cd81ce07 Mon Sep 17 00:00:00 2001
From: Alex Launi <alex.launi@canonical.com>
Date: Fri, 16 Dec 2011 15:49:25 -0500
Subject: set full path of glib enum files

---
 libdbusmenu-glib/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libdbusmenu-glib/Makefile.am')

diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index 7d4ea5d..519ba5f 100644
--- a/libdbusmenu-glib/Makefile.am
+++ b/libdbusmenu-glib/Makefile.am
@@ -70,8 +70,8 @@ libdbusmenu_glib_la_LIBADD = \
 pkgconfig_DATA = dbusmenu-glib-0.4.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
-glib_enum_h = enum-types.h
-glib_enum_c = enum-types.c
+glib_enum_h = $(srcdir)/enum-types.h
+glib_enum_c = $(srcdir)/enum-types.c
 glib_enum_headers = $(addprefix $(srcdir)/, $(libdbusmenu_glibinclude_HEADERS))
 
 DISTCLEANFILES += \
-- 
cgit v1.2.3


From 0845cb4986d649c38e7f9b9784af76539bfb2dea Mon Sep 17 00:00:00 2001
From: Alex Launi <alex.launi@canonical.com>
Date: Fri, 16 Dec 2011 16:43:22 -0500
Subject: build fixes

---
 Makefile.am.enum             |  2 +-
 libdbusmenu-glib/Makefile.am | 27 ++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'libdbusmenu-glib/Makefile.am')

diff --git a/Makefile.am.enum b/Makefile.am.enum
index 0503de0..a85061a 100644
--- a/Makefile.am.enum
+++ b/Makefile.am.enum
@@ -35,7 +35,7 @@ stamp-enum-types: $(glib_enum_headers)
 $(glib_enum_h): stamp-enum-types
 	@true
 
-$(glib_enum_c): $(glib_enum_h)
+$(glib_enum_c): $(builddir)/$(glib_enum_h)
 	$(QUIET_GEN)mkdir -p `dirname $(builddir)/$(glib_enum_c)`
 	$(QUIET_GEN)$(GLIB_MKENUMS) \
 		--template $(srcdir)/$(enum_tmpl_c) \
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index 519ba5f..591bf30 100644
--- a/libdbusmenu-glib/Makefile.am
+++ b/libdbusmenu-glib/Makefile.am
@@ -19,7 +19,6 @@ libdbusmenu_glibincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-glib/
 
 
 EXPORTED_OBJECTS = \
-	enum-types.h \
 	menuitem.h \
 	menuitem-proxy.h \
 	server.h \
@@ -27,6 +26,7 @@ EXPORTED_OBJECTS = \
 
 libdbusmenu_glibinclude_HEADERS = \
 	$(EXPORTED_OBJECTS) \
+	enum-types.h \
 	dbusmenu-glib.h \
 	types.h
 
@@ -70,9 +70,16 @@ libdbusmenu_glib_la_LIBADD = \
 pkgconfig_DATA = dbusmenu-glib-0.4.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
-glib_enum_h = $(srcdir)/enum-types.h
-glib_enum_c = $(srcdir)/enum-types.c
-glib_enum_headers = $(addprefix $(srcdir)/, $(libdbusmenu_glibinclude_HEADERS))
+ENUMHEADERS = \
+	menuitem.h \
+	menuitem-proxy.h \
+	server.h \
+	client.h \
+	types.h
+
+glib_enum_h = enum-types.h
+glib_enum_c = enum-types.c
+glib_enum_headers = $(addprefix $(srcdir)/, $(ENUMHEADERS))
 
 DISTCLEANFILES += \
 	enum-types.c \
@@ -158,16 +165,22 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 
 if HAVE_INTROSPECTION
 
+introspection_objects = \
+	$(addprefix $(srcdir)/, $(EXPORTED_OBJECTS)) \
+	$(builddir)/enum-types.h
+
 introspection_sources = \
-	$(libdbusmenu_glibinclude_HEADERS) \
-	$(EXPORTED_OBJECTS:.h=.c)
+	$(addprefix $(srcdir)/, $(EXPORTED_OBJECTS)) \
+	$(srcdir)/dbusmenu-glib.h \
+	$(srcdir)/types.h \
+	$(introspection_objects:.h=.c)
 
 Dbusmenu-0.4.gir: libdbusmenu-glib.la
 Dbusmenu_0_4_gir_INCLUDES = \
 	GObject-2.0
 Dbusmenu_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)
 Dbusmenu_0_4_gir_LIBS = libdbusmenu-glib.la
-Dbusmenu_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+Dbusmenu_0_4_gir_FILES = $(introspection_sources)
 Dbusmenu_0_4_gir_NAMESPACE = Dbusmenu
 Dbusmenu_0_4_gir_VERSION = 0.4
 Dbusmenu_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4
-- 
cgit v1.2.3


From 82f99f0a30316807d0c261308bc207e74eacbd33 Mon Sep 17 00:00:00 2001
From: György Balló <ballogy@freestart.hu>
Date: Thu, 5 Jan 2012 20:39:42 +0100
Subject: Separate libdbusmenu-glib and libdbusmenu-gtk include directories

---
 libdbusmenu-glib/Makefile.am             | 2 +-
 libdbusmenu-glib/dbusmenu-glib-0.4.pc.in | 2 +-
 libdbusmenu-gtk/Makefile.am              | 2 +-
 libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in   | 2 +-
 libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in  | 2 +-
 tests/Makefile.am                        | 2 +-
 tests/dbusmenu-jsonloader-0.4.pc.in      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'libdbusmenu-glib/Makefile.am')

diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index 7d4ea5d..5a04900 100644
--- a/libdbusmenu-glib/Makefile.am
+++ b/libdbusmenu-glib/Makefile.am
@@ -15,7 +15,7 @@ include $(top_srcdir)/Makefile.am.enum
 lib_LTLIBRARIES = \
 	libdbusmenu-glib.la
 
-libdbusmenu_glibincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-glib/
+libdbusmenu_glibincludedir=$(includedir)/libdbusmenu-glib-0.4/libdbusmenu-glib/
 
 
 EXPORTED_OBJECTS = \
diff --git a/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in b/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in
index 31a1eac..fd71acf 100644
--- a/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in
+++ b/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libdbusmenu-0.4
+Cflags: -I${includedir}/libdbusmenu-glib-0.4
 Requires:
 Libs: -L${libdir} -ldbusmenu-glib
 
diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am
index 7860433..2b3075f 100644
--- a/libdbusmenu-gtk/Makefile.am
+++ b/libdbusmenu-gtk/Makefile.am
@@ -33,7 +33,7 @@ glib_enum_headers = $(srcdir)/genericmenuitem.h
 # Include Directory
 #####################
 
-libdbusmenu_gtkincludedir=$(includedir)/libdbusmenu$(VER)-0.4/libdbusmenu-gtk/
+libdbusmenu_gtkincludedir=$(includedir)/libdbusmenu-gtk$(VER)-0.4/libdbusmenu-gtk/
 
 libdbusmenu_gtkinclude_HEADERS = \
 	dbusmenu-gtk.h \
diff --git a/libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in b/libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in
index 9a1b460..cae4c10 100644
--- a/libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in
+++ b/libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
 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
 
diff --git a/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in b/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in
index c320a57..ba4c1aa 100644
--- a/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in
+++ b/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libdbusmenu3-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
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a4e8682..5110b8e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -86,7 +86,7 @@ TESTS_ENVIRONMENT = env GI_TYPELIB_PATH=$(top_builddir)/libdbusmenu-glib:$(top_b
 
 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
diff --git a/tests/dbusmenu-jsonloader-0.4.pc.in b/tests/dbusmenu-jsonloader-0.4.pc.in
index 62bfeb2..1920d02 100644
--- a/tests/dbusmenu-jsonloader-0.4.pc.in
+++ b/tests/dbusmenu-jsonloader-0.4.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
 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
 
-- 
cgit v1.2.3


From 4eae3efbe5c3aa84035b2ade9ceedd68b7b3e895 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 26 Jan 2012 13:36:57 -0600
Subject: Move the no-error on deprications into the Makefiles so it's always
 after the -Wall

---
 configure.ac                 | 2 --
 libdbusmenu-glib/Makefile.am | 4 +++-
 libdbusmenu-gtk/Makefile.am  | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'libdbusmenu-glib/Makefile.am')

diff --git a/configure.ac b/configure.ac
index 13efd3c..fd69595 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,8 +23,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
 
-CFLAGS="$CFLAGS -Wno-error=deprecated-declarations"
-
 ###########################
 # GTK Doc 
 ###########################
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index 591bf30..83b2e7b 100644
--- a/libdbusmenu-glib/Makefile.am
+++ b/libdbusmenu-glib/Makefile.am
@@ -62,7 +62,9 @@ libdbusmenu_glib_la_LDFLAGS = \
 	-export-symbols-regex "^[^_].*"
 
 libdbusmenu_glib_la_CFLAGS = \
-	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror -DG_DISABLE_DEPRECATED -DG_LOG_DOMAIN="\"LIBDBUSMENU-GLIB\""
+	$(DBUSMENUGLIB_CFLAGS) \
+	-Wall -Werror -Wno-error=deprecated-declarations \
+	-DG_LOG_DOMAIN="\"LIBDBUSMENU-GLIB\""
 
 libdbusmenu_glib_la_LIBADD = \
 	$(DBUSMENUGLIB_LIBS)
diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am
index b4564d1..9f297f5 100644
--- a/libdbusmenu-gtk/Makefile.am
+++ b/libdbusmenu-gtk/Makefile.am
@@ -62,7 +62,10 @@ libdbusmenu_gtk_la_LDFLAGS = \
 	-export-symbols-regex "^[^_].*"
 
 libdbusmenu_gtk_la_CFLAGS = \
-	$(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) -Wall -Werror -DG_DISABLE_DEPRECATED -DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\""
+	$(DBUSMENUGTK_CFLAGS) \
+	-I$(top_srcdir) \
+	-Wall -Werror -Wno-error=deprecated-declarations \
+	-DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\""
 
 libdbusmenu_gtk_la_LIBADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
-- 
cgit v1.2.3