summaryrefslogtreecommitdiff
path: root/p11-kit/tests
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2013-01-08 12:27:48 +0100
committerStef Walter <stefw@gnome.org>2013-01-09 13:49:44 +0100
commit8fb222266c5bf9181cd934c27528507d45476dad (patch)
tree23ac84c98f7c84e2a699eb5f09580b43a94f13d9 /p11-kit/tests
parent3d503948450d69293a3fdfec096e398fedf714f2 (diff)
Build common code into noinst libraries
* This is cleaner than building the same source files all over the place over and over. * Works better with code coverage.
Diffstat (limited to 'p11-kit/tests')
-rw-r--r--p11-kit/tests/Makefile.am8
1 files changed, 6 insertions, 2 deletions
diff --git a/p11-kit/tests/Makefile.am b/p11-kit/tests/Makefile.am
index bd08426..026111c 100644
--- a/p11-kit/tests/Makefile.am
+++ b/p11-kit/tests/Makefile.am
@@ -1,10 +1,12 @@
include $(top_srcdir)/build/Makefile.tests
+COMMON = $(top_srcdir)/common
+
INCLUDES = \
-I$(top_srcdir) \
-I$(srcdir)/.. \
- -I$(top_srcdir)/common \
+ -I$(COMMON) \
$(CUTEST_CFLAGS)
LDADD = \
@@ -41,7 +43,9 @@ mock_one_la_SOURCES = \
mock-module-ep.c
mock_one_la_LIBADD = \
- $(top_builddir)/p11-kit/libp11-kit-compat.la
+ $(top_builddir)/common/libp11-library.la \
+ $(top_builddir)/common/libp11-compat.la \
+ $(NULL)
mock_one_la_LDFLAGS = \
-module -avoid-version -rpath /nowhere \