diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-10-15 17:17:45 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-10-15 17:17:45 +0000 |
| commit | 0431941ec54b550e3fc2b3a225117ec99afc8efc (patch) | |
| tree | cb74ecf54d77910dc002c7437ad25e4acf29cb77 | |
| parent | 42733b3beaa5cdd25eb1ba3ff893aa7dba73dcf8 (diff) | |
| download | openssl-0431941ec54b550e3fc2b3a225117ec99afc8efc.tar.gz | |
Revert extra changes from previous commit.
| -rw-r--r-- | Makefile.org | 17 | ||||
| -rw-r--r-- | apps/Makefile | 1 |
2 files changed, 15 insertions, 3 deletions
diff --git a/Makefile.org b/Makefile.org index 1eacb09028..20a5c4cab5 100644 --- a/Makefile.org +++ b/Makefile.org @@ -360,7 +360,7 @@ libclean: rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib clean: libclean - rm -f shlib/*.o *.o core a.out fluff testlog make.log cctest cctest.c + rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c @set -e; target=clean; $(RECURSIVE_BUILD_CMD) rm -f $(LIBS) rm -f openssl.pc libssl.pc libcrypto.pc @@ -389,12 +389,23 @@ gentests: $(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate ); dclean: - rm -rf *.bak include/openssl + rm -rf *.bak include/openssl certs/.0 @set -e; target=dclean; $(RECURSIVE_BUILD_CMD) +rehash: rehash.time +rehash.time: certs apps + @if [ -z "$(CROSS_COMPILE_PREFIX)" ]; then \ + (OPENSSL="`pwd`/util/opensslwrap.sh"; \ + [ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \ + OPENSSL_DEBUG_MEMORY=on; \ + export OPENSSL OPENSSL_DEBUG_MEMORY; \ + $(PERL) tools/c_rehash certs) && \ + touch rehash.time; \ + else :; fi + test: tests -tests: +tests: rehash @(cd test && echo "testing..." && \ $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests ); OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a diff --git a/apps/Makefile b/apps/Makefile index ee13b94a93..cfedc7374a 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -159,6 +159,7 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ link_app.$${shlib_target} + @(cd ..; $(MAKE) rehash) progs.h: progs.pl $(PERL) progs.pl $(E_EXE) >progs.h |