From 3d503948450d69293a3fdfec096e398fedf714f2 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Thu, 6 Dec 2012 22:42:02 +0100 Subject: Move debug and library code into the common/ subdirectory Start using p11_ as our internal prefix rather than _p11_. We explicitly export p11_kit_ so this is fine as far as visibility. Move the threading, mutex, and module compat, dict, and array code into the common directory too. Take this opportunity to clean up a bit of internal API as well, since so many lines are being touched internally. --- configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index b0bf648..bb72391 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ P11KIT_AGE=0 # ------------------------------------------------------------------------------ AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIR([build/m4]) AM_INIT_AUTOMAKE([1.10]) AM_SANITY_CHECK AM_MAINTAINER_MODE([enable]) @@ -282,13 +282,16 @@ AC_DEFINE_UNQUOTED(SHLEXT, ["$SHLEXT"], [File extension for shared libraries]) AC_SUBST(SHLEXT) AC_CONFIG_FILES([Makefile + build/Makefile + common/Makefile + common/tests/Makefile doc/Makefile doc/version.xml po/Makefile.in p11-kit/Makefile + p11-kit/tests/Makefile p11-kit/p11-kit-1.pc p11-kit/pkcs11.conf.example - tests/Makefile tools/Makefile ]) AC_OUTPUT -- cgit v1.1