[Xfce4-commits] <libxfcegui4:master> Fix distcheck.

[Nick Schermer]

Updating branch refs/heads/master
         to de23ac875814c3a990f81ec59767b577be3eb4fd (commit)
       from a5766f388c4cab08feb9a278e2547427e703dbb3 (commit)

commit de23ac875814c3a990f81ec59767b577be3eb4fd
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Oct 31 15:27:20 2010 +0100

    Fix distcheck.

 docs/Makefile.am               |    4 +++-
 glade/Makefile.am              |    1 +
 libxfcegui4/Makefile.am        |    1 +
 libxfcegui4/xfce-appmenuitem.h |    6 ------
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 4046464..886bfe5 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -42,11 +42,13 @@ content_files = 					\
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = 					\
+	-DLIBXFCEGUI4_COMPILATION			\
+	-DLIBXFCE4UTIL_COMPILATION			\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir) 				\
 	$(GTK_CFLAGS)					\
         $(LIBSM_CFLAGS)					\
-        $(LIBX11_CFLAGS)					\
+        $(LIBX11_CFLAGS)				\
         $(LIBXFCE4UTIL_CFLAGS)				
 
 
diff --git a/glade/Makefile.am b/glade/Makefile.am
index 2471413..577033d 100644
--- a/glade/Makefile.am
+++ b/glade/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = \
 
 INCLUDES = \
 	-DLIBXFCEGUI4_COMPILATION				\
+	-DLIBXFCE4UTIL_COMPILATION				\
 	$(PLATFORM_CPPFLAGS)
 
 if HAVE_GLADEUI
diff --git a/libxfcegui4/Makefile.am b/libxfcegui4/Makefile.am
index 44d4b72..39cc908 100644
--- a/libxfcegui4/Makefile.am
+++ b/libxfcegui4/Makefile.am
@@ -8,6 +8,7 @@ INCLUDES =								\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	-DPREFIX=\"$(prefix)\"						\
 	-DLIBXFCEGUI4_COMPILATION					\
+	-DLIBXFCE4UTIL_COMPILATION					\
 	$(PLATFORM_CPPFLAGS)
 
 lib_LTLIBRARIES =							\
diff --git a/libxfcegui4/xfce-appmenuitem.h b/libxfcegui4/xfce-appmenuitem.h
index 0a03715..9c33c45 100644
--- a/libxfcegui4/xfce-appmenuitem.h
+++ b/libxfcegui4/xfce-appmenuitem.h
@@ -26,12 +26,6 @@
 #include <gtk/gtkimagemenuitem.h>
 #include <libxfce4util/libxfce4util.h>
 
-/* work around deprecated api in libxfce4util */
-#define LIBXFCE4UTIL_COMPILATION
-#undef __XFCE_DESKTOPENTRY_H__
-#include <libxfce4util/xfce-desktopentry.h>
-#undef LIBXFCE4UTIL_COMPILATION
-
 G_BEGIN_DECLS
 
 #define XFCE_TYPE_APP_MENU_ITEM            (xfce_app_menu_item_get_type())