15 files changed, 85 insertions, 67 deletions
diff --git a/common/Makefile.am b/common/Makefile.am
index 2df3915..5f185b8 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,15 +1,9 @@
 
-include $(top_srcdir)/build/Makefile.decl
-
-SUBDIRS = . tests
-
-incdir = $(includedir)/p11-kit-1/p11-kit
-
-inc_HEADERS = \
-	pkcs11.h \
+inc_HEADERS += \
+	common/pkcs11.h \
 	$(NULL)
 
-noinst_LTLIBRARIES = \
+noinst_LTLIBRARIES += \
 	libp11-common.la \
 	libp11-library.la \
 	libp11-test.la \
@@ -17,31 +11,94 @@ noinst_LTLIBRARIES = \
 	$(NULL)
 
 libp11_common_la_SOURCES = \
-	argv.c argv.h \
-	attrs.c attrs.h \
-	array.c array.h \
-	buffer.c buffer.h \
-	compat.c compat.h \
-	constants.c constants.h \
-	debug.c debug.h \
-	dict.c dict.h \
-	hash.c hash.h \
-	lexer.c lexer.h \
-	message.c message.h \
-	path.c path.h \
-	pkcs11.h pkcs11x.h \
-	url.c url.h \
+	common/argv.c common/argv.h \
+	common/attrs.c common/attrs.h \
+	common/array.c common/array.h \
+	common/buffer.c common/buffer.h \
+	common/compat.c common/compat.h \
+	common/constants.c common/constants.h \
+	common/debug.c common/debug.h \
+	common/dict.c common/dict.h \
+	common/hash.c common/hash.h \
+	common/lexer.c common/lexer.h \
+	common/message.c common/message.h \
+	common/path.c common/path.h \
+	common/pkcs11.h common/pkcs11x.h \
+	common/url.c common/url.h \
 	$(NULL)
 
 libp11_library_la_SOURCES = \
-	library.c library.h \
+	common/library.c common/library.h \
 	$(NULL)
 
 libp11_test_la_SOURCES = \
-	mock.c mock.h \
-	test.c test.h \
+	common/mock.c common/mock.h \
+	common/test.c common/test.h \
 	$(NULL)
 
 libp11_tool_la_SOURCES = \
-	tool.c tool.h \
-	$(NULL)
-\ No newline at end of file
+	common/tool.c common/tool.h \
+	$(NULL)
+
+# Tests ----------------------------------------------------------------
+
+common_LIBS = \
+	libp11-test.la \
+	libp11-common.la \
+	$(NULL)
+
+CHECK_PROGS += \
+	test-tests \
+	test-compat \
+	test-hash \
+	test-dict \
+	test-array \
+	test-constants \
+	test-attrs \
+	test-buffer \
+	test-url \
+	test-path \
+	test-lexer \
+	test-message \
+	$(NULL)
+
+test_array_SOURCES = common/test-array.c
+test_array_LDADD = $(common_LIBS)
+
+test_attrs_SOURCES = common/test-attrs.c
+test_attrs_LDADD = $(common_LIBS)
+
+test_buffer_SOURCES = common/test-buffer.c
+test_buffer_LDADD = $(common_LIBS)
+
+test_compat_SOURCES = common/test-compat.c
+test_compat_LDADD = $(common_LIBS)
+
+test_constants_SOURCES = common/test-constants.c
+test_constants_LDADD = $(common_LIBS)
+
+test_dict_SOURCES = common/test-dict.c
+test_dict_LDADD = $(common_LIBS)
+
+test_hash_SOURCES = common/test-hash.c
+test_hash_LDADD = $(common_LIBS)
+
+test_lexer_SOURCES = common/test-lexer.c
+test_lexer_LDADD = $(common_LIBS)
+
+test_message_SOURCES = common/test-message.c
+test_message_LDADD = $(common_LIBS)
+
+test_path_SOURCES = common/test-path.c
+test_path_LDADD = $(common_LIBS)
+
+test_tests_SOURCES = common/test-tests.c
+test_tests_LDADD = $(common_LIBS)
+
+test_url_SOURCES = common/test-url.c
+test_url_LDADD = $(common_LIBS)
+
+noinst_PROGRAMS += frob-getauxval
+
+frob_getauxval_SOURCES = common/frob-getauxval.c
+frob_getauxval_LDADD = $(common_LIBS)
diff --git a/common/tests/frob-getauxval.c b/common/frob-getauxval.c
index 02745be..02745be 100644
--- a/common/tests/frob-getauxval.c
+++ b/common/frob-getauxval.c
diff --git a/common/tests/test-array.c b/common/test-array.c
index 695917a..695917a 100644
--- a/common/tests/test-array.c
+++ b/common/test-array.c
diff --git a/common/tests/test-attrs.c b/common/test-attrs.c
index 79895e2..79895e2 100644
--- a/common/tests/test-attrs.c
+++ b/common/test-attrs.c
diff --git a/common/tests/test-buffer.c b/common/test-buffer.c
index 4fd060d..4fd060d 100644
--- a/common/tests/test-buffer.c
+++ b/common/test-buffer.c
diff --git a/common/tests/test-compat.c b/common/test-compat.c
index 42471ae..42471ae 100644
--- a/common/tests/test-compat.c
+++ b/common/test-compat.c
diff --git a/common/tests/test-constants.c b/common/test-constants.c
index 9adc81a..9adc81a 100644
--- a/common/tests/test-constants.c
+++ b/common/test-constants.c
diff --git a/common/tests/test-dict.c b/common/test-dict.c
index f12a34e..f12a34e 100644
--- a/common/tests/test-dict.c
+++ b/common/test-dict.c
diff --git a/common/tests/test-hash.c b/common/test-hash.c
index a12d5a4..a12d5a4 100644
--- a/common/tests/test-hash.c
+++ b/common/test-hash.c
diff --git a/common/tests/test-lexer.c b/common/test-lexer.c
index 7d18e87..7d18e87 100644
--- a/common/tests/test-lexer.c
+++ b/common/test-lexer.c
diff --git a/common/tests/test-message.c b/common/test-message.c
index 63ecf31..63ecf31 100644
--- a/common/tests/test-message.c
+++ b/common/test-message.c
diff --git a/common/tests/test-path.c b/common/test-path.c
index 57619c8..57619c8 100644
--- a/common/tests/test-path.c
+++ b/common/test-path.c
diff --git a/common/tests/test-tests.c b/common/test-tests.c
index ba31d83..ba31d83 100644
--- a/common/tests/test-tests.c
+++ b/common/test-tests.c
diff --git a/common/tests/test-url.c b/common/test-url.c
index 892bf3c..892bf3c 100644
--- a/common/tests/test-url.c
+++ b/common/test-url.c
diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
deleted file mode 100644
index 7bbc4ce..0000000
--- a/common/tests/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-
-include $(top_srcdir)/build/Makefile.tests
-
-COMMON = $(top_srcdir)/common
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(srcdir)/.. \
-	-I$(COMMON) \
-	-DBUILDDIR=\"$(abs_builddir)\" \
-	$(TEST_CFLAGS)
-
-LDADD = \
-	$(NULL)
-
-CHECK_PROGS = \
-	test-tests \
-	test-compat \
-	test-hash \
-	test-dict \
-	test-array \
-	test-constants \
-	test-attrs \
-	test-buffer \
-	test-url \
-	test-path \
-	test-lexer \
-	test-message \
-	$(NULL)
-
-noinst_PROGRAMS = \
-	frob-getauxval \
-	$(CHECK_PROGS)
-
-TESTS = $(CHECK_PROGS)
-
-LDADD += \
-	$(top_builddir)/common/libp11-test.la \
-	$(top_builddir)/common/libp11-common.la