The rehash.time target should depend on build_tools as well

[openssl.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 8dd7f1aaffb276cd50dd177be6e5b0cce956a7d3..e93d4a4f54879b5bf5bee46a61156beb64c0631c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,10 +24,11 @@ HERE=.
 # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
 # Normally it is left empty.
 INSTALL_PREFIX=
-INSTALLTOP=/usr/local/ssl
 
-# Do not edit this manually. Use Configure --openssldir=DIR to change this!
-OPENSSLDIR=/usr/local/ssl
+# Do not edit these manually. Use Configure with --prefix or --openssldir
+# to change this!  Short explanation in the top comment in Configure
+INSTALLTOP=/usr/local
+OPENSSLDIR=$(INSTALLTOP)/ssl
 
 # NO_IDEA - Define to build without the IDEA algorithm
 # NO_RC4  - Define to build without the RC4 algorithm
@@ -132,7 +133,6 @@ FIPSCANLIB=
 BASEADDR=
 
 DIRS=   crypto ssl engines apps test tools
-ENGDIRS= ccgost
 SHLIBDIRS= crypto ssl
 INSTALL_SUBS= engines apps tools
 
@@ -154,12 +154,12 @@ TESTS = alltests
 
 MAKEFILE= Makefile
 
-MANDIR=$(OPENSSLDIR)/man
+MANDIR=$(INSTALLTOP)/share/man
 MAN1=1
 MAN3=3
 MANSUFFIX=
 HTMLSUFFIX=html
-HTMLDIR=$(OPENSSLDIR)/html
+HTMLDIR=$(INSTALLTOP)/share/doc/$(BASENAME)/html
 SHELL=/bin/sh
 
 TOP=    .
@@ -212,7 +212,7 @@ BUILDENV=   LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\
                AS='$(CC)' ASFLAG='$(CFLAG) -c'                 \
                AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'        \
                CROSS_COMPILE='$(CROSS_COMPILE)'        \
-               PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'             \
+               PERL='$(PERL)'  \
                SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)'     \
                INSTALL_PREFIX='$(INSTALL_PREFIX)'              \
                INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)'   \
@@ -423,7 +423,7 @@ gentests:
        $(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate );
 
 rehash: rehash.time
-rehash.time: certs build_apps
+rehash.time: certs build_apps build_tools
        @if [ -z "$(CROSS_COMPILE)" ]; then \
                (OPENSSL="`pwd`/util/opensslwrap.sh"; \
                [ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \
@@ -436,8 +436,6 @@ rehash.time: certs build_apps
 
 test:   tests
 
-test_ordinals:
-       TOP=$(TOP) PERL=$(PERL) $(PERL) test/run_tests.pl test_ordinals
 
 tests: rehash
        @(cd test && echo "testing..." && \
@@ -453,12 +451,6 @@ list-tests:
 report:
        @$(PERL) util/selftest.pl
 
-update: errors util/libeay.num util/ssleay.num TABLE test_ordinals
-       @set -e; target=update; $(RECURSIVE_BUILD_CMD)
-
-depend:
-       @set -e; target=depend; $(RECURSIVE_BUILD_CMD)
-
 tags TAGS: FORCE
        rm -f TAGS tags
        -ctags -R .
@@ -466,17 +458,29 @@ tags TAGS: FORCE
 
 FORCE:
 
+depend:
+       @set -e; target=depend; $(RECURSIVE_BUILD_CMD)
+
+update: generate errors ordinals depend
+
+generate:
+       (cd apps && $(MAKE) generate)
+       (cd crypto/bn && $(MAKE) generate)
+       (cd crypto/objects && $(MAKE) generate)
+
 errors:
        $(PERL) util/ck_errf.pl -strict */*.c */*/*.c
        $(PERL) util/mkerr.pl -recurse -write
        (cd engines; $(MAKE) PERL=$(PERL) errors)
        (cd crypto/ct; $(MAKE) PERL=$(PERL) errors)
 
+ordinals: util/libeay.num util/ssleay.num test_ordinals TABLE
 util/libeay.num::
        $(PERL) util/mkdef.pl crypto update
-
 util/ssleay.num::
        $(PERL) util/mkdef.pl ssl update
+test_ordinals:
+       TOP=$(TOP) PERL=$(PERL) $(PERL) test/run_tests.pl test_ordinals
 
 TABLE: Configure Configurations/*.conf
        (echo 'Output of `Configure TABLE'"':"; \