Fix (most) WIN32 warnings and errors.

[openssl.git] / crypto / Makefile

diff --git a/crypto/Makefile b/crypto/Makefile
index 39f4b2d806d6ceafed2805c74301d26ac842b316..ef4f724f169869dbefd7723d14d381227ba0a85d 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -1,5 +1,5 @@
 #
-# SSLeay/crypto/Makefile
+# OpenSSL/crypto/Makefile
 #
 
 DIR=           crypto
@@ -7,7 +7,7 @@ TOP=            ..
 CC=            cc
 INCLUDE=       -I. -I$(TOP) -I../include
 # INCLUDES targets sudbirs!
-INCLUDES=      -I.. -I../.. -I../../include
+INCLUDES=      -I.. -I../.. -I../asn1 -I../evp -I../../include
 CFLAG=         -g
 MAKEDEPPROG=   makedepend
 MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
@@ -94,10 +94,12 @@ links:
        @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS)
        @target=links; $(RECURSIVE_MAKE)
 
-lib:   $(LIBOBJ)
+# lib: $(LIB): are splitted to avoid end-less loop
+lib:   $(LIB)
+       @touch lib
+$(LIB):        $(LIBOBJ)
        $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
-       @touch lib
 
 shared: buildinf.h lib subdirs
        if [ -n "$(SHARED_LIBS)" ]; then \
@@ -133,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.