summaryrefslogtreecommitdiff
path: root/p11-kit
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-05-27 14:42:35 +0200
committerStef Walter <stefw@collabora.co.uk>2011-05-27 14:45:44 +0200
commitbdd6188e299405e16179906bc79f9fef2605176a (patch)
tree6d1654e4ee6c4411f1a8075c89353e5ee25c46d2 /p11-kit
parent92f821b6883e700a97a18d244104dea1031f2dce (diff)
Change around installation of headers, pkg-config, and file names
* Install headers to ${prefix}/include/p11-kit-1/p11-kit/ * This solves problems with other projects that have their own pkcs11.h files. * Change the pkg-config file name to p11-kit-1.pc * Change the source file names.
Diffstat (limited to 'p11-kit')
-rw-r--r--p11-kit/Makefile.am18
-rw-r--r--p11-kit/debug.h4
-rw-r--r--p11-kit/messages.c (renamed from p11-kit/p11-kit-messages.c)0
-rw-r--r--p11-kit/modules.c (renamed from p11-kit/p11-kit-lib.c)2
-rw-r--r--p11-kit/p11-kit-1.pc.in (renamed from p11-kit/p11-kit.pc.in)2
-rw-r--r--p11-kit/p11-kit.h2
-rw-r--r--p11-kit/p11-kit.pc17
-rw-r--r--p11-kit/private.h (renamed from p11-kit/p11-kit-private.h)0
-rw-r--r--p11-kit/proxy.c (renamed from p11-kit/p11-kit-proxy.c)2
-rw-r--r--p11-kit/uri.c (renamed from p11-kit/p11-kit-uri.c)2
-rw-r--r--p11-kit/uri.h (renamed from p11-kit/p11-kit-uri.h)2
11 files changed, 17 insertions, 34 deletions
diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index 0b7e163..1f2de49 100644
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -2,11 +2,11 @@
INCLUDES = \
-DP11_KIT_API_SUBJECT_TO_CHANGE
-incdir = $(includedir)/p11-kit
+incdir = $(includedir)/p11-kit-1/p11-kit
inc_HEADERS = \
p11-kit.h \
- p11-kit-uri.h \
+ uri.h \
pkcs11.h
MODULE_SRCS = \
@@ -14,11 +14,11 @@ MODULE_SRCS = \
debug.c debug.h \
hash.c hash.h \
util.c util.h \
- p11-kit-lib.c \
- p11-kit-proxy.c \
- p11-kit-private.h \
- p11-kit-messages.c \
- p11-kit-uri.c \
+ modules.c \
+ proxy.c \
+ private.h \
+ messages.c \
+ uri.c \
$(inc_HEADERS)
lib_LTLIBRARIES = \
@@ -38,7 +38,7 @@ libp11_kit_testable_la_LDFLAGS = \
libp11_kit_testable_la_SOURCES = $(MODULE_SRCS)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = p11-kit.pc
+pkgconfig_DATA = p11-kit-1.pc
EXTRA_DIST = \
- p11-kit.pc.in \ No newline at end of file
+ p11-kit-1.pc.in \ No newline at end of file
diff --git a/p11-kit/debug.h b/p11-kit/debug.h
index 47e5cc4..acc9ca6 100644
--- a/p11-kit/debug.h
+++ b/p11-kit/debug.h
@@ -55,13 +55,13 @@ void debug_message (int flag,
* more than once. So you can do:
*
* #define DEBUG_FLAG DEBUG_ONE_THING
- * #include "gkr-debug.h"
+ * #include "debug.h"
* ...
* DEBUG ("if we're debugging one thing");
* ...
* #undef DEBUG_FLAG
* #define DEBUG_FLAG DEBUG_OTHER_THING
- * #include "gkr-debug.h"
+ * #include "debug.h"
* ...
* DEBUG ("if we're debugging the other thing");
* ...
diff --git a/p11-kit/p11-kit-messages.c b/p11-kit/messages.c
index bfc637c..bfc637c 100644
--- a/p11-kit/p11-kit-messages.c
+++ b/p11-kit/messages.c
diff --git a/p11-kit/p11-kit-lib.c b/p11-kit/modules.c
index abc58f8..25fd204 100644
--- a/p11-kit/p11-kit-lib.c
+++ b/p11-kit/modules.c
@@ -41,7 +41,7 @@
#include "hash.h"
#include "pkcs11.h"
#include "p11-kit.h"
-#include "p11-kit-private.h"
+#include "private.h"
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/p11-kit/p11-kit.pc.in b/p11-kit/p11-kit-1.pc.in
index d80167e..c5bcdbd 100644
--- a/p11-kit/p11-kit.pc.in
+++ b/p11-kit/p11-kit-1.pc.in
@@ -14,4 +14,4 @@ Name: p11-kit
Description: Library and proxy module for properly loading and sharing PKCS#11 modules.
Version: @VERSION@
Libs: -L${libdir} -lp11-kit
-Cflags: -I${includedir}/p11-kit
+Cflags: -I${includedir}/p11-kit-1
diff --git a/p11-kit/p11-kit.h b/p11-kit/p11-kit.h
index 7dcfa4f..6d90a8d 100644
--- a/p11-kit/p11-kit.h
+++ b/p11-kit/p11-kit.h
@@ -44,7 +44,7 @@
#error "This API has not yet reached stability."
#endif
-#include "pkcs11.h"
+#include "p11-kit/pkcs11.h"
#ifdef __cplusplus
extern "C" {
diff --git a/p11-kit/p11-kit.pc b/p11-kit/p11-kit.pc
deleted file mode 100644
index ce763cc..0000000
--- a/p11-kit/p11-kit.pc
+++ /dev/null
@@ -1,17 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-datarootdir=${prefix}/share
-datadir=${datarootdir}
-sysconfdir=/etc
-p11_system_conf=/etc/pkcs11/pkcs11.conf
-p11_system_modules=/etc/pkcs11/modules
-p11_user_conf=~/.pkcs11/pkcs11.conf
-p11_user_modules=~/.pkcs11/modules
-
-Name: p11-kit
-Description: Library and proxy module for properly loading and sharing PKCS#11 modules.
-Version: 0.1
-Libs: -L${libdir} -lp11-kit
-Cflags: -I${includedir}/p11-kit
diff --git a/p11-kit/p11-kit-private.h b/p11-kit/private.h
index 56d5394..56d5394 100644
--- a/p11-kit/p11-kit-private.h
+++ b/p11-kit/private.h
diff --git a/p11-kit/p11-kit-proxy.c b/p11-kit/proxy.c
index e8c4015..7160422 100644
--- a/p11-kit/p11-kit-proxy.c
+++ b/p11-kit/proxy.c
@@ -38,7 +38,7 @@
#include "hash.h"
#include "pkcs11.h"
#include "p11-kit.h"
-#include "p11-kit-private.h"
+#include "private.h"
#include "util.h"
#include <sys/types.h>
diff --git a/p11-kit/p11-kit-uri.c b/p11-kit/uri.c
index f2ac3ad..14d00b1 100644
--- a/p11-kit/p11-kit-uri.c
+++ b/p11-kit/uri.c
@@ -37,7 +37,7 @@
#define DEBUG_FLAG DEBUG_URI
#include "debug.h"
#include "pkcs11.h"
-#include "p11-kit-uri.h"
+#include "uri.h"
#include "util.h"
#include <assert.h>
diff --git a/p11-kit/p11-kit-uri.h b/p11-kit/uri.h
index a54f7a4..1cf5c00 100644
--- a/p11-kit/p11-kit-uri.h
+++ b/p11-kit/uri.h
@@ -44,7 +44,7 @@
#error "This API has not yet reached stability."
#endif
-#include "pkcs11.h"
+#include "p11-kit/pkcs11.h"
#ifdef __cplusplus
extern "C" {