summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2012-04-03 17:03:48 -0400
committerJonny Lamb <jonny.lamb@collabora.co.uk>2012-04-03 17:03:48 -0400
commit2de11b18fc9b4b0f30b7f02fb7c68fb29455c585 (patch)
treedacae40054dc005807e9dcb5ec165fae90d0e64f /tests
parentfe5b396b46d963cd1fa8c2e6cd9d36012edd5867 (diff)
tests/Makefile: fix warnings when running autoreconf
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0a0e3ed..a7f6d5b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -64,7 +64,7 @@ TEST_PROGS = wocky-xmpp-reader-test \
wocky-scram-sha1-test \
wocky-caps-hash-test
-noinst_PROGRAMS=
+noinst_PROGRAMS =
wocky_tls_test_DEPENDENCIES = $(LIBWOCKY)
wocky_tls_test_SOURCES = \
@@ -237,14 +237,14 @@ wocky_http_proxy_test_SOURCES = wocky-http-proxy-test.c \
wocky-test-helper.c wocky-test-helper.h \
wocky-test-stream.c wocky-test-stream.h
-wocky_dummy_xmpp_server_DEPENDENCIES = $(LIBWOCKY)
-wocky_dummy_xmpp_server_SOURCES = wocky-dummy-xmpp-server.c \
- wocky-test-connector-server.c wocky-test-connector-server.h \
- wocky-test-sasl-auth-server.c wocky-test-sasl-auth-server.h
-wocky_dummy_xmpp_server_LDADD = $(LDADD) @LIBSASL2_LIBS@
-wocky_dummy_xmpp_server_CFLAGS = $(AM_CFLAGS) @LIBSASL2_CFLAGS@ $(TLSDEFS)
-
if HAVE_LIBSASL2
+ wocky_dummy_xmpp_server_DEPENDENCIES = $(LIBWOCKY)
+ wocky_dummy_xmpp_server_SOURCES = wocky-dummy-xmpp-server.c \
+ wocky-test-connector-server.c wocky-test-connector-server.h \
+ wocky-test-sasl-auth-server.c wocky-test-sasl-auth-server.h
+ wocky_dummy_xmpp_server_LDADD = $(LDADD) @LIBSASL2_LIBS@
+ wocky_dummy_xmpp_server_CFLAGS = $(AM_CFLAGS) @LIBSASL2_CFLAGS@ $(TLSDEFS)
+
noinst_PROGRAMS += wocky-dummy-xmpp-server
endif
@@ -267,7 +267,7 @@ check_PROGRAMS = $(TEST_PROGS)
check_c_sources = $(notdir $(wildcard $(srcdir)/*.c) $(wildcard $(srcdir)/*.h))
-noinst_PROGRAMS = $(TEST_PROGS)
+noinst_PROGRAMS += $(TEST_PROGS)
test-report: test-report.xml
gtester-report $(top_builddir)/tests/$@.xml > \