Conditional exclusion of tls_test script completed.
authorTobias Brunner <tobias@strongswan.org>
Thu, 9 Sep 2010 11:19:51 +0000 (13:19 +0200)
committerTobias Brunner <tobias@strongswan.org>
Thu, 9 Sep 2010 11:21:38 +0000 (13:21 +0200)
scripts/Makefile.am

index bf1c1f2..827fb7d 100644 (file)
@@ -4,9 +4,14 @@ AM_CFLAGS = \
 
 noinst_PROGRAMS = bin2array bin2sql id2sql key2keyid keyid2sql \
        thread_analysis dh_speed pubkey_speed crypt_burn
+
 if USE_TLS
        noinst_PROGRAMS += tls_test
+       tls_test_SOURCES = tls_test.c
+       tls_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la \
+                       $(top_builddir)/src/libtls/libtls.la
 endif
+
 bin2array_SOURCES = bin2array.c
 bin2sql_SOURCES = bin2sql.c
 id2sql_SOURCES = id2sql.c
@@ -16,15 +21,12 @@ thread_analysis_SOURCES = thread_analysis.c
 dh_speed_SOURCES = dh_speed.c
 pubkey_speed_SOURCES = pubkey_speed.c
 crypt_burn_SOURCES = crypt_burn.c
-tls_test_SOURCES = tls_test.c
 id2sql_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 key2keyid_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 keyid2sql_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 dh_speed_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lrt
 pubkey_speed_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lrt
 crypt_burn_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
-tls_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la \
-       $(top_builddir)/src/libtls/libtls.la
 
 key2keyid.o :  $(top_builddir)/config.status