RT3497: Clean up "dclean" targets

Some Makefiles had actions for "dclean" that really belonged
to the "clean" target.  This is wrong because clean ends up,
well, not really cleaning everything.

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/Makefile.org b/Makefile.org
index 7c802e8dfe7b408e2ca95b20b9f146e121d22f1b..0844925eabae96cc0a5cb283fe6540bff2e53c18 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -476,6 +476,7 @@ libclean:
 
 clean: libclean
        rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
 
 clean: libclean
        rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c

+       rm -rf *.bak include/openssl certs/.0

        @set -e; target=clean; $(RECURSIVE_BUILD_CMD)
        rm -f $(LIBS) tags TAGS
        rm -f openssl.pc libssl.pc libcrypto.pc
        @set -e; target=clean; $(RECURSIVE_BUILD_CMD)
        rm -f $(LIBS) tags TAGS
        rm -f openssl.pc libssl.pc libcrypto.pc


@@ -504,7 +505,6 @@ gentests:
        $(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate );
 
 dclean:
        $(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate );
 
 dclean:

-       rm -rf *.bak include/openssl certs/.0

        @set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
 
 rehash: rehash.time
        @set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
 
 rehash: rehash.time

diff --git a/apps/Makefile b/apps/Makefile
index fd53f7c1a9f4325c15d784e9a633775feee38762..a952a85aa7312569d00c09c30e65ff54d4345622 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -137,11 +137,10 @@ depend:
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
        mv -f Makefile.new $(MAKEFILE)
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
        mv -f Makefile.new $(MAKEFILE)

-       rm -f CA.pl

 
 clean:
        rm -f *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE)
 
 clean:
        rm -f *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE)

-       rm -f req
+       rm -f req CA.pl

 
 $(DLIBSSL):
        (cd ..; $(MAKE) DIRS=ssl all)
 
 $(DLIBSSL):
        (cd ..; $(MAKE) DIRS=ssl all)

diff --git a/crypto/Makefile b/crypto/Makefile
index 12be1896b761ef0d9ee301e188ac3164d6b6b3f3..6a6ac32dbb8b313aaff7eecca9a00edc5cdc5683 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -141,12 +141,12 @@ depend:
 
 clean:
        rm -f buildinf.h *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 clean:
        rm -f buildinf.h *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

+       rm -f opensslconf.h

        @target=clean; $(RECURSIVE_MAKE)
 
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
        mv -f Makefile.new $(MAKEFILE)
        @target=clean; $(RECURSIVE_MAKE)
 
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
        mv -f Makefile.new $(MAKEFILE)

-       rm -f opensslconf.h

        @target=dclean; $(RECURSIVE_MAKE)
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
        @target=dclean; $(RECURSIVE_MAKE)
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.

diff --git a/crypto/md4/Makefile b/crypto/md4/Makefile
index fabc0affae1f524e01c276e7478fc95f22c202a9..af68603dd393bb49d57668569f29abbaac84fa53 100644 (file)
--- a/crypto/md4/Makefile
+++ b/crypto/md4/Makefile
@@ -69,7 +69,6 @@ depend:
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
        mv -f Makefile.new $(MAKEFILE)
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
        mv -f Makefile.new $(MAKEFILE)

-       rm -f ../../include/openssl/$(EXHEADER) ../../test/$(TEST) ../../apps/$(APPS)

 
 clean:
        rm -f asm/mx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 clean:
        rm -f asm/mx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/tools/Makefile b/tools/Makefile
index bb6fb71f3eb8a78173040442643383c09a51ac9b..b50218d03e31c3a004a54bacd512655ce3aa7dd8 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -49,10 +49,10 @@ depend:
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
        mv -f Makefile.new $(MAKEFILE)
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
        mv -f Makefile.new $(MAKEFILE)

-       rm -f c_rehash

 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

+       rm -f c_rehash

 
 errors:
 
 
 errors: