diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-27 08:56:41 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-27 08:56:41 -0600 |
| commit | 27ae7e26eec862442189eaf94ab2f559d8d28bb5 (patch) | |
| tree | daaf0a7f70b7b7921d925aa31bdf450c3b9b8d4c /tests/Makefile.am | |
| parent | 83b9ba8658f3bb4593a32c61eade547ac7bfe965 (diff) | |
| parent | ceb50bdad13b935da467d6913fa428fd9c8b1dda (diff) | |
| download | libayatana-appindicator-27ae7e26eec862442189eaf94ab2f559d8d28bb5.tar.gz libayatana-appindicator-27ae7e26eec862442189eaf94ab2f559d8d28bb5.tar.bz2 libayatana-appindicator-27ae7e26eec862442189eaf94ab2f559d8d28bb5.zip | |
* Upstream Merge
* Fixes to build system to build with GTK3
* Use the dbusmenu parser
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 5e176b5..ed89981 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,9 @@ +if USE_GTK3 +VER=3 +else +VER= +endif + check_PROGRAMS = \ test-libappindicator \ @@ -31,7 +37,7 @@ test_libappindicator_CFLAGS = \ test_libappindicator_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la ######################################### ## test-libappindicator-dbus-client @@ -48,7 +54,7 @@ test_libappindicator_dbus_client_CFLAGS = \ test_libappindicator_dbus_client_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la ######################################### ## test-libappindicator-dbus-server @@ -65,7 +71,7 @@ test_libappindicator_dbus_server_CFLAGS = \ test_libappindicator_dbus_server_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la ######################################### ## test-libappindicator-status-client @@ -82,7 +88,7 @@ test_libappindicator_status_client_CFLAGS = \ test_libappindicator_status_client_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la ######################################### ## test-libappindicator-status-server @@ -99,7 +105,7 @@ test_libappindicator_status_server_CFLAGS = \ test_libappindicator_status_server_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la ######################################### ## test-libappindicator-fallback @@ -115,7 +121,7 @@ test_libappindicator_fallback_watcher_CFLAGS = \ test_libappindicator_fallback_watcher_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la test_libappindicator_fallback_item_SOURCES = \ test-libappindicator-fallback-item.c @@ -127,7 +133,7 @@ test_libappindicator_fallback_item_CFLAGS = \ test_libappindicator_fallback_item_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am @echo "#!/bin/bash" > $@ @@ -192,5 +198,5 @@ test_simple_app_CFLAGS = \ test_simple_app_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la |