archive.h is no longer constructed from archive.h.in,

so we can rename it and drop some no-longer-necessary
build magic from the Makefile.

3 files changed, 1 insertions, 15 deletions

diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index db591df..0d10500 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -16,16 +16,8 @@ WARNS?=	6
 # Headers to be installed in /usr/include
 INCS=	archive.h archive_entry.h
 
-# For now, archive.h is the same as archive.h.in.
-archive.h:     archive.h.in
-	cat ${.CURDIR}/archive.h.in > archive.h
-
-# archive.h needs to be cleaned
-CLEANFILES+=	archive.h
-
 # Sources to be compiled.
-SRCS=	archive.h					\
-	archive_check_magic.c				\
+SRCS=	archive_check_magic.c				\
 	archive_entry.c					\
 	archive_entry_copy_stat.c			\
 	archive_entry_stat.c				\
diff --git a/lib/libarchive/archive.h.in b/lib/libarchive/archive.h
index edc352c..edc352c 100644
--- a/lib/libarchive/archive.h.in
+++ b/lib/libarchive/archive.h
diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/test/Makefile
index d721734..f718ae3 100644
--- a/lib/libarchive/test/Makefile
+++ b/lib/libarchive/test/Makefile
@@ -73,7 +73,6 @@ TESTS= \
 SRCS= ${LA_SRCS}				\
 	${TESTS}				\
 	${.OBJDIR}/list.h			\
-	${.OBJDIR}/archive.h			\
 	main.c					\
 	read_open_memory.c
 
@@ -96,11 +95,6 @@ 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