2 files changed, 14 insertions, 28 deletions
diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index 11d5fae..44888e8 100644
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -27,16 +27,6 @@ MODULE_SRCS = \
 	private.h \
 	messages.c \
 	uri.c \
-	$(COMMON)/array.c \
-	$(COMMON)/array.h \
-	$(COMMON)/compat.c \
-	$(COMMON)/compat.h \
-	$(COMMON)/debug.c \
-	$(COMMON)/debug.h \
-	$(COMMON)/dict.c \
-	$(COMMON)/dict.h \
-	$(COMMON)/library.c \
-	$(COMMON)/library.h \
 	$(inc_HEADERS)
 
 lib_LTLIBRARIES = \
@@ -57,16 +47,18 @@ libp11_kit_la_LDFLAGS = \
 
 libp11_kit_la_SOURCES = $(MODULE_SRCS)
 
-libp11_kit_la_LIBADD = $(LTLIBINTL)
+libp11_kit_la_LIBADD = \
+	$(LTLIBINTL) \
+	$(top_builddir)/common/libp11-compat.la \
+	$(top_builddir)/common/libp11-library.la \
+	$(NULL)
 
 noinst_LTLIBRARIES = \
-	libp11-kit-testable.la \
-	libp11-kit-compat.la
-
-libp11_kit_testable_la_LDFLAGS = \
-	-no-undefined
+	libp11-kit-testable.la
 
+libp11_kit_testable_la_LDFLAGS = -no-undefined
 libp11_kit_testable_la_SOURCES = $(MODULE_SRCS)
+libp11_kit_testable_la_LIBADD = $(libp11_kit_la_LIBADD)
 
 if OS_WIN32
 
@@ -90,16 +82,6 @@ libp11_kit_testable_la_CFLAGS = \
 
 endif
 
-libp11_kit_compat_la_SOURCES = \
-	messages.c \
-	$(COMMON)/compat.c \
-	$(COMMON)/compat.h \
-	$(COMMON)/debug.c \
-	$(COMMON)/debug.h \
-	$(COMMON)/library.c \
-	$(COMMON)/library.h \
-	$(NULL)
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = p11-kit-1.pc
 
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 \