From 734540f887c6b47349913d3f21c7947c97279448 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sun, 15 May 2005 23:53:34 +0000 Subject: Consolidate BUILDENV [idea is to keep all variables in one place]. --- Makefile.org | 8 ++++++-- apps/Makefile | 10 ++-------- crypto/Makefile | 38 ++++++++++++++++++-------------------- engines/Makefile | 5 +---- test/Makefile | 5 +---- 5 files changed, 28 insertions(+), 38 deletions(-) diff --git a/Makefile.org b/Makefile.org index 408c2ff54f..a3ef81ca5b 100644 --- a/Makefile.org +++ b/Makefile.org @@ -148,6 +148,7 @@ all: Makefile build_all openssl.pc BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' \ + LIBRPATH='$(INSTALLTOP)/lib' \ CC='${CC}' CFLAG='${CFLAG}' \ AS='${CC}' ASFLAG='${CFLAG} -c' \ AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \ @@ -168,11 +169,14 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ BUILD_CMD=if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \ if [ -d "$$dir" ]; then \ (cd $$dir && echo "making $$target in $$dir..." && \ - $(MAKE) -e $(BUILDENV) $$target ) || exit 1; \ + $(MAKE) $(BUILDENV) $$target ) || exit 1; \ else \ $(MAKE) $$dir; \ fi; fi +reflect: + [ -n "$(THIS)" ] && $(MAKE) $(THIS) $(BIULDENV) + sub_all: build_all build_all: build_libs build_apps build_tests build_tools @@ -335,7 +339,7 @@ test: tests tests: rehash @(cd test && echo "testing..." && \ - $(MAKE) -e $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests ); + $(MAKE) $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests ); util/opensslwrap.sh version -a report: diff --git a/apps/Makefile b/apps/Makefile index 18093818cb..e7eb6d3084 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -89,11 +89,8 @@ req: sreq.o $(A_OBJ) $(DLIBCRYPTO) shlib_target="$(SHLIB_TARGET)"; \ fi; \ $(MAKE) -f $(TOP)/Makefile.shared \ - APPNAME=req CC="$(CC)" CFLAGS="$(CFLAGS)" \ - LDFLAGS="$(LDFLAG)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ - OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \ + APPNAME=req OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \ LIBDEPS="$(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)" \ - LIBRPATH=$(INSTALLTOP)/lib \ link_app.$${shlib_target} sreq.o: req.c @@ -160,11 +157,8 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ fi; \ $(MAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(EXE) CC="$(CC)" CFLAGS="$(CFLAG)" \ - LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ - OBJECTS="$(PROGRAM).o $(E_OBJ)" \ + APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ - LIBRPATH=$(INSTALLTOP)/lib \ link_app.$${shlib_target} @case "../*.dll" in *\**) ;; *) cp -p ../*.dll .;; esac -(cd ..; \ diff --git a/crypto/Makefile b/crypto/Makefile index ae9cf4e146..7e15bb233d 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -8,10 +8,6 @@ CC= cc INCLUDE= -I. -I$(TOP) -I../include INCLUDES= -I.. -I../.. -I../../include CFLAG= -g -INSTALL_PREFIX= -OPENSSLDIR= /usr/local/ssl -INSTALLTOP= /usr/local/ssl -MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) MAKEFILE= Makefile @@ -76,16 +72,16 @@ ia64cpuid.s: ia64cpuid.S $(CC) $(CFLAGS) -E ia64cpuid.S > $@ testapps: - if echo ${SDIRS} | fgrep ' des '; \ - then cd des && $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' des; fi - if echo ${SDIRS} | fgrep ' pkcs7 '; \ - then cd pkcs7 && $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' testapps; fi + @if [ -z "(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi + [ -z "$(THIS)" ] || ( if echo ${SDIRS} | fgrep ' des '; \ + then cd des && $(MAKE) des; fi ) + [ -z "$(THIS)" ] || ( cd pkcs7 && $(MAKE) testapps ); subdirs: @for i in $(SDIRS) ;\ do \ (cd $$i && echo "making all in crypto/$$i..." && \ - $(MAKE) -e INCLUDES='${INCLUDES}' all ) || exit 1; \ + $(MAKE) INCLUDES='${INCLUDES}' all ) || exit 1; \ done; files: @@ -101,8 +97,8 @@ links: @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST) @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS) @for i in $(SDIRS); do \ - (cd $$i && echo "making links in crypto/$$i..." && \ - $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PERL='${PERL}' links ); \ + (cd $$i && echo "making links in crypto/$$i..." && \ + $(MAKE) links ); \ done; lib: $(LIBOBJ) @@ -119,17 +115,19 @@ libs: @for i in $(SDIRS) ;\ do \ (cd $$i && echo "making libs in crypto/$$i..." && \ - $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' lib ); \ + $(MAKE) lib ); done; tests: - @for i in $(SDIRS) ;\ + @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@ fi + @[ -z "$(THIS)" ] || (for i in $(SDIRS) ;\ do \ (cd $$i && echo "making tests in crypto/$$i..." && \ - $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' tests ); \ - done; + $(MAKE) tests ); \ + done; ) install: + @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... @headerlist="$(EXHEADER)"; for i in $$headerlist ;\ do \ (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ @@ -138,14 +136,14 @@ install: @for i in $(SDIRS) ;\ do \ (cd $$i && echo "making install in crypto/$$i..." && \ - $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' install ); \ + $(MAKE) install ); \ done; lint: @for i in $(SDIRS) ;\ do \ (cd $$i && echo "making lint in crypto/$$i..." && \ - $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' lint ); \ + $(MAKE) lint ); \ done; depend: @@ -155,7 +153,7 @@ depend: @for i in $(SDIRS) ;\ do \ (cd $$i && echo "making depend in crypto/$$i..." && \ - $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' DEPFLAG='${DEPFLAG}' MAKEDEPPROG='${MAKEDEPPROG}' KRB5_INCLUDES='${KRB5_INCLUDES}' PERL='${PERL}' depend ); \ + $(MAKE) depend ); \ done; clean: @@ -163,7 +161,7 @@ clean: @for i in $(SDIRS) ;\ do \ (cd $$i && echo "making clean in crypto/$$i..." && \ - $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' clean ); \ + $(MAKE) clean ); \ done; dclean: @@ -172,7 +170,7 @@ dclean: @for i in $(SDIRS) ;\ do \ (cd $$i && echo "making dclean in crypto/$$i..." && \ - $(MAKE) PERL='${PERL}' CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \ + $(MAKE) dclean ); \ done; # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/engines/Makefile b/engines/Makefile index fe833f7333..ecba389e29 100644 --- a/engines/Makefile +++ b/engines/Makefile @@ -68,11 +68,8 @@ lib: $(LIBOBJ) set -e; \ for l in $(LIBNAMES); do \ $(MAKE) -f ../Makefile.shared \ - CC="$(CC)" LIBNAME=$$l LIBEXTRAS=e_$$l.o \ + LIBNAME=$$l LIBEXTRAS=e_$$l.o \ LIBDEPS='-L.. -lcrypto $(EX_LIBS)' \ - CFLAG="$(CFLAG)" LDFLAGS="$(LDFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ - PLATFORM="$(PLATFORM)" \ link_o.$(SHLIB_TARGET); \ done; \ else \ diff --git a/test/Makefile b/test/Makefile index 85d511c7c0..d45c05412d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -311,11 +311,8 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ LIBRARIES="$(LIBSSL) $(LIBCRYPTO)"; \ fi; \ $(MAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$$target$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ - LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ - OBJECTS="$$target.o" \ + APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ - LIBRPATH=$(INSTALLTOP)/lib \ link_app.$${shlib_target} $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) -- cgit v1.2.3