Skip to content

Commit

Permalink
autotools: Fix for VPATH build
Browse files Browse the repository at this point in the history
Since adbb94e, we always
generate *.asn.h file at build time.  This caused a build problem if
p11-kit is built with an out-of-tree build directory.

Reported by Pavel Heimlich in:
p11-glue#348
  • Loading branch information
ueno committed Feb 6, 2021
1 parent 805f0ec commit 037cc6f
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions trust/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ libtrust_data_la_SOURCES = \
$(NULL)

libtrust_data_la_CFLAGS = \
-I$(builddir)/trust \
$(LIBTASN1_CFLAGS)

libtrust_data_la_LIBADD = \
Expand Down Expand Up @@ -46,6 +47,7 @@ module_LTLIBRARIES += \
p11_kit_trust_la_CFLAGS = \
-DP11_DEFAULT_TRUST_PREFIX=DATA_DIR \
-DP11_SYSTEM_TRUST_PREFIX=SYSCONFDIR \
-I$(builddir)/trust \
$(LIBTASN1_CFLAGS)

p11_kit_trust_la_LIBADD = \
Expand All @@ -72,6 +74,7 @@ libtrust_testable_la_SOURCES = $(TRUST_SRCS)
libtrust_testable_la_CFLAGS = \
-DP11_DEFAULT_TRUST_PREFIX=\"$(builddir)/trust/default\" \
-DP11_SYSTEM_TRUST_PREFIX=\"$(builddir)/trust/system\" \
-I$(builddir)/trust \
$(LIBTASN1_CFLAGS)

libtrust_testable_la_LIBADD = \
Expand All @@ -91,6 +94,7 @@ trust_trust_LDADD = \

trust_trust_CFLAGS = \
-DP11_KIT_FUTURE_UNSTABLE_API \
-I$(builddir)/trust \
$(LIBTASN1_CFLAGS) \
$(NULL)

Expand Down

0 comments on commit 037cc6f

Please sign in to comment.