Make ppccpuid AIX friendly.

[openssl.git] / crypto / Makefile

diff --git a/crypto/Makefile b/crypto/Makefile
index c9e90d39311fec6119b3f344ff021bb0a81f3b0d..e5b5b0781b1f9f6dc0f5ab4894669fa692a978af 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../../include
+INCLUDES=      -I.. -I../.. -I../asn1 -I../evp -I../../include
 CFLAG=         -g
 MAKEDEPPROG=   makedepend
 MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
@@ -34,7 +34,7 @@ GENERAL=Makefile README crypto-lib.com install.com
 LIB= $(TOP)/libcrypto.a
 SHARED_LIB= libcrypto$(SHLIB_EXT)
 LIBSRC=        cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c ebcdic.c uid.c o_time.c o_str.c o_dir.c
-LIBOBJ= cryptlib.o mem.o mem_clr.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o $(CPUID_OBJ)
+LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o $(CPUID_OBJ)
 
 SRC= $(LIBSRC)
 
@@ -64,16 +64,22 @@ 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 $@
 ia64cpuid.s: ia64cpuid.S
        $(CC) $(CFLAGS) -E ia64cpuid.S > $@
+ppccpuid_%.s:          ppccpuid.pl;    $(PERL) $< $@
+ppccpuid_aix32.s:      ppccpuid.pl;    $(PERL) ppccpuid.pl $@
+ppccpuid_aix64.s:      ppccpuid.pl;    $(PERL) ppccpuid.pl $@
 
 testapps:
        [ -z "$(THIS)" ] || (   if echo ${SDIRS} | fgrep ' des '; \
@@ -135,6 +141,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.