Remove duplication and have clean depend on libclean

diff --git a/Makefile.org b/Makefile.org
index 1baf7e8b44de1e704c0d797e20b62905f6bc613e..3956dfccea8db128e2e76e29fe546e07861df190 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -314,10 +314,10 @@ Makefile.ssl: Makefile.org
        @false
 
 libclean:
-       rm -f *.so *.so.* engines/*.so *.a */lib */*/lib
+       rm -f *.map *.so *.so.* engines/*.so *.a */lib */*/lib
 
-clean:
-       rm -f shlib/*.o *.o core a.out fluff *.map 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
        @for i in $(DIRS) ;\
        do \
        if [ -d "$$i" ]; then \
@@ -327,7 +327,7 @@ clean:
        fi; \
        done;
        rm -f openssl.pc
-       rm -f *.a *.o speed.* *.map *.so .pure core
+       rm -f speed.* .pure
        rm -f $(TARFILE)
        @for i in $(ONEDIRS) ;\
        do \