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

Make Makefiles OSF-make-friendly. 

PR: 3165
(cherry picked from commit d1cf23ac)
parent 18f49508

crypto/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -77,7 +77,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

	$(PERL) $< | $(CC) -E - | tee $@ > /dev/null

	(preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \

	$(PERL) alphacpuid.pl > $$preproc && \

	$(CC) -E $$preproc > $@ && rm $$preproc)



testapps:

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

crypto/bn/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -135,7 +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

	$(PERL) $< | $(CC) -E - | tee $@ > /dev/null

	(preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \

	$(PERL) asm/alpha-mont.pl > $$preproc && \

	$(CC) -E $$preproc > $@ && rm $$preproc)



# GNU make "catch all"

%-mont.s:	asm/%-mont.pl;	$(PERL) $< $(PERLASM_SCHEME) $@

crypto/evp/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ files: 
links:

	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)

	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)

	[ ! -f $(TESTDATA) ] || cp $(TESTDATA) ../../test

	@[ -f $(TESTDATA) ] && cp $(TESTDATA) ../../test && echo "$(TESTDATA) -> ../../test/$(TESTDATA)"

	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)



install:

crypto/modes/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -55,7 +55,10 @@ 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

	$(PERL) $< | $(CC) -E - | tee $@ > /dev/null

	(preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \

	$(PERL) asm/ghash-alpha.pl > $$preproc && \

	$(CC) -E $$preproc > $@ && rm $$preproc)



ghash-parisc.s:	asm/ghash-parisc.pl

	$(PERL) asm/ghash-parisc.pl $(PERLASM_SCHEME) $@

crypto/sha/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -60,7 +60,9 @@ sha256-armv4.S: asm/sha256-armv4.pl 
	$(PERL) $< $(PERLASM_SCHEME) $@



sha1-alpha.s:	asm/sha1-alpha.pl

	$(PERL) $< | $(CC) -E - | tee $@ > /dev/null

	(preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \

	$(PERL) asm/sha1-alpha.pl > $$preproc && \

	$(CC) -E $$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) > $@