aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-12-01 20:13:48 -0600
committerTed Gould <ted@gould.cx>2010-12-01 20:13:48 -0600
commit5c3f84012f814438bb6b40488d943620a2df72c9 (patch)
treece8abb74752aa2b6ab08916044b551bb42766ddd /tools
parent0ac0a85f42be1aa1c93cfc42a0b4d455f594ba2c (diff)
parentb3768eaec11202758801a3dd0f94a2ab315f4a0d (diff)
downloadlibdbusmenu-5c3f84012f814438bb6b40488d943620a2df72c9.tar.gz
libdbusmenu-5c3f84012f814438bb6b40488d943620a2df72c9.tar.bz2
libdbusmenu-5c3f84012f814438bb6b40488d943620a2df72c9.zip
Merging in trunk changes for dual build and GTK3 fixes
Diffstat (limited to 'tools')
-rw-r--r--tools/testapp/Makefile.am8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/testapp/Makefile.am b/tools/testapp/Makefile.am
index a8b42dd..39de532 100644
--- a/tools/testapp/Makefile.am
+++ b/tools/testapp/Makefile.am
@@ -1,4 +1,10 @@
+if USE_GTK3
+VER=3
+else
+VER=
+endif
+
libexec_PROGRAMS = dbusmenu-testapp
dbusmenu_testapp_SOURCES = \
@@ -12,6 +18,6 @@ dbusmenu_testapp_CFLAGS = \
dbusmenu_testapp_LDADD = \
$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
- $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk.la \
+ $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
$(DBUSMENUGTK_LIBS) \
$(DBUSMENUTESTS_LIBS)