diff options
author | 2016-09-04 09:54:25 +0000 | |
---|---|---|
committer | 2016-09-04 09:54:25 +0000 | |
commit | 53c02d25e0727c06da06de6efa1ea46c1e4b81b5 (patch) | |
tree | bc6cd655a4e94c7e10cf7c4ca9aecce5075fc4db | |
parent | Move files created by root during install/upgrade in a subdir of (diff) | |
download | wireguard-openbsd-53c02d25e0727c06da06de6efa1ea46c1e4b81b5.tar.xz wireguard-openbsd-53c02d25e0727c06da06de6efa1ea46c1e4b81b5.zip |
only regen pkg-config files when required; ok jasper
-rw-r--r-- | lib/libcrypto/Makefile | 10 | ||||
-rw-r--r-- | lib/libexpat/Makefile | 6 | ||||
-rw-r--r-- | lib/libfuse/Makefile | 6 | ||||
-rw-r--r-- | lib/libssl/Makefile | 8 | ||||
-rw-r--r-- | lib/libz/Makefile | 6 |
5 files changed, 22 insertions, 14 deletions
diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile index afe2db0cf6b..9a0d7cc22f7 100644 --- a/lib/libcrypto/Makefile +++ b/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2016/09/03 12:42:46 beck Exp $ +# $OpenBSD: Makefile,v 1.3 2016/09/04 09:54:25 natano Exp $ LIB= crypto @@ -438,12 +438,12 @@ distribution: ${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \ ${.CURDIR}/x509v3.cnf ${DESTDIR}/etc/ssl/x509v3.cnf -beforeinstall: +${PC_FILES}: opensslv.h /bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR} -.for p in ${PC_FILES} + +beforeinstall: ${PC_FILES} ${INSTALL} ${INSTALL_COPY} -o root -g ${SHAREGRP} \ - -m ${SHAREMODE} ${.OBJDIR}/$p ${DESTDIR}/usr/lib/pkgconfig/ -.endfor + -m ${SHAREMODE} ${.OBJDIR}/${PC_FILES} ${DESTDIR}/usr/lib/pkgconfig/ .include <bsd.prog.mk> .include <bsd.subdir.mk> diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile index 352e3f0fca7..b4ae20c9f02 100644 --- a/lib/libexpat/Makefile +++ b/lib/libexpat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2012/08/02 13:38:38 okan Exp $ +# $OpenBSD: Makefile,v 1.10 2016/09/04 09:54:25 natano Exp $ .PATH: ${.CURDIR}/lib @@ -17,8 +17,10 @@ includes: ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) \ ${.CURDIR}/lib/expat_external.h ${DESTDIR}/usr/include/expat_external.h -beforeinstall: +${PC_FILES}: lib/expat.h /bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR} + +beforeinstall: ${PC_FILES} ${INSTALL} ${INSTALL_COPY} -o root -g ${SHAREGRP} \ -m ${SHAREMODE} ${.OBJDIR}/${PC_FILES} ${DESTDIR}/usr/lib/pkgconfig/ diff --git a/lib/libfuse/Makefile b/lib/libfuse/Makefile index 273c7ddddc0..090dfcf1970 100644 --- a/lib/libfuse/Makefile +++ b/lib/libfuse/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2016/03/30 06:38:42 jmc Exp $ +# $OpenBSD: Makefile,v 1.9 2016/09/04 09:54:25 natano Exp $ LIB= fuse MAN= fuse_main.3 @@ -29,8 +29,10 @@ includes: eval "$$j"; \ done -beforeinstall: +${PC_FILES}: fuse_private.h /bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR} + +beforeinstall: ${PC_FILES} ${INSTALL} ${INSTALL_COPY} -o root -g ${SHAREGRP} \ -m ${SHAREMODE} ${.OBJDIR}/${PC_FILES} ${DESTDIR}/usr/lib/pkgconfig/ diff --git a/lib/libssl/Makefile b/lib/libssl/Makefile index 16d08731eb3..f442bd90bb1 100644 --- a/lib/libssl/Makefile +++ b/lib/libssl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2016/09/03 12:42:42 beck Exp $ +# $OpenBSD: Makefile,v 1.21 2016/09/04 09:54:25 natano Exp $ SUBDIR= man PC_FILES=openssl.pc libssl.pc @@ -48,10 +48,12 @@ includes: .include <bsd.lib.mk> -beforeinstall: +${PC_FILES}: ${.CURDIR}/../libcrypto/opensslv.h + /bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR} + +beforeinstall: ${PC_FILES} nm -o lib${LIB}.a | egrep -w 'printf|fprintf' && \ (echo please fix stdio usage in this library; false) || true - /bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR} .for p in ${PC_FILES} ${INSTALL} ${INSTALL_COPY} -o root -g ${SHAREGRP} \ -m ${SHAREMODE} ${.OBJDIR}/$p ${DESTDIR}/usr/lib/pkgconfig/ diff --git a/lib/libz/Makefile b/lib/libz/Makefile index 38fa1de002f..2c0df4a59de 100644 --- a/lib/libz/Makefile +++ b/lib/libz/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2016/03/30 06:38:43 jmc Exp $ +# $OpenBSD: Makefile,v 1.19 2016/09/04 09:54:25 natano Exp $ LIB= z HDRS= zconf.h zlib.h @@ -19,8 +19,10 @@ includes: eval "$$j"; \ done -beforeinstall: +${PC_FILES}: zlib.h /bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR} + +beforeinstall: ${PC_FILES} ${INSTALL} ${INSTALL_COPY} -o root -g ${SHAREGRP} \ -m ${SHAREMODE} ${.OBJDIR}/${PC_FILES} ${DESTDIR}/usr/lib/pkgconfig/ |