diff options
| author | Ted Gould <ted@canonical.com> | 2009-06-18 16:59:11 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-06-18 16:59:11 -0500 |
| commit | 9293879744bb732b416c6c57f38808381c282759 (patch) | |
| tree | c55b0ff3ecd46d787b95e0e183487ecdcb8474fc /tests/Makefile.am | |
| parent | 369442ddbe17b5886f0dfb3d3cfc54b3d0518186 (diff) | |
| parent | 218976c1a5087e745fdc2fb697deb154efd1ca3b (diff) | |
| download | libdbusmenu-9293879744bb732b416c6c57f38808381c282759.tar.gz libdbusmenu-9293879744bb732b416c6c57f38808381c282759.tar.bz2 libdbusmenu-9293879744bb732b416c6c57f38808381c282759.zip | |
Updating to the latest from gtkmenu
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 70750ac..2ec6ca7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -84,36 +84,38 @@ test_glib_properties_client_LDADD = \ -test-gtk-label: test-gtk-label-client test-gtk-label-server - $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --task-name Server --ignore-return +test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json + $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return test_gtk_label_server_SOURCES = \ - test-gtk-label.h \ test-gtk-label-server.c test_gtk_label_server_CFLAGS = \ -I $(srcdir)/.. \ $(DBUSMENUGTK_CFLAGS) \ + $(DBUSMENUTESTS_CFLAGS) \ $(DBUSMENUGLIB_CFLAGS) -Wall -Werror test_gtk_label_server_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ ../libdbusmenu-gtk/libdbusmenu-gtk.la \ - $(DBUSMENUGTK_LIBS) + $(DBUSMENUGTK_LIBS) \ + $(DBUSMENUTESTS_LIBS) test_gtk_label_client_SOURCES = \ - test-gtk-label.h \ test-gtk-label-client.c test_gtk_label_client_CFLAGS = \ -I $(srcdir)/.. \ $(DBUSMENUGTK_CFLAGS) \ + $(DBUSMENUTESTS_CFLAGS) \ $(DBUSMENUGLIB_CFLAGS) -Wall -Werror test_gtk_label_client_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ ../libdbusmenu-gtk/libdbusmenu-gtk.la \ - $(DBUSMENUGTK_LIBS) + $(DBUSMENUGTK_LIBS) \ + $(DBUSMENUTESTS_LIBS) @@ -122,4 +124,6 @@ examplesdir = $(docdir)/examples/ examples_DATA = \ $(glib_server_nomenu_SOURCES) -EXTRA_DIST = $(examples_DATA) +EXTRA_DIST = \ + $(examples_DATA) \ + test-gtk-label.json |