diff options
| author | Ted Gould <ted@canonical.com> | 2009-06-23 13:16:10 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-06-23 13:16:10 -0500 |
| commit | adfef85dda36a1f5f652cc017b85e14194bd0ec6 (patch) | |
| tree | c55b0ff3ecd46d787b95e0e183487ecdcb8474fc /tests/Makefile.am | |
| parent | ec5c382624da19a1a83d1e75d21f74778df01f38 (diff) | |
| parent | 9293879744bb732b416c6c57f38808381c282759 (diff) | |
| download | libdbusmenu-adfef85dda36a1f5f652cc017b85e14194bd0ec6.tar.gz libdbusmenu-adfef85dda36a1f5f652cc017b85e14194bd0ec6.tar.bz2 libdbusmenu-adfef85dda36a1f5f652cc017b85e14194bd0ec6.zip | |
Merging in the dbusdeath branch to get the gtkmenu updates and dbus handling code.
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 45 |
1 files changed, 42 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 1f21141..2ec6ca7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,14 +2,16 @@ check: tests DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf -tests: test-glib-layout test-glib-properties +tests: test-glib-layout test-glib-properties test-gtk-label libexec_PROGRAMS = \ glib-server-nomenu \ test-glib-layout-client \ test-glib-layout-server \ test-glib-properties-client \ - test-glib-properties-server + test-glib-properties-server \ + test-gtk-label-client \ + test-gtk-label-server glib_server_nomenu_SOURCES = \ glib-server-nomenu.c @@ -82,9 +84,46 @@ test_glib_properties_client_LDADD = \ +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-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) \ + $(DBUSMENUTESTS_LIBS) + +test_gtk_label_client_SOURCES = \ + 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) \ + $(DBUSMENUTESTS_LIBS) + + + examplesdir = $(docdir)/examples/ examples_DATA = \ $(glib_server_nomenu_SOURCES) -EXTRA_DIST = $(examples_DATA) +EXTRA_DIST = \ + $(examples_DATA) \ + test-gtk-label.json |