Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix tests.

  • Loading branch information...
commit 501f9ff6d760a0b5344f8d1467f98b103842f7d2 1 parent 3460e42
@rainwoodman rainwoodman authored
View
2  globalmenu-plugin/Makefile.am
@@ -29,7 +29,7 @@ libglobalmenu_plugin_la_SOURCES= \
vala-ccode : $(VALASOURCES)
$(VALAC) $(VALA_DEFAULT_PKGS) --thread -C \
- --library=globalmenu-gnome \
+ --library=globalmenu-plugin \
-H globalmenu-plugin.h --vapidir=. \
$(VALASOURCES) \
--vapidir=$(top_srcdir)/libsettings \
View
2  globalmenu-plugin/info-factory.vala
@@ -1,4 +1,4 @@
-public class MenuBarInfoFactory {
+internal class MenuBarInfoFactory {
/* Return the unique factory */
private static MenuBarInfoFactory unique = null;
private static bool initialized = false;
View
2  globalmenu-plugin/info.vala
@@ -1,4 +1,4 @@
-public class MenuBarInfo {
+internal class MenuBarInfo {
public enum QuirkType {
/* usual thing */
NONE = 0,
View
28 globalmenu-plugin/tests/Makefile.am
@@ -10,13 +10,29 @@ endif
STAMP = $(VALASOURCES:.vala=.c)
SUFFIXES = .vala .c
.vala.c:
- $(VALAC) $(VALA_DEFAULT_PKGS) -C --vapidir=$(top_srcdir)/tests --vapidir=../ --pkg testman --pkg gtk+-2.0 --pkg globalmenu-gnome --pkg gmodule-2.0 $^
+ $(VALAC) $(VALA_DEFAULT_PKGS) \
+ -C \
+ --vapidir=$(top_srcdir)/tests \
+ --vapidir=../ \
+ --pkg testman \
+ --pkg gtk+-2.0 \
+ --pkg globalmenu-plugin \
+ --pkg gmodule-2.0 $^
touch $@
+AM_CPPFLAGS = -I.. \
+ $(GTK_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ -include $(CONFIG_HEADER) \
+ -I$(top_srcdir)/tests \
+ -I$(top_srcdir)/libsettings \
+ $(NULL)
-test_unload_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(top_builddir)/tests/libtestman.la
-
-AM_CPPFLAGS = -I$(srcdir)/.. $(GTK_CFLAGS) $(GLIB_CFLAGS) -include $(CONFIG_HEADER) -I$(top_srcdir)/tests -I$(top_srcdir)/libsettings
BUILT_SOURCES = $(STAMP)
-LDADD = $(GTK_LIBS) $(GLIB_LIBS) ../libgnomenu-gtk.la $(top_builddir)/tests/libtestman.la
-EXTRA_DIST += $(STAMP) $(VALASOURCES) test-unload.ui
+LDADD = $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ ../libglobalmenu-plugin.la \
+ $(top_builddir)/tests/libtestman.la \
+ $(NULL)
+
+EXTRA_DIST += $(STAMP) $(VALASOURCES)
Please sign in to comment.
Something went wrong with that request. Please try again.