diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2011-02-03 12:49:01 +0100 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2011-02-03 12:49:01 +0100 |
| commit | b5660e8977f5d4ffa28bfe4cfe30e5d7cf4ce944 (patch) | |
| tree | 91d9e8441bda99a520e6bd24a82da1dece1142d0 /tests | |
| parent | 0d97a5e6201be283ba2dd017297b71122c7f19e2 (diff) | |
| parent | 19c543fd42571ef3e011db21a6d93e93d7da4483 (diff) | |
| download | libayatana-appindicator-b5660e8977f5d4ffa28bfe4cfe30e5d7cf4ce944.tar.gz libayatana-appindicator-b5660e8977f5d4ffa28bfe4cfe30e5d7cf4ce944.tar.bz2 libayatana-appindicator-b5660e8977f5d4ffa28bfe4cfe30e5d7cf4ce944.zip | |
Merge against new trunk
Diffstat (limited to 'tests')
| -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 |