svn commit: r290460 - in head/secure: lib/libcrypto lib/libssl usr.bin/openssl

[Jung-uk Kim]

Author: jkim
Date: Fri Nov  6 17:39:17 2015
New Revision: 290460
URL: https://svnweb.freebsd.org/changeset/base/290460

Log:
  Clean up OpenSSL makefiles.

Modified:
  head/secure/lib/libcrypto/Makefile
  head/secure/lib/libcrypto/Makefile.inc
  head/secure/lib/libssl/Makefile
  head/secure/usr.bin/openssl/Makefile

Modified: head/secure/lib/libcrypto/Makefile
==============================================================================
--- head/secure/lib/libcrypto/Makefile	Fri Nov  6 17:29:51 2015	(r290459)
+++ head/secure/lib/libcrypto/Makefile	Fri Nov  6 17:39:17 2015	(r290460)
@@ -14,12 +14,12 @@ NO_LINT=
 .if exists(Makefile.man)
 .include "Makefile.man"
 .endif
+.include "Makefile.inc"
+
 .if defined(NOTYET)
 MAN+=	config.5 des_modes.7
 .endif
 
-.include "Makefile.inc"
-
 # base sources
 SRCS=	cpt_err.c cryptlib.c cversion.c ex_data.c mem.c mem_dbg.c o_dir.c \
 	o_fips.c o_init.c o_str.c o_time.c uid.c
@@ -380,6 +380,8 @@ INCSDIR=	${INCLUDEDIR}/openssl
 
 CSTD=	gnu89
 
+CFLAGS+=	-I${.OBJDIR}
+CFLAGS+=	-I${LCRYPTO_SRC}/crypto
 CFLAGS+=	-I${LCRYPTO_SRC}/crypto/asn1
 CFLAGS+=	-I${LCRYPTO_SRC}/crypto/evp
 CFLAGS+=	-I${LCRYPTO_SRC}/crypto/modes
@@ -391,32 +393,32 @@ AFLAGS+=	--noexecstack
 ACFLAGS+=	-Wa,--noexecstack
 .endif
 
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+OPENSSLCONF_H=	opensslconf-x86.h
+.else
+OPENSSLCONF_H=	opensslconf-${MACHINE_CPUARCH}.h
+.endif
+
 CLEANFILES=	buildinf.h opensslconf.h
 
-buildinf.h: ${.CURDIR}/Makefile
+buildinf.h: Makefile
 	( echo "#ifndef MK1MF_BUILD"; \
 	echo "    /* auto-generated by util/mkbuildinf.pl for crypto/cversion.c */"; \
 	echo "    #define CFLAGS \"compiler: ${COMPILER_TYPE}\""; \
 	echo "    #define PLATFORM \"platform: FreeBSD-${MACHINE_ARCH}\""; \
 	echo "#endif" ) > ${.TARGET}
 
-.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
-opensslconf.h: opensslconf-x86.h
-.else
-opensslconf.h: opensslconf-${MACHINE_CPUARCH}.h
-.endif
-	${CP} ${.ALLSRC} ${.TARGET}
+opensslconf.h: ${OPENSSLCONF_H}
+	${CP} ${.IMPSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
 
 .if ${MACHINE_CPUARCH} == "amd64"
-.PATH: ${.CURDIR}/amd64
-.elif ${MACHINE_CPUARCH} == "i386"
-.PATH: ${.CURDIR}/i386
+_bn_asmpath=	${LCRYPTO_SRC}/crypto/bn/asm
 .endif
 
-.if ${MACHINE_CPUARCH} == "amd64"
-_bn_asmpath=	${LCRYPTO_SRC}/crypto/bn/asm
+.if exists(${.CURDIR}/${MACHINE_CPUARCH})
+.PATH:	${.CURDIR}/${MACHINE_CPUARCH}
 .endif
 
 .PATH:	${LCRYPTO_SRC}/crypto \

Modified: head/secure/lib/libcrypto/Makefile.inc
==============================================================================
--- head/secure/lib/libcrypto/Makefile.inc	Fri Nov  6 17:29:51 2015	(r290459)
+++ head/secure/lib/libcrypto/Makefile.inc	Fri Nov  6 17:39:17 2015	(r290460)
@@ -7,10 +7,10 @@ OPENSSL_VER=	1.0.2d
 OPENSSL_DATE=	2015-07-09
 
 LCRYPTO_SRC=	${.CURDIR}/../../../crypto/openssl
-LCRYPTO_DOC=	${.CURDIR}/../../../crypto/openssl/doc
+LCRYPTO_DOC=	${LCRYPTO_SRC}/doc
 
+CFLAGS+=	-I${LCRYPTO_SRC}
 CFLAGS+=	-DTERMIOS -DANSI_SOURCE
-CFLAGS+=	-I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto -I${.OBJDIR}
 CFLAGS+=	-DOPENSSL_THREADS -DDSO_DLFCN -DHAVE_DLFCN_H
 
 .include <bsd.endian.mk>

Modified: head/secure/lib/libssl/Makefile
==============================================================================
--- head/secure/lib/libssl/Makefile	Fri Nov  6 17:29:51 2015	(r290459)
+++ head/secure/lib/libssl/Makefile	Fri Nov  6 17:39:17 2015	(r290460)
@@ -23,6 +23,8 @@ INCSDIR=${INCLUDEDIR}/openssl
 
 LIBADD=	crypto
 
+CFLAGS+=	-I${LCRYPTO_SRC}/crypto
+
 .include <bsd.lib.mk>
 
 .PATH:	${LCRYPTO_SRC}/ssl \

Modified: head/secure/usr.bin/openssl/Makefile
==============================================================================
--- head/secure/usr.bin/openssl/Makefile	Fri Nov  6 17:29:51 2015	(r290459)
+++ head/secure/usr.bin/openssl/Makefile	Fri Nov  6 17:39:17 2015	(r290460)
@@ -9,7 +9,7 @@ LIBADD=	ssl crypto
 .endif
 .include "../../lib/libcrypto/Makefile.inc"
 
-CFLAGS+=-DMONOLITH -I${.CURDIR}
+CFLAGS+=	-DMONOLITH
 
 SRCS+=	app_rand.c apps.c asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c \
 	dgst.c dh.c dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c \