diff options
| author | Ted Gould <ted@gould.cx> | 2010-11-11 11:24:45 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-11-11 11:24:45 -0600 |
| commit | f0c24c976f319d0b087adc0c8bc694cf930aa30b (patch) | |
| tree | cc1d6a425b2d5c8c5625d010cb027953d6289751 /tools/testapp | |
| parent | 9e1c8319da6ac98bd36b73c4d46d7b655778ed9d (diff) | |
| parent | b3768eaec11202758801a3dd0f94a2ab315f4a0d (diff) | |
| download | libdbusmenu-f0c24c976f319d0b087adc0c8bc694cf930aa30b.tar.gz libdbusmenu-f0c24c976f319d0b087adc0c8bc694cf930aa30b.tar.bz2 libdbusmenu-f0c24c976f319d0b087adc0c8bc694cf930aa30b.zip | |
Import upstream version 0.3.90
Diffstat (limited to 'tools/testapp')
| -rw-r--r-- | tools/testapp/Makefile.am | 8 | ||||
| -rw-r--r-- | tools/testapp/Makefile.in | 6 |
2 files changed, 11 insertions, 3 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) diff --git a/tools/testapp/Makefile.in b/tools/testapp/Makefile.in index f6703a1..8a7a441 100644 --- a/tools/testapp/Makefile.in +++ b/tools/testapp/Makefile.in @@ -52,7 +52,7 @@ dbusmenu_testapp_OBJECTS = $(am_dbusmenu_testapp_OBJECTS) am__DEPENDENCIES_1 = dbusmenu_testapp_DEPENDENCIES = \ $(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \ - $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk.la \ + $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) @@ -259,6 +259,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +@USE_GTK3_FALSE@VER = +@USE_GTK3_TRUE@VER = 3 dbusmenu_testapp_SOURCES = \ main.c @@ -270,7 +272,7 @@ 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) |