Commit a370537b authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Styling update to makefiles: $() to denote make substitutions and $${} - 

shell ones.
parent 2bd45dc9

Makefile.org

+38 −38
Original line number Diff line number Diff line
@@ -174,33 +174,33 @@ CLEARENV= TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS} \ 
		$${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS}	\

		$${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}



BUILDENV=	PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \

		CC='${CC}' CFLAG='${CFLAG}' 			\

		AS='${CC}' ASFLAG='${CFLAG} -c'			\

		AR='${AR}' NM='${NM}' RANLIB='${RANLIB}'	\

		CROSS_COMPILE_PREFIX='${CROSS_COMPILE_PREFIX}'	\

		PERL='${PERL}'					\

		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib'	\

		INSTALL_PREFIX='${INSTALL_PREFIX}'		\

		INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}'	\

		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \

		DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'	\

		MAKEDEPPROG='${MAKEDEPPROG}'			\

		SHARED_LDFLAGS='${SHARED_LDFLAGS}'		\

		KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}'	\

		EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}'	\

		SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}'	\

		PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}'	\

		CPUID_OBJ='${CPUID_OBJ}'			\

		BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' 	\

		AES_ENC='${AES_ENC}' CMLL_ENC='${CMLL_ENC}'	\

		BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}'	\

		RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}'	\

		SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'			\

		MD5_ASM_OBJ='${MD5_ASM_OBJ}'			\

		RMD160_ASM_OBJ='${RMD160_ASM_OBJ}'		\

		WP_ASM_OBJ='${WP_ASM_OBJ}'			\

		PERLASM_SCHEME='${PERLASM_SCHEME}'		\

BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \

		CC='$(CC)' CFLAG='$(CFLAG)' 			\

		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\

		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\

		CROSS_COMPILE_PREFIX='$(CROSS_COMPILE_PREFIX)'	\

		PERL='$(PERL)'					\

		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/lib'	\

		INSTALL_PREFIX='$(INSTALL_PREFIX)'		\

		INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)'	\

		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \

		DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)'	\

		MAKEDEPPROG='$(MAKEDEPPROG)'			\

		SHARED_LDFLAGS='$(SHARED_LDFLAGS)'		\

		KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)'	\

		EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)'	\

		SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)'	\

		PEX_LIBS='$(PEX_LIBS)' EX_LIBS='$(EX_LIBS)'	\

		CPUID_OBJ='$(CPUID_OBJ)'			\

		BN_ASM='$(BN_ASM)' DES_ENC='$(DES_ENC)' 	\

		AES_ENC='$(AES_ENC)' CMLL_ENC='$(CMLL_ENC)'	\

		BF_ENC='$(BF_ENC)' CAST_ENC='$(CAST_ENC)'	\

		RC4_ENC='$(RC4_ENC)' RC5_ENC='$(RC5_ENC)'	\

		SHA1_ASM_OBJ='$(SHA1_ASM_OBJ)'			\

		MD5_ASM_OBJ='$(MD5_ASM_OBJ)'			\

		RMD160_ASM_OBJ='$(RMD160_ASM_OBJ)'		\

		WP_ASM_OBJ='$(WP_ASM_OBJ)'			\

		PERLASM_SCHEME='$(PERLASM_SCHEME)'		\

		THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES=

# MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors,

# which in turn eliminates ambiguities in variable treatment with -e.
@@ -285,10 +285,10 @@ clean-shared: 
	done



link-shared:

	@ set -e; for i in ${SHLIBDIRS}; do \

	@ set -e; for i in $(SHLIBDIRS); do \

		$(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \

			LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \

			LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \

			LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \

			LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \

			symlink.$(SHLIB_TARGET); \

		libs="$$libs -l$$i"; \

	done
@@ -296,13 +296,13 @@ link-shared: 
build-shared: do_$(SHLIB_TARGET) link-shared



do_$(SHLIB_TARGET):

	@ set -e; libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

		if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \

	@ set -e; libs='-L. $(SHLIBDEPS)'; for i in $(SHLIBDIRS); do \

		if [ "$(SHLIBDIRS)" = "ssl" -a -n "$(LIBKRB5)" ]; then \

			libs="$(LIBKRB5) $$libs"; \

		fi; \

		$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \

			LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \

			LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \

			LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \

			LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \

			LIBDEPS="$$libs $(EX_LIBS)" \

			link_a.$(SHLIB_TARGET); \

		libs="-l$$i $$libs"; \
@@ -382,7 +382,7 @@ links: 


gentests:

	@(cd test && echo "generating dummy tests (if needed)..." && \

	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on generate );

	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate );



dclean:

	rm -rf *.bak include/openssl certs/.0
@@ -403,7 +403,7 @@ test: tests 


