Windows build system: get uplink right.

[openssl.git] / crypto / build.info

diff --git a/crypto/build.info b/crypto/build.info
index a3ea7f0e0dd0b81943af0d133c89e383fd534a0d..217dc62430df3fc5648db20f2f08e2d0d308cc60 100644 (file)
--- a/crypto/build.info
+++ b/crypto/build.info
@@ -2,45 +2,32 @@
 LIBS=../libcrypto
 SOURCE[../libcrypto]=\
         cryptlib.c mem.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 thr_id.c lock.c \
-        o_init.c o_fips.c mem_sec.c init.c {- $target{cpuid_asm_src} -}
+        ebcdic.c uid.c o_time.c o_str.c o_dir.c \
+        threads_pthread.c threads_win.c threads_none.c \
+        o_init.c o_fips.c mem_sec.c init.c {- $target{cpuid_asm_src} -} \
+        {- $target{uplink_aux_src} -}
 EXTRA=  ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \
         x86cpuid.pl x86_64cpuid.pl ia64cpuid.S \
         ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl
 
 DEPEND[cversion.o]=buildinf.h
+GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(CFLAGS_Q)" "$(PLATFORM)"
+DEPEND[buildinf.h]=../configdata.pm
 
-BEGINRAW[descrip.mms]
-[.crypto]buildinf.h : configdata.pm
-       $(PERL) {- catfile(catdir($sourcedir, "[-]"), "util", "mkbuildinf.pl") -} "$(CC) $(CFLAGS)" "$(PLATFORM)" > [.crypto]buildinf.h
-ENDRAW[descrip.mms]
+GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME)
+GENERATE[uplink-x86_64.s]=../ms/uplink-x86_64.pl $(PERLASM_SCHEME)
+GENERATE[uplink-ia64.s]=../ms/uplink-ia64.pl $(PERLASM_SCHEME)
 
-BEGINRAW[Makefile]
-crypto/buildinf.h : configdata.pm
-       $(PERL) $(SRCDIR)/util/mkbuildinf.pl "$(CC) $(CFLAGS_Q)" "$(PLATFORM)" > crypto/buildinf.h
+GENERATE[x86cpuid.s]=x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)
+DEPEND[x86cpuid.s]=perlasm/x86asm.pl
 
-##### APPLINK, UPLINK and CPUID assembler implementations
+GENERATE[x86_64cpuid.s]=x86_64cpuid.pl $(PERLASM_SCHEME)
 
-{- $builddir -}/uplink-x86.s:  $(SRCDIR)/ms/uplink-x86.pl
-       CC="$(CC)" $(PERL) $(SRCDIR)/ms/uplink-x86.pl $(PERLASM_SCHEME) > $@
-
-{- $builddir -}/x86cpuid.s:    {- $sourcedir -}/x86cpuid.pl {- $sourcedir -}/perlasm/x86asm.pl
-       CC="$(CC)" $(PERL) {- $sourcedir -}/x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
-
-{- $builddir -}/x86_64cpuid.s: {- $sourcedir -}/x86_64cpuid.pl
-       CC="$(CC)" $(PERL) {- $sourcedir -}/x86_64cpuid.pl $(PERLASM_SCHEME) > $@
-{- $builddir -}/ia64cpuid.s:   {- $sourcedir -}/ia64cpuid.S
-       $(CC) $(CFLAGS) -E {- $sourcedir -}/ia64cpuid.S > $@
-{- $builddir -}/ppccpuid.s:    {- $sourcedir -}/ppccpuid.pl
-       CC="$(CC)" $(PERL) {- $sourcedir -}/ppccpuid.pl $(PERLASM_SCHEME) $@
-{- $builddir -}/pariscid.s:    {- $sourcedir -}/pariscid.pl
-       CC="$(CC)" $(PERL) {- $sourcedir -}/pariscid.pl $(PERLASM_SCHEME) $@
-{- $builddir -}/alphacpuid.s:  {- $sourcedir -}/alphacpuid.pl
-       (preproc=$$$$.$@.S; trap "rm $$preproc" INT; \
-       CC="$(CC)" $(PERL) {- $sourcedir -}/alphacpuid.pl > $$preproc && \
-       $(CC) -E -P $$preproc > $@ && rm $$preproc)
-{- $builddir -}/arm64cpuid.S:  {- $sourcedir -}/arm64cpuid.pl
-       CC="$(CC)" $(PERL) {- $sourcedir -}/arm64cpuid.pl $(PERLASM_SCHEME) > $@
-{- $builddir -}/armv4cpuid.S:  {- $sourcedir -}/armv4cpuid.pl
-       CC="$(CC)" $(PERL) {- $sourcedir -}/armv4cpuid.pl $(PERLASM_SCHEME) > $@
-ENDRAW[Makefile]
+GENERATE[ia64cpuid.s]=ia64cpuid.S
+GENERATE[ppccpuid.s]=ppccpuid.pl $(PERLASM_SCHEME)
+GENERATE[pariscid.s]=pariscid.pl $(PERLASM_SCHEME)
+GENERATE[alphacpuid.s]=alphacpuid.pl
+GENERATE[arm64cpuid.S]=arm64cpuid.pl $(PERLASM_SCHEME)
+INCLUDE[arm64cpuid.o]=.
+GENERATE[armv4cpuid.S]=armv4cpuid.pl $(PERLASM_SCHEME)
+INCLUDE[armv4cpuid.o]=.