We should use $SRCDIR in Makefiles

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

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 522d80f0d0ba13e3221bd05c2189fa82e775bed3..ca11aef344e4f89b8de778eeadcd61b35e6b4b16 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -84,6 +84,7 @@ DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|$depext|; $x; }
                   grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ }
                   keys %{$unified_info{sources}}); -}
 {- output_on() if $disabled{makedepend}; "" -}
+GENERATED={- join(" ", map { (my $x = $_) =~ s|\.S$|\.s|; $x } keys %{$unified_info{generate}}) -}
 
 BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash
 MISC_SCRIPTS=$(SRCDIR)/tools/c_hash $(SRCDIR)/tools/c_info \
@@ -242,13 +243,14 @@ install: install_sw install_ssldirs install_docs
 uninstall: uninstall_docs uninstall_sw
 
 clean: libclean
-       rm -f $(PROGRAMS) $(TESTPROGS)
-       rm -f `find $(BLDDIR) -name '*{- $depext -}'`
-       rm -f `find $(BLDDIR) -name '*{- $objext -}'`
-       rm -f $(BLDDIR)/core
-       rm -f $(BLDDIR)/tags $(BLDDIR)/TAGS
-       rm -f $(BLDDIR)/openssl.pc $(BLDDIR)/libcrypto.pc $(BLDDIR)/libssl.pc
-       -rm -f `find $(BLDDIR) -type l`
+       rm -f $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS)
+       rm -f $(GENERATED)
+       -rm -f `find . -name '*{- $depext -}'`
+       -rm -f `find . -name '*{- $objext -}'`
+       rm -f core
+       rm -f tags TAGS
+       rm -f openssl.pc libcrypto.pc libssl.pc
+       -rm -f `find . -type l`
        rm -f $(TARFILE)
 
 # This exists solely for those who still type 'make depend'
@@ -281,10 +283,10 @@ depend:
            for d in $(DEPS); do \
              if [ -f $$d ]; then cat $$d; fi; \
            done ) > Makefile.new; \
-         if ! cmp Makefile.new Makefile >/dev/null 2>&1; then \
-           mv -f Makefile.new Makefile; \
-         else \
+         if cmp Makefile.new Makefile >/dev/null 2>&1; then \
            rm -f Makefile.new; \
+         else \
+           mv -f Makefile.new Makefile; \
          fi; \
        fi
        @: {- output_on() if $disabled{makedepend}; "" -}
@@ -795,7 +797,7 @@ openssl.pc:
 # wasn't passed down automatically.  It's quite safe to use it like we do
 # below; if it doesn't exist, the result will be empty and 'make' will pick
 # up $(MAKEFLAGS) which is passed down as an environment variable.
-configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configurations/common.tmpl $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_infos}}) -}
+configdata.pm: $(SRCDIR)/Configurations/unix-Makefile.tmpl $(SRCDIR)/Configurations/common.tmpl $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_infos}}) -}
        @echo "Detected changed: $?"
        @echo "Reconfiguring..."
        $(SRCDIR)/Configure reconf
@@ -890,13 +892,11 @@ $obj$depext: $deps
        rm -f \$\@.tmp; touch \$\@.tmp
        -\$(MAKEDEPEND) -f\$\@.tmp -o"|$obj$objext" -- \$(CFLAGS) $ecflags$incs -- $srcs \\
            2>/dev/null
-       perl -i -pe 's/^.*\\|//; s/ \\/(\\\\.|[^ ])*//;               #\\
-                    \$\$_ = undef if (/: *\$\$/ || /^(#.*| *)\$\$/); #\\
-                    \$\$_.="\\n" unless !defined(\$\$_) or /\\R\$\$/g;' \$\@.tmp
-       \@if ! cmp \$\@.tmp \$\@ > /dev/null 2> /dev/null; then \\
-               mv \$\@.tmp \$\@; \\
-       else \\
+       perl -i -pe 's/^.*\\|//; s/ \\/(\\\\.|[^ ])*//; \$\$_ = undef if (/: *\$\$/ || /^(#.*| *)\$\$/); \$\$_.="\\n" unless !defined(\$\$_) or /\\R\$\$/g;' \$\@.tmp
+       \@if cmp \$\@.tmp \$\@ > /dev/null 2> /dev/null; then \\
                rm -f \$\@.tmp; \\
+       else \\
+               mv \$\@.tmp \$\@; \\
        fi
 EOF
           $deps = $obj.$depext;
@@ -912,10 +912,10 @@ EOF
 $obj$objext: $deps
        \$(CC) \$(CFLAGS) $ecflags$incs -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs
        \@touch $obj$depext.tmp
-       \@if ! cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\
-               mv $obj$depext.tmp $obj$depext; \\
-       else \\
+       \@if cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\
                rm -f $obj$depext.tmp; \\
+       else \\
+               mv $obj$depext.tmp $obj$depext; \\
        fi
 EOF
       }