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 15b62d9567174e8b0e195c054f016bcfba508830..7fa4b52a96517d9264b412d94fe00c5650e2e5fb 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -150,10 +150,12 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
                CC='${CC}' CFLAG='${CFLAG}'                     \
                AS='${CC}' ASFLAG='${CFLAG} -c'                 \
                AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'    \
-               SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/lib'           \
+               SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib'           \
                INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}'   \
-               DEPFLAG='${DEPFLAG}' MAKEDEPPROG='${MAKEDEPPROG}'       \
-               LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
+               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}' \
@@ -171,13 +173,13 @@ 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) $(BUILDENV) $$target ) || exit 1; \
+               $(MAKE) $(BUILDENV) BUILDENV="$(BUILDENV)" $$target ) || exit 1; \
        else \
                $(MAKE) $$dir; \
        fi; fi
 
 reflect:
-       [ -n "$(THIS)" ] && $(MAKE) $(THIS) $(BIULDENV)
+       @[ -n "$(THIS)" ] && $(MAKE) $(THIS) $(BUILDENV)
 
 sub_all: build_all
 build_all: build_libs build_apps build_tests build_tools
@@ -350,7 +352,7 @@ depend:
        do \
        if [ -d "$$i" ]; then \
                (cd $$i && echo "making dependencies $$i..." && \
-               $(MAKE) $(BUILDENV) CFLAG='-DOPENSSL_NO_DEPRECATED ${CFLAG}' depend ) || exit 1; \
+               $(MAKE) $(BUILDENV) depend ) || exit 1; \
        fi; \
        done;