Commit d475b2a3 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Harmonize Tru64 and Linux make rules. 



RT: 3333,3165
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 16e5b45f

crypto/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -87,9 +87,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)



subdirs:

	@target=all; $(RECURSIVE_MAKE)

crypto/bn/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -136,9 +136,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) $@

crypto/modes/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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

crypto/sha/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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) > $@