aboutsummaryrefslogtreecommitdiff
path: root/tools/testapp/Makefile.am
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-09-20 08:52:46 -0700
committerKen VanDine <ken.vandine@canonical.com>2011-09-20 08:52:46 -0700
commit19c94937db3760924a02a4bda4e122a5919d12c2 (patch)
tree00cefd028c54e349afec0593e158bb94512ad038 /tools/testapp/Makefile.am
parent78dac37f516e78b8677b48484961f56035a5a8bb (diff)
parent70c33b0c4c7ce124ac203020f2f3b0a392727577 (diff)
downloadlibdbusmenu-19c94937db3760924a02a4bda4e122a5919d12c2.tar.gz
libdbusmenu-19c94937db3760924a02a4bda4e122a5919d12c2.tar.bz2
libdbusmenu-19c94937db3760924a02a4bda4e122a5919d12c2.zip
New upstream release.
∘ Protect functions from NULL submenus (LP: #803667) ∘ Build fixes (LP: #552526, LP: #552530, LP: #552538, LP: #709761, LP: #713690, LP: #643871, LP: #713685)
Diffstat (limited to 'tools/testapp/Makefile.am')
-rw-r--r--tools/testapp/Makefile.am12
1 files changed, 4 insertions, 8 deletions
diff --git a/tools/testapp/Makefile.am b/tools/testapp/Makefile.am
index 39de532..e2bbde7 100644
--- a/tools/testapp/Makefile.am
+++ b/tools/testapp/Makefile.am
@@ -1,11 +1,9 @@
-if USE_GTK3
-VER=3
-else
-VER=
-endif
+libexec_PROGRAMS =
-libexec_PROGRAMS = dbusmenu-testapp
+if WANT_TESTS
+libexec_PROGRAMS += dbusmenu-testapp
+endif
dbusmenu_testapp_SOURCES = \
main.c
@@ -18,6 +16,4 @@ dbusmenu_testapp_CFLAGS = \
dbusmenu_testapp_LDADD = \
$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
- $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
- $(DBUSMENUGTK_LIBS) \
$(DBUSMENUTESTS_LIBS)