aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-gtk/Makefile.in
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-01-30 23:25:37 -0600
committerTed Gould <ted@gould.cx>2012-01-30 23:25:37 -0600
commitd4a56efd670ae2432da8be9932df365c75ea0d72 (patch)
tree0f489d0586d6c5701c663893e64d01190819e23e /libdbusmenu-gtk/Makefile.in
parent8b1876780ab91339e24d51f72f6b8f9c4a5abfed (diff)
parent9332359a3cad3a5f23e7ff0c4bae14159818d026 (diff)
downloadlibdbusmenu-d4a56efd670ae2432da8be9932df365c75ea0d72.tar.gz
libdbusmenu-d4a56efd670ae2432da8be9932df365c75ea0d72.tar.bz2
libdbusmenu-d4a56efd670ae2432da8be9932df365c75ea0d72.zip
* New upstream release.
* Add property for accessible descriptions * Use insert/remove signals on GTK3 build * Change icon data to be a byte stream instead of base64 * Adjust GTK3 include path to match other libs * Don't get objects from boolean values (LP: #870742) * Fix depreactions on GTK3 (LP: #917115)
Diffstat (limited to 'libdbusmenu-gtk/Makefile.in')
-rw-r--r--libdbusmenu-gtk/Makefile.in9
1 files changed, 6 insertions, 3 deletions
diff --git a/libdbusmenu-gtk/Makefile.in b/libdbusmenu-gtk/Makefile.in
index 8278b2c..a1d9df2 100644
--- a/libdbusmenu-gtk/Makefile.in
+++ b/libdbusmenu-gtk/Makefile.in
@@ -368,7 +368,7 @@ glib_enum_headers = $(srcdir)/genericmenuitem.h
#####################
# 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 \
client.h \
@@ -396,7 +396,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 \
@@ -1031,7 +1034,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) \