diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2014-06-19 11:58:15 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2014-06-19 14:00:49 +0200 |
| commit | f4d29bf16d3e6a6839d8f4a939c6043e3ac5c5ab (patch) | |
| tree | 38d133dce7d319bbbbebdf2613857ba35082e1c0 /src | |
| parent | 6719c4c8286eb51982035454033ff39b5d27d455 (diff) | |
| download | strongswan-f4d29bf16d3e6a6839d8f4a939c6043e3ac5c5ab.tar.bz2 strongswan-f4d29bf16d3e6a6839d8f4a939c6043e3ac5c5ab.tar.xz | |
starter: Don't directly refer to source files in Makefile for unit tests
Older versions of automake have trouble recursively cleaning such
constructs properly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/starter/Makefile.am | 7 | ||||
| -rw-r--r-- | src/starter/tests/Makefile.am | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am index 1eb834e92..04e126d94 100644 --- a/src/starter/Makefile.am +++ b/src/starter/Makefile.am @@ -3,11 +3,15 @@ SUBDIRS = . tests ipsec_PROGRAMS = starter starter_SOURCES = \ starter.c files.h \ -parser/parser.y parser/lexer.l parser/conf_parser.c parser/conf_parser.h \ args.c args.h confread.c confread.h keywords.c keywords.h cmp.c cmp.h \ invokecharon.c invokecharon.h starterstroke.c starterstroke.h \ netkey.c netkey.h klips.c klips.h +# parser is also used by tests +noinst_LTLIBRARIES = libstarter.la +libstarter_la_SOURCES = \ +parser/parser.y parser/lexer.l parser/conf_parser.c parser/conf_parser.h + AM_CPPFLAGS = \ -I${linux_headers} \ -I$(top_srcdir)/src/libstrongswan \ @@ -29,6 +33,7 @@ AM_YFLAGS = -v -d starter_LDADD = \ $(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libhydra/libhydra.la \ + libstarter.la \ $(SOCKLIB) $(PTHREADLIB) EXTRA_DIST = keywords.txt ipsec.conf Android.mk diff --git a/src/starter/tests/Makefile.am b/src/starter/tests/Makefile.am index 5e188c49b..f84327b6b 100644 --- a/src/starter/tests/Makefile.am +++ b/src/starter/tests/Makefile.am @@ -4,9 +4,6 @@ check_PROGRAMS = $(TESTS) starter_tests_SOURCES = \ suites/test_parser.c \ - ../parser/conf_parser.c \ - ../parser/lexer.l \ - ../parser/parser.y \ starter_tests.h starter_tests.c starter_tests_CFLAGS = \ @@ -18,4 +15,5 @@ starter_tests_CFLAGS = \ starter_tests_LDFLAGS = @COVERAGE_LDFLAGS@ starter_tests_LDADD = \ $(top_builddir)/src/libstrongswan/libstrongswan.la \ - $(top_builddir)/src/libstrongswan/tests/libtest.la + $(top_builddir)/src/libstrongswan/tests/libtest.la \ + ../libstarter.la |