diff options
| author |   schwarze <schwarze@openbsd.org> | 2016-11-05 15:01:54 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2016-11-05 15:01:54 +0000 |
| commit | 33afedf6ed82c26168e9ef333e57141dd2db10ab (patch) | |
| tree | 86c3f1dc50d3e6ccb3098853c61c9266754b22ed /lib/libssl | |
| parent | Add support for X25519. (diff) | |
| download | wireguard-openbsd-33afedf6ed82c26168e9ef333e57141dd2db10ab.tar.xz wireguard-openbsd-33afedf6ed82c26168e9ef333e57141dd2db10ab.zip | |
after getting rid of the pod files, clean up the Makefiles; ok bcook@
Diffstat (limited to 'lib/libssl')
| -rw-r--r-- | lib/libssl/Makefile | 9 | ||||
| -rw-r--r-- | lib/libssl/doc/Makefile (renamed from lib/libssl/man/Makefile) | 32 |
2 files changed, 13 insertions, 28 deletions
diff --git a/lib/libssl/Makefile b/lib/libssl/Makefile index 74d4bc94884..01d7f04036f 100644 --- a/lib/libssl/Makefile +++ b/lib/libssl/Makefile @@ -1,13 +1,16 @@ -# $OpenBSD: Makefile,v 1.25 2016/11/05 08:12:22 jsing Exp $ +# $OpenBSD: Makefile,v 1.26 2016/11/05 15:01:54 schwarze Exp $ + +.include <bsd.own.mk> +.ifndef NOMAN +SUBDIR= doc +.endif -SUBDIR= man PC_FILES=openssl.pc libssl.pc CLEANFILES=${PC_FILES} ${VERSION_SCRIPT} LIB= ssl -.include <bsd.own.mk> CFLAGS+= -Wall -Wundef .if ${COMPILER_VERSION:L} != "gcc3" CFLAGS+= -Werror diff --git a/lib/libssl/man/Makefile b/lib/libssl/doc/Makefile index e30d3fbb421..dfe4e7b3cb6 100644 --- a/lib/libssl/man/Makefile +++ b/lib/libssl/doc/Makefile @@ -1,12 +1,8 @@ -# $OpenBSD: Makefile,v 1.34 2016/09/03 12:42:45 beck Exp $ +# $OpenBSD: Makefile,v 1.1 2016/11/05 15:01:54 schwarze Exp $ -.include <bsd.own.mk> # for NOMAN +.include <bsd.own.mk> -POD2MAN=pod2man --official --release="OpenBSD ${OSREV}" --center=OpenSSL - -.ifndef NOMAN -MAN= \ - BIO_f_ssl.3 \ +MAN = BIO_f_ssl.3 \ SSL_CIPHER_get_name.3 \ SSL_COMP_add_compression_method.3 \ SSL_CTX_add_extra_chain_cert.3 \ @@ -88,24 +84,10 @@ MAN= \ SSL_want.3 \ SSL_write.3 \ d2i_SSL_SESSION.3 \ - ssl.3 \ - -.include <bsd.man.mk> -.else -maninstall: + ssl.3 -.endif +all clean cleandir depend includes obj tags: -.PATH: ${.CURDIR}/../doc -.SUFFIXES: .pod .1 .3 .7 -.for sect in 1 3 7 -.pod.${sect}: - @echo '${POD2MAN} --section=${sect} --name=${*:U} $< > $@' - @${POD2MAN} --section=${sect} --name=${*:U} $< > $@.tmp && mv $@.tmp $@ -.endfor +install: maninstall -.include <bsd.obj.mk> -.include <bsd.subdir.mk> - -clean cleandir: - rm -f ${MAN} +.include <bsd.man.mk> |