Commit 5ab65c50 authored by Rich Salz's avatar Rich Salz
Browse files

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: default avatarRichard Levitte <levitte@openssl.org>
parent 5cf37957

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -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

apps/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -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)

crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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.

crypto/md4/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

tools/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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: