summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/Makefile.am12
-rw-r--r--common/tests/Makefile.am14
2 files changed, 15 insertions, 11 deletions
diff --git a/common/Makefile.am b/common/Makefile.am
index f37a501..754d7cd 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -2,9 +2,17 @@ NULL =
SUBDIRS = . tests
-EXTRA_DIST = \
- array.c array.h \
+noinst_LTLIBRARIES = \
+ libp11-compat.la \
+ libp11-library.la \
+ $(NULL)
+
+libp11_compat_la_SOURCES = \
compat.c compat.h \
+ $(NULL)
+
+libp11_library_la_SOURCES = \
+ array.c array.h \
debug.c debug.h \
dict.c dict.h \
library.c library.h \
diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
index 11f2369..af61786 100644
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -11,21 +11,17 @@ INCLUDES = \
-I$(COMMON) \
$(CUTEST_CFLAGS)
-LDADD = $(CUTEST_LIBS)
+LDADD = \
+ $(top_builddir)/common/libp11-library.la \
+ $(top_builddir)/common/libp11-compat.la \
+ $(CUTEST_LIBS) \
+ $(NULL)
CHECK_PROGS = \
test-dict \
test-array \
$(NULL)
-test_dict_SOURCES = \
- test-dict.c \
- $(COMMON)/dict.c
-
-test_array_SOURCES = \
- test-array.c \
- $(COMMON)/array.c
-
noinst_PROGRAMS = \
$(CHECK_PROGS)