From 6d02c53762faa7c450e642700f6109c85a4a6b06 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 8 Sep 2003 09:59:11 +0000 Subject: [PATCH] Use $(TOP) instead of ../.. as much as possible. --- fips/aes/Makefile.ssl | 16 ++++++++-------- fips/des/Makefile.ssl | 16 ++++++++-------- fips/dsa/Makefile.ssl | 16 ++++++++-------- fips/rand/Makefile.ssl | 8 ++++---- fips/sha1/Makefile.ssl | 16 ++++++++-------- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/fips/aes/Makefile.ssl b/fips/aes/Makefile.ssl index 2470059fa3..3ce47af76a 100644 --- a/fips/aes/Makefile.ssl +++ b/fips/aes/Makefile.ssl @@ -34,7 +34,7 @@ HEADER= $(EXHEADER) fips_aes_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) top: - (cd ../..; $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all) + (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all) all: check lib @@ -51,9 +51,9 @@ files: links: @$(TOP)/util/point.sh Makefile.ssl Makefile - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS) install: @for i in $(EXHEADER) ; \ @@ -68,11 +68,11 @@ tags: tests: top_fips_aesavs: - (cd ../..; $(MAKE) DIRS=fips FDIRS=$(DIR) TARGET=fips_aesavs sub_target) + (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) TARGET=fips_aesavs sub_target) -fips_aesavs: fips_aesavs.o ../../libcrypto.a - $(CC) $(CFLAGS) -o fips_aesavs fips_aesavs.o ../../libcrypto.a - $(TOP)/fips/openssl_fips_fingerprint ../../libcrypto.a fips_aesavs +fips_aesavs: fips_aesavs.o $(TOP)/libcrypto.a + $(CC) $(CFLAGS) -o fips_aesavs fips_aesavs.o $(TOP)/libcrypto.a + $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a fips_aesavs fips_test: top top_fips_aesavs find ../testvectors/aes/req -name '*.req' > testlist diff --git a/fips/des/Makefile.ssl b/fips/des/Makefile.ssl index b6cc96ca36..11e9de8059 100644 --- a/fips/des/Makefile.ssl +++ b/fips/des/Makefile.ssl @@ -34,7 +34,7 @@ HEADER= $(EXHEADER) fips_des_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) top: - (cd ../..; $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all) + (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all) all: check lib @@ -51,9 +51,9 @@ files: links: @$(TOP)/util/point.sh Makefile.ssl Makefile - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS) install: @for i in $(EXHEADER) ; \ @@ -68,11 +68,11 @@ tags: tests: top_fips_desmovs: - (cd ../..; $(MAKE) DIRS=fips FDIRS=$(DIR) TARGET=fips_desmovs sub_target) + (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) TARGET=fips_desmovs sub_target) -fips_desmovs: fips_desmovs.o ../../libcrypto.a - $(CC) $(CFLAGS) -o fips_desmovs fips_desmovs.o ../../libcrypto.a - $(TOP)/fips/openssl_fips_fingerprint ../../libcrypto.a fips_desmovs +fips_desmovs: fips_desmovs.o $(TOP)/libcrypto.a + $(CC) $(CFLAGS) -o fips_desmovs fips_desmovs.o $(TOP)/libcrypto.a + $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a fips_desmovs fips_test: top_fips_desmovs find ../testvectors/des/req -name '*.req' > testlist diff --git a/fips/dsa/Makefile.ssl b/fips/dsa/Makefile.ssl index de50533458..4b981fd5f4 100644 --- a/fips/dsa/Makefile.ssl +++ b/fips/dsa/Makefile.ssl @@ -34,7 +34,7 @@ HEADER= $(EXHEADER) ALL= $(GENERAL) $(SRC) $(HEADER) top: - (cd ../..; $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all) + (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all) all: check lib @@ -51,9 +51,9 @@ files: links: @$(TOP)/util/point.sh Makefile.ssl Makefile - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS) install: @for i in $(EXHEADER) ; \ @@ -68,11 +68,11 @@ tags: tests: top_fips_dssvs: - (cd ../..; $(MAKE) DIRS=fips FDIRS=$(DIR) TARGET=fips_dssvs sub_target) + (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) TARGET=fips_dssvs sub_target) -fips_dssvs: fips_dssvs.o ../../libcrypto.a - $(CC) $(CFLAGS) -o fips_dssvs fips_dssvs.o ../../libcrypto.a - $(TOP)/fips/openssl_fips_fingerprint ../../libcrypto.a fips_dssvs +fips_dssvs: fips_dssvs.o $(TOP)/libcrypto.a + $(CC) $(CFLAGS) -o fips_dssvs fips_dssvs.o $(TOP)/libcrypto.a + $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a fips_dssvs Q=../testvectors/dsa/req A=../testvectors/dsa/rsp diff --git a/fips/rand/Makefile.ssl b/fips/rand/Makefile.ssl index fa1dd04f16..7a81568d87 100644 --- a/fips/rand/Makefile.ssl +++ b/fips/rand/Makefile.ssl @@ -34,7 +34,7 @@ HEADER= $(EXHEADER) ALL= $(GENERAL) $(SRC) $(HEADER) top: - (cd ../..; $(MAKE) DIRS=fips SDIRS=$(DIR) sub_all) + (cd $(TOP); $(MAKE) DIRS=fips SDIRS=$(DIR) sub_all) all: check lib @@ -51,9 +51,9 @@ files: links: @$(TOP)/util/point.sh Makefile.ssl Makefile - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS) install: @for i in $(EXHEADER) ; \ diff --git a/fips/sha1/Makefile.ssl b/fips/sha1/Makefile.ssl index ed6f6c8420..8381e33592 100644 --- a/fips/sha1/Makefile.ssl +++ b/fips/sha1/Makefile.ssl @@ -35,7 +35,7 @@ HEADER= $(EXHEADER) fips_sha_locl.h fips_md32_common.h ALL= $(GENERAL) $(SRC) $(HEADER) top: - (cd ../..; $(MAKE) DIRS=fips SDIRS=$(DIR) sub_all) + (cd $(TOP); $(MAKE) DIRS=fips SDIRS=$(DIR) sub_all) all: check_standalone check lib @@ -59,9 +59,9 @@ files: links: @$(TOP)/util/point.sh Makefile.ssl Makefile - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS) install: @for i in $(EXHEADER) ; \ @@ -76,11 +76,11 @@ tags: tests: top_fips_sha1test: - (cd ../..; $(MAKE) DIRS=fips FDIRS=$(DIR) TARGET=fips_sha1test sub_target) + (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) TARGET=fips_sha1test sub_target) -fips_sha1test: fips_sha1test.o ../../libcrypto.a - $(CC) $(CFLAGS) -o fips_sha1test fips_sha1test.o ../../libcrypto.a - $(TOP)/fips/openssl_fips_fingerprint ../../libcrypto.a fips_sha1test +fips_sha1test: fips_sha1test.o $(TOP)/libcrypto.a + $(CC) $(CFLAGS) -o fips_sha1test fips_sha1test.o $(TOP)/libcrypto.a + $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a fips_sha1test fips_test: top_fips_sha1test -rm -rf ../testvectors/sha1/rsp -- 2.25.1