From a381a074cb5469c83338ad68a1559147fd5f5048 Mon Sep 17 00:00:00 2001 From: natano <> Date: Sun, 4 Sep 2016 09:54:25 +0000 Subject: only regen pkg-config files when required; ok jasper --- src/lib/libcrypto/Makefile | 10 +++++----- src/lib/libssl/Makefile | 8 +++++--- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile index afe2db0cf6..9a0d7cc22f 100644 --- a/src/lib/libcrypto/Makefile +++ b/src/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 .include diff --git a/src/lib/libssl/Makefile b/src/lib/libssl/Makefile index 16d08731eb..f442bd90bb 100644 --- a/src/lib/libssl/Makefile +++ b/src/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 -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/ -- cgit v1.2.3-55-g6feb