everything should build OK now.

gnome-globalmenu · Apr 6, 2009 · 230453c · 230453c
1 parent 3cd1f96
commit 230453c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/applet/Makefile.am b/applet/Makefile.am
@@ -80,7 +80,6 @@ GlobalMenu_PanelApplet_CPPFLAGS = \
 		-include $(CONFIG_HEADER) \
 		-include glib/gi18n-lib.h \
 		-include ../libcompat/libcompat.h \
-		-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
 		-g \
 		$(NULL)
 

diff --git a/configure.ac b/configure.ac
@@ -36,6 +36,11 @@ AC_ARG_ENABLE(
 	[ USE_TESTS=true ])
 AM_CONDITIONAL([ENABLE_TESTS], [test "x$USE_TESTS" == xtrue])
 
+# misc defines
+AC_DEFINE(WNCK_I_KNOW_THIS_IS_UNSTABLE, 1, [libwnck is happy with this])
+AC_DEFINE(GMENU_I_KNOW_THIS_IS_UNSTABLE, 1,[libgnome-menus is happy with this])
+AC_DEFINE(GDataTestFunc, void*, [Workaround GDataTestFunc problem])
+
 # intl
 IT_PROG_INTLTOOL
 AM_GLIB_GNU_GETTEXT

diff --git a/gtk-modules/globalmenu/tests/Makefile.am b/gtk-modules/globalmenu/tests/Makefile.am
@@ -18,7 +18,7 @@ SUFFIXES = .vala .c .glade .ui
 
 test_unload_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(top_builddir)/tests/libtestman.la
 
-AM_CPPFLAGS = -I$(top_srcdir) $(GTK_CFLAGS) $(GLIB_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(GTK_CFLAGS) $(GLIB_CFLAGS) -include $(CONFIG_HEADER)
 BUILT_SOURCES = $(STAMP)
 LDADD = $(GTK_LIBS) $(GLIB_LIBS) ../libglobalmenu-gnome.la $(top_builddir)/tests/libtestman.la
 EXTRA_DIST += $(STAMP) $(VALASOURCES) $(VALASOURCES:.vala=.h) test-unload.ui test-unload.glade
diff --git a/libgnomenu/Makefile.am b/libgnomenu/Makefile.am
@@ -37,8 +37,6 @@ libgnomenu_la_CPPFLAGS = \
 			 $(WNCK_CFLAGS) \
 			 $(X11_CFLAGS) \
 			 -include $(CONFIG_HEADER) \
-			 -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
-			 -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
 			 -include ../libcompat/libcompat.h
 
 libgnomenu_la_LIBADD = $(GTK_LIBS) \

diff --git a/libgnomenu/tests/Makefile.am b/libgnomenu/tests/Makefile.am
@@ -17,7 +17,7 @@ SUFFIXES = .vala .c
 	if [ $@ == test-leak.c ]; then bash patch.sh; fi;
 	touch $@
 
-AM_CPPFLAGS = -I$(top_srcdir) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(WNCK_CFLAGS) -include $(CONFIG_HEADER) -DWNCK_I_KNOW_THIS_IS_UNSTABLE '-DGDataTestFunc=void*'
+AM_CPPFLAGS = -I$(top_srcdir) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(WNCK_CFLAGS) -include $(CONFIG_HEADER) 
 BUILT_SOURCES = $(STAMP)
 LDADD = $(GTK_LIBS) $(GLIB_LIBS) ../libgnomenu.la ../../tests/libtestman.la
 # default rules doesn't include the .h files!