diff options
Diffstat (limited to 'pkcs11')
| -rw-r--r-- | pkcs11/Makefile.am | 9 | ||||
| -rw-r--r-- | pkcs11/wrap-layer/Makefile.am | 3 | ||||
| -rw-r--r-- | pkcs11/wrap-layer/gkm-wrap-prompt.c | 2 | ||||
| -rw-r--r-- | pkcs11/wrap-layer/tests/Makefile.am | 2 |
4 files changed, 6 insertions, 10 deletions
diff --git a/pkcs11/Makefile.am b/pkcs11/Makefile.am index 97d0cef0..4bdf3988 100644 --- a/pkcs11/Makefile.am +++ b/pkcs11/Makefile.am @@ -1,15 +1,10 @@ -# TODO: Are we sure this is the best location for these headers? -incdir = $(includedir)/gck-@GCK_MAJOR@/gck - -inc_HEADERS = \ +EXTRA_DIST = \ + pkcs11i.h \ pkcs11.h \ pkcs11n.h \ pkcs11x.h -EXTRA_DIST = \ - pkcs11i.h - SUBDIRS = . \ gkm \ wrap-layer \ diff --git a/pkcs11/wrap-layer/Makefile.am b/pkcs11/wrap-layer/Makefile.am index 0113cf3b..1779a855 100644 --- a/pkcs11/wrap-layer/Makefile.am +++ b/pkcs11/wrap-layer/Makefile.am @@ -5,7 +5,8 @@ noinst_LTLIBRARIES = \ INCLUDES = -I. \ -I$(top_srcdir) \ -I$(top_builddir) \ - -I$(top_srcdir)/pkcs11 + -I$(top_srcdir)/pkcs11 \ + $(GCR_BASE_CFLAGS) # ------------------------------------------------------------------------------ # The code diff --git a/pkcs11/wrap-layer/gkm-wrap-prompt.c b/pkcs11/wrap-layer/gkm-wrap-prompt.c index 145be1e8..e6f671d9 100644 --- a/pkcs11/wrap-layer/gkm-wrap-prompt.c +++ b/pkcs11/wrap-layer/gkm-wrap-prompt.c @@ -26,7 +26,7 @@ #include "egg/egg-secure-memory.h" -#include "gcr/gcr-unlock-options.h" +#include <gcr/gcr-unlock-options.h> #include "gkm/gkm-attributes.h" #include "gkm/gkm-util.h" diff --git a/pkcs11/wrap-layer/tests/Makefile.am b/pkcs11/wrap-layer/tests/Makefile.am index c9fa406a..90bbd21b 100644 --- a/pkcs11/wrap-layer/tests/Makefile.am +++ b/pkcs11/wrap-layer/tests/Makefile.am @@ -12,8 +12,8 @@ LDADD = \ libgkm-mock-secret-store.a \ $(top_builddir)/pkcs11/gkm/libgkm.la \ $(top_builddir)/ui/libgku-prompt-testable.la \ - $(top_builddir)/gcr/libgcr-base-@GCR_MAJOR@.la \ $(top_builddir)/egg/libegg.la \ + $(GCR_BASE_LIBS) \ $(GLIB_LIBS) TEST_PROGS = \ |