summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2008-05-27 04:12:17 +0000
committerkientzle <kientzle@FreeBSD.org>2008-05-27 04:12:17 +0000
commitc8237b3c06b5ed64e6cfa5361248ecaea22ad23f (patch)
tree523ee731fe876f54bbba615834a418c6e207e715
parent276e44fd22619a4f5409e0a0836e4869e1fdaf56 (diff)
downloadFreeBSD-src-c8237b3c06b5ed64e6cfa5361248ecaea22ad23f.zip
FreeBSD-src-c8237b3c06b5ed64e6cfa5361248ecaea22ad23f.tar.gz
Until the old archive.h.in gets renamed to archive.h in the repository,
we still need some Makefile trickery to ensure archive.h is correctly built for the test harness.
-rw-r--r--lib/libarchive/test/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/test/Makefile
index f718ae3..d721734 100644
--- a/lib/libarchive/test/Makefile
+++ b/lib/libarchive/test/Makefile
@@ -73,6 +73,7 @@ TESTS= \
SRCS= ${LA_SRCS} \
${TESTS} \
${.OBJDIR}/list.h \
+ ${.OBJDIR}/archive.h \
main.c \
read_open_memory.c
@@ -95,6 +96,11 @@ WARNS=6
check test: libarchive_test
./libarchive_test -v -r ${.CURDIR}
+# Build archive.h, but in our .OBJDIR, not libarchive's
+# This keeps libarchive_test and libarchive builds completely separate.
+${.OBJDIR}/archive.h: ${LA_SRCDIR}/archive.h.in ${LA_SRCDIR}/Makefile
+ cd ${LA_SRCDIR} && unset MAKEOBJDIRPREFIX && MAKEOBJDIR=${.OBJDIR} make archive.h
+
# list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines
${.OBJDIR}/list.h: ${TESTS} Makefile
(cd ${.CURDIR}; cat ${TESTS}) | grep DEFINE_TEST > list.h
OpenPOWER on IntegriCloud