aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-01-07 23:17:19 -0600
committerTed Gould <ted@gould.cx>2011-01-07 23:17:19 -0600
commite837ae5d4006ecd1c17c6532608c15d4351fd090 (patch)
tree507a64666d553b6ba5349410ec37905d39b0a9e4
parent8877308fb3e7329560bd619168fc696402881a3e (diff)
downloadlibayatana-indicator-e837ae5d4006ecd1c17c6532608c15d4351fd090.tar.gz
libayatana-indicator-e837ae5d4006ecd1c17c6532608c15d4351fd090.tar.bz2
libayatana-indicator-e837ae5d4006ecd1c17c6532608c15d4351fd090.zip
Fixing the linking of the tests to the right libs
-rw-r--r--tests/Makefile.am33
1 files changed, 22 insertions, 11 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index da33551..f15309d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -170,7 +170,8 @@ service_shutdown_timeout_CFLAGS = \
service_shutdown_timeout_LDADD = \
$(LIBINDICATOR_LIBS) \
- $(top_builddir)/libindicator/.libs/libindicator.a
+ -L$(top_builddir)/libindicator/.libs \
+ $(INDICATOR_LIB)
service-shutdown-timeout-tester: service-shutdown-timeout Makefile
@echo "#!/bin/sh" > service-shutdown-timeout-tester
@@ -195,7 +196,8 @@ service_manager_no_connect_CFLAGS = \
service_manager_no_connect_LDADD = \
$(LIBINDICATOR_LIBS) \
- $(top_builddir)/libindicator/.libs/libindicator.a
+ -L$(top_builddir)/libindicator/.libs \
+ $(INDICATOR_LIB)
service-manager-no-connect-tester: service-manager-no-connect Makefile.am
@echo "#!/bin/sh" > service-manager-no-connect-tester
@@ -226,7 +228,8 @@ service_manager_connect_CFLAGS = \
service_manager_connect_LDADD = \
$(LIBINDICATOR_LIBS) \
- $(top_builddir)/libindicator/.libs/libindicator.a
+ -L$(top_builddir)/libindicator/.libs \
+ $(INDICATOR_LIB)
check_PROGRAMS += service-manager-connect-service
@@ -239,7 +242,8 @@ service_manager_connect_service_CFLAGS = \
service_manager_connect_service_LDADD = \
$(LIBINDICATOR_LIBS) \
- $(top_builddir)/libindicator/.libs/libindicator.a
+ -L$(top_builddir)/libindicator/.libs \
+ $(INDICATOR_LIB)
service-manager-connect-tester: service-manager-connect service-manager-connect-service session.conf service-manager-connect.service Makefile.am
@echo "#!/bin/sh" > service-manager-connect-tester
@@ -271,7 +275,8 @@ service_version_manager_CFLAGS = \
service_version_manager_LDADD = \
$(LIBINDICATOR_LIBS) \
- $(top_builddir)/libindicator/.libs/libindicator.a
+ -L$(top_builddir)/libindicator/.libs \
+ $(INDICATOR_LIB)
check_PROGRAMS += service-version-bad-service
@@ -285,7 +290,8 @@ service_version_bad_service_CFLAGS = \
service_version_bad_service_LDADD = \
$(LIBINDICATOR_LIBS) \
- $(top_builddir)/libindicator/.libs/libindicator.a
+ -L$(top_builddir)/libindicator/.libs \
+ $(INDICATOR_LIB)
check_PROGRAMS += service-version-good-service
@@ -299,7 +305,8 @@ service_version_good_service_CFLAGS = \
service_version_good_service_LDADD = \
$(LIBINDICATOR_LIBS) \
- $(top_builddir)/libindicator/.libs/libindicator.a
+ -L$(top_builddir)/libindicator/.libs \
+ $(INDICATOR_LIB)
service-version-tester: service-version-manager service-version-bad-service service-version-good-service session.conf service-version-bad.service service-version-good.service Makefile.am
@echo "#!/bin/sh" > $@
@@ -325,7 +332,8 @@ service_version_multiwatch_manager_CFLAGS = \
service_version_multiwatch_manager_LDADD = \
$(LIBINDICATOR_LIBS) \
- $(top_builddir)/libindicator/.libs/libindicator.a
+ -L$(top_builddir)/libindicator/.libs \
+ $(INDICATOR_LIB)
check_PROGRAMS += service-version-multiwatch-manager-impolite
@@ -339,7 +347,8 @@ service_version_multiwatch_manager_impolite_CFLAGS = \
service_version_multiwatch_manager_impolite_LDADD = \
$(LIBINDICATOR_LIBS) \
- $(top_builddir)/libindicator/.libs/libindicator.a
+ -L$(top_builddir)/libindicator/.libs \
+ $(INDICATOR_LIB)
check_PROGRAMS += service-version-multiwatch-service
@@ -353,7 +362,8 @@ service_version_multiwatch_service_CFLAGS = \
service_version_multiwatch_service_LDADD = \
$(LIBINDICATOR_LIBS) \
- $(top_builddir)/libindicator/.libs/libindicator.a
+ -L$(top_builddir)/libindicator/.libs \
+ $(INDICATOR_LIB)
service-version-multiwatch-tester: service-version-multiwatch-manager service-version-multiwatch-service service-version-multiwatch-manager-impolite Makefile.am
@echo "#!/bin/sh" > $@
@@ -378,7 +388,8 @@ service_manager_nostart_connect_CFLAGS = \
service_manager_nostart_connect_LDADD = \
$(LIBINDICATOR_LIBS) \
- $(top_builddir)/libindicator/.libs/libindicator.a
+ -L$(top_builddir)/libindicator/.libs \
+ $(INDICATOR_LIB)
service-manager-connect-nostart-tester: service-manager-nostart-connect service-manager-connect-service Makefile.am
@echo "#!/bin/sh" > $@