diff options
| author | Rich Salz <rsalz@openssl.org> | 2014-12-11 17:01:16 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2014-12-11 17:01:16 -0500 |
| commit | 5ab65c50ef8287b128d6642209525283e1ea07be (patch) | |
| tree | 2947341d92631fcb0a0dcf8eeda32081f637d533 | |
| parent | 5cf37957fbdb7e2a1be48e15c4114d218c135f73 (diff) | |
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>
| -rw-r--r-- | Makefile.org | 2 | ||||
| -rw-r--r-- | apps/Makefile | 3 | ||||
| -rw-r--r-- | crypto/Makefile | 2 | ||||
| -rw-r--r-- | crypto/md4/Makefile | 1 | ||||
| -rw-r--r-- | tools/Makefile | 2 |
5 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.org b/Makefile.org index 7c802e8dfe..0844925eab 100644 --- 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 + 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 @@ -504,7 +505,6 @@ gentests: $(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 diff --git a/apps/Makefile b/apps/Makefile index fd53f7c1a9..a952a85aa7 100644 --- 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) - rm -f CA.pl 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) diff --git a/crypto/Makefile b/crypto/Makefile index 12be1896b7..6a6ac32dbb 100644 --- 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 + 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) - rm -f opensslconf.h @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 fabc0affae..af68603dd3 100644 --- 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) - 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 diff --git a/tools/Makefile b/tools/Makefile index bb6fb71f3e..b50218d03e 100644 --- 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) - rm -f c_rehash clean: rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + rm -f c_rehash errors: |