diff options
| author | Ted Gould <ted@gould.cx> | 2011-09-14 14:17:39 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-09-14 14:17:39 -0500 |
| commit | 3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff (patch) | |
| tree | 1722f023f4d1223106b9ec6cad9068b64b021a48 /tools | |
| parent | ffb532bdd37d51a328c92258a3c1ee1fb6e9a787 (diff) | |
| parent | 4810423912b7f53f716ba5665aba56234461ca6f (diff) | |
| download | libdbusmenu-3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff.tar.gz libdbusmenu-3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff.tar.bz2 libdbusmenu-3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff.zip | |
* Upstream Merge
* Build fixes to allow more optional builds
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testapp/Makefile.am | 12 |
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) |