Further mingw build procedure updates.

[openssl.git] / crypto / Makefile

diff --git a/crypto/Makefile b/crypto/Makefile
index 7c55d5933b4ab08f32a8cf24da3ed9de1edb081c..efe6a79d87c35befbad8a997750e58b76b498dbc 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -7,7 +7,7 @@ TOP=            ..
 CC=            cc
 INCLUDE=       -I. -I$(TOP) -I../include
 # INCLUDES targets sudbirs!
-INCLUDES=      -I.. -I../.. -I../asn1 -I../../include
+INCLUDES=      -I.. -I../.. -I../asn1 -I../evp -I../../include
 CFLAG=         -g
 MAKEDEPPROG=   makedepend
 MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
@@ -64,11 +64,14 @@ x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl
 x86cpuid-out.s: x86cpuid.pl perlasm/x86asm.pl
        $(PERL) x86cpuid.pl a.out $(CFLAGS) $(PROCESSOR) > $@
 
-uplink.o:      ../ms/uplink.c
-       $(CC) $(CFLAGS) -c -o $@ ../ms/uplink.c
+applink.o:     $(TOP)/ms/applink.c
+       $(CC) $(CFLAGS) -c -o $@ $(TOP)/ms/applink.c
 
-uplink-cof.s:  ../ms/uplink.pl
-       $(PERL) ../ms/uplink.pl coff > $@
+uplink.o:      $(TOP)/ms/uplink.c applink.o
+       $(CC) $(CFLAGS) -c -o $@ $(TOP)/ms/uplink.c
+
+uplink-cof.s:  $(TOP)/ms/uplink.pl
+       $(PERL) $(TOP)/ms/uplink.pl coff > $@
 
 x86_64cpuid.s: x86_64cpuid.pl
        $(PERL) x86_64cpuid.pl $@
@@ -135,6 +138,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.