Update make rules for x86_64 assembler pack.

[openssl.git] / crypto / Makefile

diff --git a/crypto/Makefile b/crypto/Makefile
index ef4f724f169869dbefd7723d14d381227ba0a85d..98b2f839396980e004549f4a89f6cbd52fca68b2 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -26,6 +26,7 @@ EX_LIBS=
 CFLAGS= $(INCLUDE) $(CFLAG)
 ASFLAGS= $(INCLUDE) $(ASFLAG)
 AFLAGS=$(ASFLAGS)
 CFLAGS= $(INCLUDE) $(CFLAG)
 ASFLAGS= $(INCLUDE) $(ASFLAG)
 AFLAGS=$(ASFLAGS)

+CPUID_OBJ=mem_clr.o

 
 LIBS=
 
 
 LIBS=
 


@@ -34,7 +35,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
 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)
 
 
 SRC= $(LIBSRC)
 


@@ -57,23 +58,23 @@ buildinf.h: ../Makefile
        echo "  #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
        echo '#endif' ) >buildinf.h
 
        echo "  #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
        echo '#endif' ) >buildinf.h
 

-x86cpuid-elf.s:        x86cpuid.pl perlasm/x86asm.pl
-       $(PERL) x86cpuid.pl elf $(CFLAGS) $(PROCESSOR) > $@
-x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl
-       $(PERL) x86cpuid.pl coff $(CFLAGS) $(PROCESSOR) > $@
-x86cpuid-out.s: x86cpuid.pl perlasm/x86asm.pl
-       $(PERL) x86cpuid.pl a.out $(CFLAGS) $(PROCESSOR) > $@
+x86cpuid.s:    x86cpuid.pl perlasm/x86asm.pl
+       $(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(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
 
 x86_64cpuid.s: x86_64cpuid.pl

-       $(PERL) x86_64cpuid.pl $@
+       $(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@

 ia64cpuid.s: ia64cpuid.S
        $(CC) $(CFLAGS) -E ia64cpuid.S > $@
 ia64cpuid.s: ia64cpuid.S
        $(CC) $(CFLAGS) -E ia64cpuid.S > $@

+ppccpuid.s:            ppccpuid.pl;    $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@

 
 testapps:
        [ -z "$(THIS)" ] || (   if echo ${SDIRS} | fgrep ' des '; \
 
 testapps:
        [ -z "$(THIS)" ] || (   if echo ${SDIRS} | fgrep ' des '; \