tests: rehash

	@(cd test && echo "testing..." && \

	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );

	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on tests );

	util/opensslwrap.sh version -a



report:
@@ -482,8 +482,8 @@ tar-snap: 
dist:   

	$(PERL) Configure dist

	@$(MAKE) dist_pem_h

	@$(MAKE) SDIRS='${SDIRS}' clean

	@$(MAKE) TAR='${TAR}' TARFLAGS='${TARFLAGS}' tar

	@$(MAKE) SDIRS='$(SDIRS)' clean

	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' tar



dist_pem_h:

	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)

Makefile.shared

+24 −24
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ LINK_SO_A_UNPACKED= \ 
  SHOBJECTS=$$UNPACKDIR/*.o; \

  $(LINK_SO) && rm -rf $$UNPACKDIR



DETECT_GNU_LD=(${CC} -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null

DETECT_GNU_LD=($(CC) -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null



DO_GNU_SO=$(CALC_VERSIONS); \

	SHLIB=lib$(LIBNAME).so; \
@@ -182,7 +182,7 @@ link_a.beos: 
	@ $(DO_BEOS_SO); $(LINK_SO_A)



link_o.bsd:

	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \

	@if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \

	$(CALC_VERSIONS); \

	SHLIB=lib$(LIBNAME).so; \

	SHLIB_SUFFIX=; \
@@ -192,7 +192,7 @@ link_o.bsd: 
	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \

	fi; $(LINK_SO_O)

link_a.bsd:

	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \

	@if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \

	$(CALC_VERSIONS); \

	SHLIB=lib$(LIBNAME).so; \

	SHLIB_SUFFIX=; \
@@ -202,7 +202,7 @@ link_a.bsd: 
	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \

	fi; $(LINK_SO_A)

link_app.bsd:

	@if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \

	@if $(DETECT_GNU_LD); then $(DO_GNU_APP); else \

	LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBPATH)"; \

	fi; $(LINK_APP)
@@ -238,7 +238,7 @@ link_a.darwin: 
	if [ -n "$$SHLIB_SOVER_NODOT" ]; then \

		SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \

	fi; \

	SHAREDFLAGS="$$SHAREDFLAGS -install_name ${INSTALLTOP}/lib/$$SHLIB${SHLIB_EXT}"; \

	SHAREDFLAGS="$$SHAREDFLAGS -install_name $(INSTALLTOP)/lib/$$SHLIB$(SHLIB_EXT)"; \

	$(LINK_SO_A)

link_app.darwin:	# is there run-path on darwin?

	$(LINK_APP)
@@ -300,7 +300,7 @@ link_app.cygwin: 
	$(LINK_APP)



link_o.alpha-osf1:

	@ if ${DETECT_GNU_LD}; then \

	@ if $(DETECT_GNU_LD); then \

		$(DO_GNU_SO); \

	else \

		SHLIB=lib$(LIBNAME).so; \
@@ -321,7 +321,7 @@ link_o.alpha-osf1: 
	fi; \

	$(LINK_SO_O)

link_a.alpha-osf1:

	@ if ${DETECT_GNU_LD}; then \

	@ if $(DETECT_GNU_LD); then \

		$(DO_GNU_SO); \

	else \

		SHLIB=lib$(LIBNAME).so; \
@@ -342,7 +342,7 @@ link_a.alpha-osf1: 
	fi; \

	$(LINK_SO_A)

link_app.alpha-osf1:

	@if ${DETECT_GNU_LD}; then \

	@if $(DETECT_GNU_LD); then \

		$(DO_GNU_APP); \

	else \

		LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \
@@ -350,7 +350,7 @@ link_app.alpha-osf1: 
	$(LINK_APP)



link_o.solaris:

	@ if ${DETECT_GNU_LD}; then \

	@ if $(DETECT_GNU_LD); then \

		$(DO_GNU_SO); \

	else \

		$(CALC_VERSIONS); \
@@ -364,12 +364,12 @@ link_o.solaris: 
	fi; \

	$(LINK_SO_O)

link_a.solaris:

	@ if ${DETECT_GNU_LD}; then \

	@ if $(DETECT_GNU_LD); then \

		$(DO_GNU_SO); \

	else \

		$(CALC_VERSIONS); \

		MINUSZ='-z '; \

		(${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \

		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \

		SHLIB=lib$(LIBNAME).so; \

		SHLIB_SUFFIX=;\

		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
@@ -378,7 +378,7 @@ link_a.solaris: 
	fi; \

	$(LINK_SO_A)

link_app.solaris:

	@ if ${DETECT_GNU_LD}; then \

	@ if $(DETECT_GNU_LD); then \

		$(DO_GNU_APP); \

	else \

		LDFLAGS="$(CFLAGS) -R $(LIBRPATH)"; \
@@ -387,7 +387,7 @@ link_app.solaris: 


# OpenServer 5 native compilers used

link_o.svr3:

	@ if ${DETECT_GNU_LD}; then \

	@ if $(DETECT_GNU_LD); then \

		$(DO_GNU_SO); \

	else \

		$(CALC_VERSIONS); \
@@ -399,7 +399,7 @@ link_o.svr3: 
	fi; \

	$(LINK_SO_O)

link_a.svr3:

	@ if ${DETECT_GNU_LD}; then \

	@ if $(DETECT_GNU_LD); then \

		$(DO_GNU_SO); \

	else \

		$(CALC_VERSIONS); \
@@ -411,12 +411,12 @@ link_a.svr3: 
	fi; \

	$(LINK_SO_A_UNPACKED)

link_app.svr3:

	@${DETECT_GNU_LD} && $(DO_GNU_APP); \

	@$(DETECT_GNU_LD) && $(DO_GNU_APP); \

	$(LINK_APP)



# UnixWare 7 and OpenUNIX 8 native compilers used

link_o.svr5:

	@ if ${DETECT_GNU_LD}; then \

	@ if $(DETECT_GNU_LD); then \

		$(DO_GNU_SO); \

	else \

		$(CALC_VERSIONS); \
@@ -430,12 +430,12 @@ link_o.svr5: 
	fi; \

	$(LINK_SO_O)

link_a.svr5:

	@ if ${DETECT_GNU_LD}; then \

	@ if $(DETECT_GNU_LD); then \

		$(DO_GNU_SO); \

	else \

		$(CALC_VERSIONS); \

		SHARE_FLAG='-G'; \

		(${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \

		($(CC) -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \

		SHLIB=lib$(LIBNAME).so; \

		SHLIB_SUFFIX=; \

		ALLSYMSFLAGS=''; \
@@ -444,11 +444,11 @@ link_a.svr5: 
	fi; \

	$(LINK_SO_A_UNPACKED)

link_app.svr5:

	@${DETECT_GNU_LD} && $(DO_GNU_APP); \

	@$(DETECT_GNU_LD) && $(DO_GNU_APP); \

	$(LINK_APP)



link_o.irix:

	@ if ${DETECT_GNU_LD}; then \

	@ if $(DETECT_GNU_LD); then \

		$(DO_GNU_SO); \

	else \

		$(CALC_VERSIONS); \
@@ -462,7 +462,7 @@ link_o.irix: 
	fi; \

	$(LINK_SO_O)

link_a.irix:

	@ if ${DETECT_GNU_LD}; then \

	@ if $(DETECT_GNU_LD); then \

		$(DO_GNU_SO); \

	else \

		$(CALC_VERSIONS); \
@@ -488,7 +488,7 @@ link_app.irix: 
# ELFs by the way].

#

link_o.hpux:

	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \

	@if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \

	$(CALC_VERSIONS); \

	SHLIB=lib$(LIBNAME).sl; \

	expr "$(CFLAGS)" : '.*DSO_DLFCN' > /dev/null && SHLIB=lib$(LIBNAME).so; \
@@ -501,7 +501,7 @@ link_o.hpux: 
	rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \

	$(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX

link_a.hpux:

	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \

	@if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \

	$(CALC_VERSIONS); \

	SHLIB=lib$(LIBNAME).sl; \

	expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
@@ -514,7 +514,7 @@ link_a.hpux: 
	rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \

	$(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX

link_app.hpux:

	@if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \

	@if $(DETECT_GNU_LD); then $(DO_GNU_APP); else \

	LDFLAGS="$(CFLAGS) -Wl,+s,+cdp,../:,+cdp,./:,+b,$(LIBRPATH)"; \

	fi; \

	$(LINK_APP)

crypto/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ AR= ar r 


RECURSIVE_MAKE=	[ -n "$(SDIRS)" ] && for i in $(SDIRS) ; do \

		    (cd $$i && echo "making $$target in $(DIR)/$$i..." && \

		    $(MAKE) -e TOP=../.. DIR=$$i INCLUDES='${INCLUDES}' $$target ) || exit 1; \

		    $(MAKE) -e TOP=../.. DIR=$$i INCLUDES='$(INCLUDES)' $$target ) || exit 1; \

		done;



PEX_LIBS=
@@ -77,7 +77,7 @@ ia64cpuid.s: ia64cpuid.S 
ppccpuid.s:		ppccpuid.pl;	$(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@



testapps:

	[ -z "$(THIS)" ] || (	if echo ${SDIRS} | fgrep ' des '; \

	[ -z "$(THIS)" ] || (	if echo $(SDIRS) | fgrep ' des '; \

				then cd des && $(MAKE) -e des; fi )

	[ -z "$(THIS)" ] || ( cd pkcs7 && $(MAKE) -e testapps );

	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi