projects / oweals / openssl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dac0d33)
Use $(TOP) instead of ../.. as much as possible.
authorRichard Levitte <levitte@openssl.org>
Mon, 8 Sep 2003 09:59:11 +0000 (09:59 +0000)
committerRichard Levitte <levitte@openssl.org>
Mon, 8 Sep 2003 09:59:11 +0000 (09:59 +0000)
fips/aes/Makefile.ssl patch | blob | history
fips/des/Makefile.ssl patch | blob | history
fips/dsa/Makefile.ssl patch | blob | history
fips/rand/Makefile.ssl patch | blob | history
fips/sha1/Makefile.ssl patch | blob | history

diff --git a/fips/aes/Makefile.ssl b/fips/aes/Makefile.ssl
index 2470059fa305f55782d79c2c5828569225c4be7b..3ce47af76a778e73efe0e1063fb169b4dcfb7d53 100644 (file)
--- 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 b6cc96ca3665f3a4437a85da1aaec199889907c8..11e9de80594a2fe99e394d16c731a354d16a89d4 100644 (file)
--- 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 de505334580fe708fa7332e6e4ce781d9f48bfb6..4b981fd5f424941bc9712525afa6092189747408 100644 (file)
--- 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 fa1dd04f1634840f9e6de147e80021fbe3a11297..7a81568d875571d11c61353b85fb340e48bca57c 100644 (file)
--- 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 ed6f6c84201dfeca9d02f4806d88aed734cc984e..8381e335926df2301eab3ef78fdc47bd97b86b64 100644 (file)
--- 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
Unnamed repository; edit this file 'description' to name the repository.