Better 'make depend' mechanism

[openssl.git] / Configurations / unix-Makefile.tmpl

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index d781e537dc60c097240af1a27811ec4ae3cad512..be6299bc808abbb866b173fd8e00cb91dc6590bb 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -220,6 +220,7 @@ test tests: build_tests_nodep build_apps_nodep build_engines_nodep depend
          SRCTOP=../$(SRCDIR) \
          BLDTOP=../$(BLDDIR) \
          EXE_EXT={- $exeext -} \
+         OPENSSL_ENGINES=../$(BLDDIR)/engines \
            $(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) )
 
 list-tests:
@@ -256,32 +257,15 @@ clean: libclean
 # This exists solely for those who still type 'make depend'
 #
 # We check if any depfile is newer than Makefile and decide to
-# concatenate only if that is true, or if 'test' (a.k.a [ )
-# doesn't have the option to figure it out (-nt).
-#
-# To check if test has the file age comparison operator, we
-# simply try, and rely test to exit with 0 if the comparison
-# was true, 1 if false, and most importantly, 2 if it doesn't
-# recognise the operator.
+# concatenate only if that is true.
 depend:
        @: {- output_off() if $disabled{makedepend}; "" -}
-       @catdepends=false; \
-       if [ Makefile -nt Makefile ] 2>/dev/null || [ $$? = 1 ]; then \
-         for d in $(DEPS); do \
-           if [ $$d -nt Makefile ]; then \
-             catdepends=true; \
-             break; \
-           fi; \
-         done; \
-       else \
-         catdepends=true; \
-       fi; \
-       if [ $$catdepends = true ]; then \
+       @if [ -z "`find $(DEPS) -newer Makefile`" ]; then \
          ( sed -e '/^# DO NOT DELETE THIS LINE.*/,$$d' < Makefile; \
            echo '# DO NOT DELETE THIS LINE -- make depend depends on it.'; \
            echo; \
-           for d in $(DEPS); do \
-             if [ -f $$d ]; then cat $$d; fi; \
+           for f in $(DEPS); do \
+             if [ -f $$f ]; then cat $$f; fi; \
            done ) > Makefile.new; \
          if cmp Makefile.new Makefile >/dev/null 2>&1; then \
            rm -f Makefile.new; \