In the unified scheme, there is no $(TOP), use $(SRCDIR) instead

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-18 00:27:04 +01:00
parent 29d0932721
commit 4418e0302f
3 changed files with 6 additions and 6 deletions

View File

@ -71,9 +71,9 @@ BEGINRAW[Makefile]
# GNU assembler fails to compile PA-RISC2 modules, insist on calling
# vendor assembler...
{- $builddir -}/pa-risc2W.o: {- $sourcedir -}/asm/pa-risc2W.s
CC="$(CC)" $(PERL) $(TOP)/util/fipsas.pl $(TOP) $< /usr/ccs/bin/as -o pa-risc2W.o {- $sourcedir -}/asm/pa-risc2W.s
CC="$(CC)" $(PERL) $(SRCDIR)/util/fipsas.pl $(SRCDIR) $< /usr/ccs/bin/as -o pa-risc2W.o {- $sourcedir -}/asm/pa-risc2W.s
{- $builddir -}/pa-risc2.o: {- $sourcedir -}/asm/pa-risc2.s
CC="$(CC)" $(PERL) $(TOP)/util/fipsas.pl $(TOP) $< /usr/ccs/bin/as -o pa-risc2.o {- $sourcedir -}/asm/pa-risc2.s
CC="$(CC)" $(PERL) $(SRCDIR)/util/fipsas.pl $(SRCDIR) $< /usr/ccs/bin/as -o pa-risc2.o {- $sourcedir -}/asm/pa-risc2.s
{- $builddir -}/parisc-mont.s: {- $sourcedir -}/asm/parisc-mont.pl
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/parisc-mont.pl $(PERLASM_SCHEME) $@

View File

@ -22,13 +22,13 @@ crypto/buildinf.h : Makefile
##### APPLINK, UPLINK and CPUID assembler implementations
{- $builddir -}/applink.o: $(SRCDIR)/ms/applink.c
$(CC) $(CFLAGS) -c -o $@ $(TOP)/ms/applink.c
$(CC) $(CFLAGS) -c -o $@ $(SRCDIR)/ms/applink.c
{- $builddir -}/uplink.o: $(SRCDIR)/ms/uplink.c {- $builddir -}/applink.o
$(CC) $(CFLAGS) -c -o $@ $(TOP)/ms/uplink.c
$(CC) $(CFLAGS) -c -o $@ $(SRCDIR)/ms/uplink.c
{- $builddir -}/uplink-x86.s: $(SRCDIR)/ms/uplink-x86.pl
CC="$(CC)" $(PERL) $(TOP)/ms/uplink-x86.pl $(PERLASM_SCHEME) > $@
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) > $@

View File

@ -18,7 +18,7 @@ BEGINRAW[Makefile]
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rc4-parisc.pl $(PERLASM_SCHEME) $@
{- $builddir -}/rc4-ia64.s: rc4-ia64.S
@case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \
@case `awk '/^#define RC4_INT/{print$$NF}' $(SRCDIR)/include/openssl/opensslconf.h` in \
int) set -x; $(CC) $(CFLAGS) -DSZ=4 -E rc4-ia64.S > $@ ;; \
char) set -x; $(CC) $(CFLAGS) -DSZ=1 -E rc4-ia64.S > $@ ;; \
*) exit 1 ;; \