Harmonize Tru64 and Linux make rules.

RT: 3333,3165
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit d475b2a3bfde8d4aceefb41b21acc3711893d2a8)

diff --git a/crypto/Makefile b/crypto/Makefile
index 4ace5bc43f5f2dd654de0241886aed6b39adadd0..6167b7d568a591e8897537c3c7d7a0bb3a635650 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -78,9 +78,9 @@ ia64cpuid.s: ia64cpuid.S;     $(CC) $(CFLAGS) -E ia64cpuid.S > $@
 ppccpuid.s:    ppccpuid.pl;    $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
 pariscid.s:    pariscid.pl;    $(PERL) pariscid.pl $(PERLASM_SCHEME) $@
 alphacpuid.s:  alphacpuid.pl
-       (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+       (preproc=$$$$.$@.S; trap "rm $$preproc" INT; \
        $(PERL) alphacpuid.pl > $$preproc && \
-       $(CC) -E $$preproc > $@ && rm $$preproc)
+       $(CC) -E -P $$preproc > $@ && rm $$preproc)
 
 testapps:
        [ -z "$(THIS)" ] || (   if echo $(SDIRS) | fgrep ' des '; \

diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index af23cef92ae361fd8c026decf4cec1ffda9aee5c..f1eb639aacda1f94f5dac74d23f8ff060754ded5 100644 (file)
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -135,9 +135,9 @@ ppc-mont.s: asm/ppc-mont.pl;$(PERL) asm/ppc-mont.pl $(PERLASM_SCHEME) $@
 ppc64-mont.s:  asm/ppc64-mont.pl;$(PERL) asm/ppc64-mont.pl $(PERLASM_SCHEME) $@
 
 alpha-mont.s:  asm/alpha-mont.pl
-       (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+       (preproc=$$$$.$@.S; trap "rm $$preproc" INT; \
        $(PERL) asm/alpha-mont.pl > $$preproc && \
-       $(CC) -E $$preproc > $@ && rm $$preproc)
+       $(CC) -E -P $$preproc > $@ && rm $$preproc)
 
 # GNU make "catch all"
 %-mont.S:      asm/%-mont.pl;  $(PERL) $< $(PERLASM_SCHEME) $@

diff --git a/crypto/modes/Makefile b/crypto/modes/Makefile
index 7327b51b9e13a62d251dcf3d1613e2aaa6f14d76..cbcbfad4b117ca1ac40ba8b57dbecfffc0860ff8 100644 (file)
--- a/crypto/modes/Makefile
+++ b/crypto/modes/Makefile
@@ -55,9 +55,9 @@ aesni-gcm-x86_64.s:   asm/aesni-gcm-x86_64.pl
 ghash-sparcv9.s:       asm/ghash-sparcv9.pl
        $(PERL) asm/ghash-sparcv9.pl $@ $(CFLAGS)
 ghash-alpha.s: asm/ghash-alpha.pl
-       (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+       (preproc=$$$$.$@.S; trap "rm $$preproc" INT; \
        $(PERL) asm/ghash-alpha.pl > $$preproc && \
-       $(CC) -E $$preproc > $@ && rm $$preproc)
+       $(CC) -E -P $$preproc > $@ && rm $$preproc)
 ghash-parisc.s:        asm/ghash-parisc.pl
        $(PERL) asm/ghash-parisc.pl $(PERLASM_SCHEME) $@
 ghashv8-armx.S:        asm/ghashv8-armx.pl

diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile
index a7fac4683ea5ef25584ecf98e01a043d02eded02..a8c0cf78509d5852969eaca729d1177f8d61ff1c 100644 (file)
--- a/crypto/sha/Makefile
+++ b/crypto/sha/Makefile
@@ -60,9 +60,9 @@ sha256-armv4.S: asm/sha256-armv4.pl
        $(PERL) $< $(PERLASM_SCHEME) $@
 
 sha1-alpha.s:  asm/sha1-alpha.pl
-       (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+       (preproc=$$$$.$@.S; trap "rm $$preproc" INT; \
        $(PERL) asm/sha1-alpha.pl > $$preproc && \
-       $(CC) -E $$preproc > $@ && rm $$preproc)
+       $(CC) -E -P $$preproc > $@ && rm $$preproc)
 
 # Solaris make has to be explicitly told
 sha1-x86_64.s: asm/sha1-x86_64.pl;     $(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@