diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-05-16 16:55:47 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-05-16 16:55:47 +0000 |
| commit | ce92b6eb9c9f4fa570564ec2dd9cbce68d9983f3 (patch) | |
| tree | c624cf871e348c42de579d327b62d5d7518068cf /Makefile.org | |
| parent | 7abbffc3fb15f86bc32f0ded9dab2b683f733cbb (diff) | |
Further BUILDENV refinement, further fool-proofing of Makefiles and
[most importantly] put back dependencies accidentaly eliminated in
check-in #13342.
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.org b/Makefile.org index 15b62d9567..5deb19a016 100644 --- a/Makefile.org +++ b/Makefile.org @@ -152,7 +152,9 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \ SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/lib' \ INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' \ - DEPFLAG='${DEPFLAG}' MAKEDEPPROG='${MAKEDEPPROG}' \ + 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}' \ @@ -177,7 +179,7 @@ BUILD_CMD=if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \ 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; |