after getting rid of the pod files, clean up the Makefiles; ok bcook@

4 files changed, 23 insertions, 41 deletions

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 43aeef3226c..e3ab864a804 100644
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,8 +1,12 @@
-# $OpenBSD: Makefile,v 1.11 2016/11/05 14:57:29 jsing Exp $
+# $OpenBSD: Makefile,v 1.12 2016/11/05 15:01:54 schwarze Exp $
 
 LIB=	crypto
 
+.include <bsd.own.mk>
+.ifndef NOMAN
 SUBDIR= man
+.endif
+
 PC_FILES=libcrypto.pc
 
 CLEANFILES=${PC_FILES}
@@ -11,7 +15,6 @@ LCRYPTO_SRC=	${.CURDIR}
 
 CFLAGS+= -Wall -Wundef -Werror
 
-.include <bsd.own.mk>		# for 'NOPIC' definition
 .if !defined(NOPIC)
 CFLAGS+= -DDSO_DLFCN -DHAVE_DLFCN_H -DHAVE_FUNOPEN
 .endif
diff --git a/lib/libcrypto/man/Makefile b/lib/libcrypto/man/Makefile
index 81840a0b295..fd422f02dc6 100644
--- a/lib/libcrypto/man/Makefile
+++ b/lib/libcrypto/man/Makefile
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.48 2016/11/05 13:36:33 schwarze Exp $
+# $OpenBSD: Makefile,v 1.49 2016/11/05 15:01:54 schwarze Exp $
 
-.include <bsd.own.mk>		# for NOMAN
+.include <bsd.own.mk>
 
-.ifndef NOMAN
 MAN=	\
 	ASN1_OBJECT_new.3 \
 	ASN1_STRING_length.3 \
@@ -194,13 +193,8 @@ MAN=	\
 	rsa.3 \
 	x509.3
 
-.include <bsd.man.mk>
-.else
-maninstall:
-
-.endif
+all clean cleandir depend includes obj tags:
 
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
+install: maninstall
 
-clean cleandir:
+.include <bsd.man.mk>
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 b0c2b34e811..dfe4e7b3cb6 100644
--- a/lib/libssl/man/Makefile
+++ b/lib/libssl/doc/Makefile
@@ -1,12 +1,8 @@
-# $OpenBSD: Makefile,v 1.34 2016/09/02 17:00:17 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>