diff options
-rw-r--r-- | common/Makefile.am | 3 | ||||
-rw-r--r-- | common/tests/Makefile.am | 4 | ||||
-rw-r--r-- | tools/Makefile.am | 4 | ||||
-rw-r--r-- | tools/tests/Makefile.am | 4 | ||||
-rw-r--r-- | trust/Makefile.am | 1 |
5 files changed, 14 insertions, 2 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 96000dd..9e459b5 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -50,6 +50,9 @@ libp11_data_la_SOURCES = \ x509.c x509.h \ $(NULL) +libp11_data_la_CFLAGS = \ + $(LIBTASN1_CFLAGS) + asn: asn1Parser -o pkix.asn.h pkix.asn asn1Parser -o openssl.asn.h openssl.asn diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am index 3ef4471..8fcbeab 100644 --- a/common/tests/Makefile.am +++ b/common/tests/Makefile.am @@ -33,6 +33,10 @@ LDADD += \ $(LIBTASN1_LIBS) \ $(NULL) +INCLUDES += \ + $(LIBTASN1_CFLAGS) \ + $(NULL) + CHECK_PROGS += \ test-asn1 \ test-checksum \ diff --git a/tools/Makefile.am b/tools/Makefile.am index e28f15f..4977221 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -22,7 +22,6 @@ p11_kit_SOURCES = \ $(NULL) p11_kit_CFLAGS = \ - $(LIBTASN1_CFLAGS) \ $(NULL) p11_kit_LDADD = \ @@ -38,6 +37,9 @@ p11_kit_LDADD += \ $(top_builddir)/common/libp11-data.la \ $(LIBTASN1_LIBS) +p11_kit_CFLAGS += \ + $(LIBTASN1_CFLAGS) + p11_kit_SOURCES += \ extract.c extract.h \ extract-info.c \ diff --git a/tools/tests/Makefile.am b/tools/tests/Makefile.am index 4239a41..a74c981 100644 --- a/tools/tests/Makefile.am +++ b/tools/tests/Makefile.am @@ -16,7 +16,9 @@ INCLUDES = \ -I$(srcdir)/.. \ -I$(COMMON) \ -DP11_KIT_FUTURE_UNSTABLE_API \ - $(CUTEST_CFLAGS) + $(LIBTASN1_CFLAGS) \ + $(CUTEST_CFLAGS) \ + $(NULL) LDADD = \ $(top_builddir)/p11-kit/libp11-kit.la \ diff --git a/trust/Makefile.am b/trust/Makefile.am index 92c122d..86bbab4 100644 --- a/trust/Makefile.am +++ b/trust/Makefile.am @@ -7,6 +7,7 @@ COMMON = $(top_srcdir)/common INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/common \ + $(LIBTASN1_CFLAGS) \ $(NULL) MODULE_SRCS = \ |