Move _WIN32_WINNT definition from command line to e_os.h [from HEAD].

[oweals/openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 408c2ff54f24fa4eace385d193fe557ff85e870a..7fa4b52a96517d9264b412d94fe00c5650e2e5fb 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -147,11 +147,15 @@ HEADER=         e_os.h
 all: Makefile build_all openssl.pc
 
 BUILDENV=      PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
-               SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}'     \
                CC='${CC}' CFLAG='${CFLAG}'                     \
                AS='${CC}' ASFLAG='${CFLAG} -c'                 \
                AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'    \
-               LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
+               SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib'           \
+               INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}'   \
+               MAKEDEPEND='$${TOP}/util/domd $${TOP} -MD ${MAKEDEPPROG}'\
+               DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'    \
+               MAKEDEPPROG='${MAKEDEPPROG}'                    \
+               LDFLAGS='${LDFLAGS}' 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}' \
@@ -163,16 +167,20 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
                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}'
+               RMD160_ASM_OBJ='${RMD160_ASM_OBJ}'              \
+               THIS=$${THIS:-$@}
 
 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) BUILDENV="$(BUILDENV)" $$target ) || exit 1; \
        else \
                $(MAKE) $$dir; \
        fi; fi
 
+reflect:
+       @[ -n "$(THIS)" ] && $(MAKE) $(THIS) $(BUILDENV)
+
 sub_all: build_all
 build_all: build_libs build_apps build_tests build_tools
 
@@ -241,12 +249,10 @@ do_$(SHLIB_TARGET):
                if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
                        libs="$(LIBKRB5) $$libs"; \
                fi; \
-               $(MAKE) -f Makefile.shared \
-                       $(BUILDENV) \
+               $(MAKE) -f Makefile.shared $(BUILDENV) \
                        LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
                        LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
                        LIBDEPS="$$libs $(EX_LIBS)" \
-                       LIBRPATH="$(INSTALLTOP)/lib" \
                        link_a.$(SHLIB_TARGET); \
                libs="-l$$i $$libs"; \
        done
@@ -335,7 +341,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:
@@ -346,7 +352,7 @@ depend:
        do \
        if [ -d "$$i" ]; then \
                (cd $$i && echo "making dependencies $$i..." && \
-               $(MAKE) SDIRS='${SDIRS}' CFLAG='-DOPENSSL_NO_DEPRECATED ${CFLAG}' DEPFLAG='${DEPFLAG}' MAKEDEPPROG='${MAKEDEPPROG}' KRB5_INCLUDES='${KRB5_INCLUDES}' PERL='${PERL}' depend ) || exit 1; \
+               $(MAKE) $(BUILDENV) depend ) || exit 1; \
        fi; \
        done;
 
@@ -446,7 +452,7 @@ install_sw:
        do \
        if [ -d "$$i" ]; then \
                (cd $$i; echo "installing $$i..."; \
-               $(MAKE) $(BUILDENV) INSTALL_PREFIX='${INSTALL_PREFIX}' OPENSSLDIR='${OPENSSLDIR}' install ); \
+               $(MAKE) $(BUILDENV) install ); \
        fi; \
        done
        @set -e; for i in $(LIBS) ;\