diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-09-20 10:18:19 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2014-09-20 10:22:13 +0200 |
| commit | dfb5de6fc0ff040212deb687d01e2f216edd88df (patch) | |
| tree | dca2c90ed307b4a54471e308ac1fdccd7ec88b6a | |
| parent | 5015a93dedd261c6be2cc8d12b4fa2c0d3eef65e (diff) | |
Harmonize Tru64 and Linux make rules.
RT: 3333,3165
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit d475b2a3bfde8d4aceefb41b21acc3711893d2a8)
| -rw-r--r-- | crypto/Makefile | 4 | ||||
| -rw-r--r-- | crypto/bn/Makefile | 4 | ||||
| -rw-r--r-- | crypto/modes/Makefile | 4 | ||||
| -rw-r--r-- | crypto/sha/Makefile | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index 4ace5bc43f..6167b7d568 100644 --- 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 af23cef92a..f1eb639aac 100644 --- 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 7327b51b9e..cbcbfad4b1 100644 --- 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 a7fac4683e..a8c0cf7850 100644 --- 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) > $@ |