diff options
| -rw-r--r-- | Makefile.org | 2 | ||||
| -rw-r--r-- | apps/Makefile | 1 | ||||
| -rw-r--r-- | crypto/Makefile | 1 | ||||
| -rw-r--r-- | crypto/dso/dso_dlfcn.c | 2 | ||||
| -rw-r--r-- | crypto/md4/Makefile | 1 | ||||
| -rw-r--r-- | test/Makefile | 4 | ||||
| -rw-r--r-- | tools/Makefile | 1 |
7 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.org b/Makefile.org index fc1c90d2fa..d9d6267a4a 100644 --- a/Makefile.org +++ b/Makefile.org @@ -377,7 +377,7 @@ gentests: $(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on generate ); dclean: - rm -f *.bak + 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 eca57d2a3c..e9898fc564 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -137,6 +137,7 @@ 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 lib tags core .pure .nfs* *.old *.bak fluff $(EXE) diff --git a/crypto/Makefile b/crypto/Makefile index b6e3f9424b..ef4f724f16 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -135,6 +135,7 @@ clean: 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/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c index c5edaec4a0..ceeda005f5 100644 --- a/crypto/dso/dso_dlfcn.c +++ b/crypto/dso/dso_dlfcn.c @@ -422,6 +422,7 @@ static int dladdr(void *address, Dl_info *dl) static int dlfcn_pathbyaddr(void *addr,char *path,int sz) { +#ifdef HAVE_DLINFO Dl_info dli; int len; @@ -443,6 +444,7 @@ static int dlfcn_pathbyaddr(void *addr,char *path,int sz) } ERR_add_error_data(4, "dlfcn_pathbyaddr(): ", dlerror()); +#endif return -1; } diff --git a/crypto/md4/Makefile b/crypto/md4/Makefile index ef97bb0cbe..c94a1398ed 100644 --- a/crypto/md4/Makefile +++ b/crypto/md4/Makefile @@ -69,6 +69,7 @@ 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/test/Makefile b/test/Makefile index 088d0bc126..398de38f99 100644 --- a/test/Makefile +++ b/test/Makefile @@ -306,9 +306,11 @@ depend: dclean: $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) + rm -f $(SRC) $(SHA256TEST).c $(SHA512TEST).c evptests.txt newkey.pem testkey.pem \ + testreq.pem clean: - rm -f .rnd tmp.bntest tmp.bctest *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log + rm -f .rnd tmp.bntest tmp.bctest *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log dummytest $(DLIBSSL): (cd ..; $(MAKE) DIRS=ssl all) diff --git a/tools/Makefile b/tools/Makefile index 4ca835c4af..bb6fb71f3e 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -49,6 +49,7 @@ 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 |