summaryrefslogtreecommitdiff
path: root/p11-kit
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2012-04-02 07:34:25 +0200
committerStef Walter <stefw@gnome.org>2012-04-02 16:07:20 +0200
commitd4c5661a695b5fc4a0126a4583e30ef70aea54ac (patch)
treea26b4a371bddb030cda4ead5f9fd1350bdcdef28 /p11-kit
parentc43038d82edcfd878ff66e3aa7fe247f53876f9b (diff)
Build some test modules for testing main p11-kit functionality
* And put together a test for duplicate modules
Diffstat (limited to 'p11-kit')
-rw-r--r--p11-kit/Makefile.am29
1 files changed, 22 insertions, 7 deletions
diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index ee39319..cd445f1 100644
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -3,11 +3,6 @@ NULL =
INCLUDES = \
-I$(top_srcdir) \
-DP11_KIT_FUTURE_UNSTABLE_API \
- -DP11_SYSTEM_CONFIG_FILE=\""$(p11_system_config_file)"\" \
- -DP11_SYSTEM_CONFIG_MODULES=\""$(p11_system_config_modules)"\" \
- -DP11_USER_CONFIG_FILE=\""$(p11_user_config_file)"\" \
- -DP11_USER_CONFIG_MODULES=\""$(p11_user_config_modules)"\" \
- -DP11_MODULE_PATH=\""$(p11_module_path)"\" \
$(NULL)
incdir = $(includedir)/p11-kit-1/p11-kit
@@ -36,8 +31,13 @@ MODULE_SRCS = \
lib_LTLIBRARIES = \
libp11-kit.la
-noinst_LTLIBRARIES = \
- libp11-kit-testable.la
+libp11_kit_la_CFLAGS = \
+ -DP11_SYSTEM_CONFIG_FILE=\""$(p11_system_config_file)"\" \
+ -DP11_SYSTEM_CONFIG_MODULES=\""$(p11_system_config_modules)"\" \
+ -DP11_USER_CONFIG_FILE=\""$(p11_user_config_file)"\" \
+ -DP11_USER_CONFIG_MODULES=\""$(p11_user_config_modules)"\" \
+ -DP11_MODULE_PATH=\""$(p11_module_path)"\" \
+ $(NULL)
libp11_kit_la_LDFLAGS = \
-no-undefined \
@@ -48,11 +48,26 @@ libp11_kit_la_SOURCES = $(MODULE_SRCS)
libp11_kit_la_LIBADD = $(LTLIBINTL)
+noinst_LTLIBRARIES = \
+ libp11-kit-testable.la \
+ libp11-kit-compat.la
+
libp11_kit_testable_la_LDFLAGS = \
-no-undefined
libp11_kit_testable_la_SOURCES = $(MODULE_SRCS)
+libp11_kit_testable_la_CFLAGS = \
+ -DP11_SYSTEM_CONFIG_FILE=\""$(abs_top_builddir)/tests/files/system-pkcs11.conf"\" \
+ -DP11_SYSTEM_CONFIG_MODULES=\""$(abs_top_builddir)/tests/files/system-modules"\" \
+ -DP11_USER_CONFIG_FILE=\""$(abs_top_builddir)/tests/files/user-pkcs11.conf"\" \
+ -DP11_USER_CONFIG_MODULES=\""$(abs_top_builddir)/tests/files/user-modules"\" \
+ -DP11_MODULE_PATH=\""$(abs_top_builddir)/tests/.libs"\" \
+ $(NULL)
+
+libp11_kit_compat_la_SOURCES = \
+ compat.c compat.h
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = p11-kit-1.pc