use tabs for indentation, not spaces

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 847bcebad177edb583b2a775668462eb5aed1657..3956dfccea8db128e2e76e29fe546e07861df190 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -167,6 +167,7 @@ RMD160_ASM_OBJ= asm/rm86-out.o
 
 # KRB5 stuff
 KRB5_INCLUDES=
+LIBKRB5=
 
 DIRS=   crypto ssl engines apps test tools
 SHLIBDIRS= crypto ssl
@@ -280,6 +281,9 @@ build-shared: do_$(SHLIB_TARGET) link-shared
 
 do_$(SHLIB_TARGET):
        @ libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
+               if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
+                       libs="$(LIBKRB5) $$libs"; \
+               fi; \
                $(NEWMAKE) -f Makefile.shared \
                        CC="$(CC)" LDFLAGS="$(LDFLAGS)" \
                        SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
@@ -288,7 +292,7 @@ do_$(SHLIB_TARGET):
                        LIBDEPS="$$libs $(EX_LIBS)" \
                        LIBRPATH="$(INSTALLTOP)/lib" \
                        link_a.$(SHLIB_TARGET); \
-               libs="$$libs -l$$i"; \
+               libs="-l$$i $$libs"; \
        done
 
 openssl.pc: Makefile.ssl
@@ -310,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 \
@@ -323,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 \