diff options
| author | Stef Walter <stefw@gnome.org> | 2012-07-17 08:05:18 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2012-07-26 12:22:31 +0200 |
| commit | 356377709cd1de1308d9d8cf15f528578a360cf3 (patch) | |
| tree | 6266878e283f1eeaf582dbe14818853793fb120f /p11-kit | |
| parent | f10d361a5b523ce7f9289ba8d45ccd847510d619 (diff) | |
Use correct shared library extension on windows
* The windows shared libraries have the .dll extension
* This means we also need separate directories for the test module
configs on win32
https://bugzilla.gnome.org/show_bug.cgi?id=44740
Diffstat (limited to 'p11-kit')
| -rw-r--r-- | p11-kit/Makefile.am | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am index cba556e..2985d85 100644 --- a/p11-kit/Makefile.am +++ b/p11-kit/Makefile.am @@ -59,6 +59,18 @@ libp11_kit_testable_la_LDFLAGS = \ libp11_kit_testable_la_SOURCES = $(MODULE_SRCS) +if OS_WIN32 + +libp11_kit_testable_la_CFLAGS = \ + -DP11_SYSTEM_CONFIG_FILE=\""$(abs_top_srcdir)/tests/files/system-pkcs11.conf"\" \ + -DP11_SYSTEM_CONFIG_MODULES=\""$(abs_top_srcdir)/tests/files/system-modules/win32"\" \ + -DP11_USER_CONFIG_FILE=\""$(abs_top_srcdir)/tests/files/user-pkcs11.conf"\" \ + -DP11_USER_CONFIG_MODULES=\""$(abs_top_srcdir)/tests/files/user-modules/win32"\" \ + -DP11_MODULE_PATH=\""$(abs_top_builddir)/tests/.libs"\" \ + $(NULL) + +else + libp11_kit_testable_la_CFLAGS = \ -DP11_SYSTEM_CONFIG_FILE=\""$(abs_top_srcdir)/tests/files/system-pkcs11.conf"\" \ -DP11_SYSTEM_CONFIG_MODULES=\""$(abs_top_srcdir)/tests/files/system-modules"\" \ @@ -67,6 +79,8 @@ libp11_kit_testable_la_CFLAGS = \ -DP11_MODULE_PATH=\""$(abs_top_builddir)/tests/.libs"\" \ $(NULL) +endif + libp11_kit_compat_la_SOURCES = \ debug.c debug.h \ messages.c \ |