Remove fipscanister build functionality from makefiles.

Reviewed-by: Tim Hudson <tjh@openssl.org>

diff --git a/Makefile.org b/Makefile.org
index 4a6b5ce8b8b1fdbfb05c4312d3697af140b68c4a..4a384991130eaedeef2ddc4509e543f39e8fe9ef 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -78,7 +78,7 @@ LIBDIR=lib
 # dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC
 # gcc, then the driver will automatically translate it to -xarch=v8plus
 # and pass it down to assembler.
-#AS=$(CC) -c
+AS=$(CC) -c
 ASFLAG=$(CFLAG)
 
 # For x86 assembler: Set PROCESSOR to 386 if you want to support
@@ -121,15 +121,9 @@ LIBZLIB=
 
 FIPSLIBDIR=/usr/local/ssl/$(LIBDIR)/
 
-# This is set to "y" if fipscanister.o is compiled internally as
-# opposed to coming from an external validated location.
-
-FIPSCANISTERINTERNAL=n
-
 # The location of the library which contains fipscanister.o
-# normally it will be libcrypto unless fipsdso is set in which
-# case it will be libfips. If not compiling in FIPS mode at all
-# this is empty making it a useful test for a FIPS compile.
+# normally it will be libcrypto. If not compiling in FIPS mode
+# at all this is empty making it a useful test for a FIPS compile.
 
 FIPSCANLIB=
 
@@ -207,7 +201,7 @@ CLEARENV=   TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}     \
 
 BUILDENV=      PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
                CC='$(CC)' CFLAG='$(CFLAG)'                     \
-               ASFLAG='$(CFLAG) -c'                    \
+               AS='$(CC)' ASFLAG='$(CFLAG) -c'                 \
                AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'        \
                CROSS_COMPILE='$(CROSS_COMPILE)'        \
                PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'             \
@@ -357,24 +351,10 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
 sub_all: build_all
 build_all: build_libs build_apps build_tests build_tools
 
-build_libs: build_crypto build_fips build_ssl build_engines
-
-build_fips:
-       @dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
+build_libs: build_crypto build_ssl build_engines
 
 build_crypto:
-       if [ -n "$(FIPSCANLIB)" ]; then \
-               EXCL_OBJ='$(AES_ENC) $(BN_ASM) $(EC_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(MODES_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \
-               ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \
-       else \
-               ARX='${AR}' ; \
-       fi ; export ARX ; \
-       if [ $(FIPSCANISTERINTERNAL) = "y" ]; then \
-               AS='$(PERL) $${TOP}/util/fipsas.pl $${TOP} $${<} $(CC) -c' ; \
-       else \
-               AS='$(CC) -c' ; \
-       fi ; export AS ; \
-               dir=crypto; target=all; $(BUILD_ONE_CMD)
+       @dir=crypto; target=all; $(BUILD_ONE_CMD)
 build_ssl:
        @dir=ssl; target=all; $(BUILD_ONE_CMD)
 build_engines:
@@ -390,7 +370,7 @@ all_testapps: build_libs build_testapps
 build_testapps:
        @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
 
-libcrypto$(SHLIB_EXT): libcrypto.a build_fips
+libcrypto$(SHLIB_EXT): libcrypto.a
        @if [ "$(SHLIB_TARGET)" != "" ]; then \
                if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
                        FIPSLD_CC="$(CC)"; CC=fips/fipsld; \

diff --git a/crypto/Makefile b/crypto/Makefile
index 526628a408925c2ac2cd14efaefac651cf6c4876..f43edad6f8ed4115b411bfcc9681203ca87912c9 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -109,7 +109,7 @@ links:
 lib:   $(LIB)
        @touch lib
 $(LIB):        $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
 
 shared: buildinf.h lib subdirs

diff --git a/crypto/aes/Makefile b/crypto/aes/Makefile
index cd218c9d980b399da94b7446cc184c40990f84fb..6cf7363845040ba5ea6f4c52d741eb9cea449186 100644 (file)
--- a/crypto/aes/Makefile
+++ b/crypto/aes/Makefile
@@ -41,7 +41,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile
index 9b1ac16f17851603babd5735baef02ae02c877ad..4ea6fb80ff4185fdd0d5f478e5e9b967ef2591d1 100644 (file)
--- a/crypto/asn1/Makefile
+++ b/crypto/asn1/Makefile
@@ -67,7 +67,7 @@ pk:   pk.c
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/bf/Makefile b/crypto/bf/Makefile
index 1eaa8212c71aa12d34ba30068350bc6ee57a0574..dd2c2c708e63fd1295e081d1b5797bfb10895f9a 100644 (file)
--- a/crypto/bf/Makefile
+++ b/crypto/bf/Makefile
@@ -38,7 +38,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/bio/Makefile b/crypto/bio/Makefile
index d6ea26f3d333db6c75bc1981098a33c1edb28bfe..c395d804968166b8dc1eef168e4b014f122cae03 100644 (file)
--- a/crypto/bio/Makefile
+++ b/crypto/bio/Makefile
@@ -45,7 +45,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index e2fd6445b42118124d88f78b3fe1633649566f31..270af09c926fce3f6e7fd907ea6a26ebdeac4f8e 100644 (file)
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -56,7 +56,7 @@ bnbug: bnbug.c ../../libcrypto.a top
        cc -g -I../../include bnbug.c -o bnbug ../../libcrypto.a
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/buffer/Makefile b/crypto/buffer/Makefile
index 9e0f46e19ab0cb7bc80f3dcb9f2240f9ee1b6976..2efba47f07002c7552db21854b7d8e2e7a8a454f 100644 (file)
--- a/crypto/buffer/Makefile
+++ b/crypto/buffer/Makefile
@@ -33,7 +33,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/camellia/Makefile b/crypto/camellia/Makefile
index d39b55390edc458f6059a11787298cd6278c8a0f..5dfd696a9aa02abe4a51e392782d0fb2a8a01383 100644 (file)
--- a/crypto/camellia/Makefile
+++ b/crypto/camellia/Makefile
@@ -40,7 +40,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/cast/Makefile b/crypto/cast/Makefile
index cdffb8efc42aa897bf2e5141e2ee1c5f5e3c4843..0acc38f28d542497b626ff613d4cd45fb12286b0 100644 (file)
--- a/crypto/cast/Makefile
+++ b/crypto/cast/Makefile
@@ -38,7 +38,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/cmac/Makefile b/crypto/cmac/Makefile
index f6f9d5770bff1a8c4f0a8c2676f857d464c4c393..54e7cc39d52b923b4e1a6199882819839645f661 100644 (file)
--- a/crypto/cmac/Makefile
+++ b/crypto/cmac/Makefile
@@ -33,7 +33,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/cms/Makefile b/crypto/cms/Makefile
index 38eb3f7cf2349ed049c6be62f1c948830f6b0c3e..644fef399ee989270fae6d1e971722be28e4a273 100644 (file)
--- a/crypto/cms/Makefile
+++ b/crypto/cms/Makefile
@@ -39,7 +39,7 @@ test:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/comp/Makefile b/crypto/comp/Makefile
index 5d364b85133b5dd884b8300e1ba2feca32a96240..efda832dce47f3b22eaa8938e323dc34112d45dc 100644 (file)
--- a/crypto/comp/Makefile
+++ b/crypto/comp/Makefile
@@ -36,7 +36,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/conf/Makefile b/crypto/conf/Makefile
index c00e818853cd853483d906c75a068568d2055952..78bb3241065d869bd706e44991c92a129a76a298 100644 (file)
--- a/crypto/conf/Makefile
+++ b/crypto/conf/Makefile
@@ -36,7 +36,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/des/Makefile b/crypto/des/Makefile
index d9e55e992416a12e6ea899b93047d779c69d2236..4a63c1cca9a778a970ad14f84b569efb89c1d77b 100644 (file)
--- a/crypto/des/Makefile
+++ b/crypto/des/Makefile
@@ -52,7 +52,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/dh/Makefile b/crypto/dh/Makefile
index 70ae96a7840fdf1ad7ecf3f3f8b8d97d7b12c571..f447907820c1a67f8e07435efefc4cd234601dfa 100644 (file)
--- a/crypto/dh/Makefile
+++ b/crypto/dh/Makefile
@@ -35,7 +35,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/dsa/Makefile b/crypto/dsa/Makefile
index f64130bfa9020692bd0a707612f439264e540985..5fef4ca5adfc5382873c5bf2cc0e00b510b4a724 100644 (file)
--- a/crypto/dsa/Makefile
+++ b/crypto/dsa/Makefile
@@ -35,7 +35,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/dso/Makefile b/crypto/dso/Makefile
index e3df4c4d3d7ffdffdc452e67806cc93c1e5196bf..fb2709ed63a7601f5fe86ab6e6dec60c00abb7cb 100644 (file)
--- a/crypto/dso/Makefile
+++ b/crypto/dso/Makefile
@@ -35,7 +35,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/ec/Makefile b/crypto/ec/Makefile
index 898e43dc3795c3b2a79cf30490eab276860adb6e..0d9f3ab256a0af3d13e351c633316a1cc43b6f72 100644 (file)
--- a/crypto/ec/Makefile
+++ b/crypto/ec/Makefile
@@ -44,7 +44,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/ecdh/Makefile b/crypto/ecdh/Makefile
index 24b79f17f1303ab5ae299be85a093e9afd6ebacd..df1b03adb1dd056883a22eb1099bc44ef05bb5ba 100644 (file)
--- a/crypto/ecdh/Makefile
+++ b/crypto/ecdh/Makefile
@@ -34,7 +34,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/ecdsa/Makefile b/crypto/ecdsa/Makefile
index 5be880aebab3a656805cfff40a024defc77cb287..da08d2d27ea6e56c44ec312e6bed201b6b946db0 100644 (file)
--- a/crypto/ecdsa/Makefile
+++ b/crypto/ecdsa/Makefile
@@ -34,7 +34,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile
index 136df3ae0250643eac165b7f1884e1725b93929d..d39a45d77a5e2ce6bc2f774e7b5c1a95adf3974e 100644 (file)
--- a/crypto/engine/Makefile
+++ b/crypto/engine/Makefile
@@ -43,7 +43,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/err/Makefile b/crypto/err/Makefile
index 57bed2903203650f018032ce24e122b426711db7..862b23ba1768b63289cdaafb0e6452ea66a41a29 100644 (file)
--- a/crypto/err/Makefile
+++ b/crypto/err/Makefile
@@ -33,7 +33,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index 91bbaffdb7b0315b9adae5f183aa4a761faf5a22..7f44688262bcbae8fe2d9114846056a8d7b10c95 100644 (file)
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -57,7 +57,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/hmac/Makefile b/crypto/hmac/Makefile
index 1b39f10ea85fd14f898140eee378251a2be96fe7..0e91709f64ca31c45a6c5f3e99bb443ccc5899ab 100644 (file)
--- a/crypto/hmac/Makefile
+++ b/crypto/hmac/Makefile
@@ -33,7 +33,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/idea/Makefile b/crypto/idea/Makefile
index f35d38b19468295577733ecb0cbf33e3135981a1..b2e7add666affef555a9247ae9fda0f295fbee23 100644 (file)
--- a/crypto/idea/Makefile
+++ b/crypto/idea/Makefile
@@ -33,7 +33,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/jpake/Makefile b/crypto/jpake/Makefile
index 7eab6c1d27eb70197af40787db8316a1dd772b6e..a56d558ccb66f9532a40187f6cf249ddf5963fd7 100644 (file)
--- a/crypto/jpake/Makefile
+++ b/crypto/jpake/Makefile
@@ -17,7 +17,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/krb5/Makefile b/crypto/krb5/Makefile
index 8efb9e8910aad0086b622e3d8c8d952b86a00ad8..14077390d6923dfac00f407ae60ca2186d9fb4bb 100644 (file)
--- a/crypto/krb5/Makefile
+++ b/crypto/krb5/Makefile
@@ -34,7 +34,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/lhash/Makefile b/crypto/lhash/Makefile
index 35f0932971583339ed43a8d6cdf58781dab8b4c0..82bddac474503034f5572a93d03b851e929cd15b 100644 (file)
--- a/crypto/lhash/Makefile
+++ b/crypto/lhash/Makefile
@@ -33,7 +33,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/md2/Makefile b/crypto/md2/Makefile
index 7098ca607e50b6f9c77713086c850057d7b74c2d..17f878aeb7d464780d91cb7ff240d4987d4b7fed 100644 (file)
--- a/crypto/md2/Makefile
+++ b/crypto/md2/Makefile
@@ -33,7 +33,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/md4/Makefile b/crypto/md4/Makefile
index e32ef0e004f280b780eee3bd2a41a0c8f1c3db9c..fabc0affae1f524e01c276e7478fc95f22c202a9 100644 (file)
--- a/crypto/md4/Makefile
+++ b/crypto/md4/Makefile
@@ -34,7 +34,7 @@ top:
 all:    lib
 
 lib:    $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/md5/Makefile b/crypto/md5/Makefile
index 5b289213f593e2a4a856ca5296484bead1def264..5e9464f6dcdd02b2b7e3b16f85a50037847ed086 100644 (file)
--- a/crypto/md5/Makefile
+++ b/crypto/md5/Makefile
@@ -38,7 +38,7 @@ top:
 all:    lib
 
 lib:    $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/mdc2/Makefile b/crypto/mdc2/Makefile
index b71cc74153894a0ee3e4e9766d575b5200fa23b1..141553149d54706d623a3dae92c733d96e7cc6d6 100644 (file)
--- a/crypto/mdc2/Makefile
+++ b/crypto/mdc2/Makefile
@@ -33,7 +33,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/modes/Makefile b/crypto/modes/Makefile
index 66cbd8fe8dd0d5591a7fb94df52991a4ccb31f5f..658af0c296739141f2de25bfdc158258a6eb95c8 100644 (file)
--- a/crypto/modes/Makefile
+++ b/crypto/modes/Makefile
@@ -40,7 +40,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/objects/Makefile b/crypto/objects/Makefile
index 94fd7aae7c417f9b121feb0582064aa858f19884..a8aedbd422870c28d0e9f8a2ba5723d14a7f0451 100644 (file)
--- a/crypto/objects/Makefile
+++ b/crypto/objects/Makefile
@@ -34,7 +34,7 @@ top:
 all:   obj_dat.h obj_xref.h lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/ocsp/Makefile b/crypto/ocsp/Makefile
index b21ac3c9817916bc9cc67db5e6a1f3943e9ef1d4..60c414cf4da605735f4fc135acc96705a6ab20ca 100644 (file)
--- a/crypto/ocsp/Makefile
+++ b/crypto/ocsp/Makefile
@@ -36,7 +36,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/pem/Makefile b/crypto/pem/Makefile
index 6482956015086cbed17df6a5b3ce3eace7da0571..7691f83f6e1d402f7fc5d42adfe212f8ff9d05c6 100644 (file)
--- a/crypto/pem/Makefile
+++ b/crypto/pem/Makefile
@@ -36,7 +36,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/pkcs12/Makefile b/crypto/pkcs12/Makefile
index 5ace911690bfc6a8aa08661f6f2c7f52e20850b0..3a7498fe7ad99a11da2eaf3be46a137c26c30f53 100644 (file)
--- a/crypto/pkcs12/Makefile
+++ b/crypto/pkcs12/Makefile
@@ -39,7 +39,7 @@ test:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/pkcs7/Makefile b/crypto/pkcs7/Makefile
index d96b079a9c9869e5803247dbdc3b94dabe2f663d..effe05fc043d3c66e53fae942dbb1a6bce95e9c8 100644 (file)
--- a/crypto/pkcs7/Makefile
+++ b/crypto/pkcs7/Makefile
@@ -40,7 +40,7 @@ test:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/pqueue/Makefile b/crypto/pqueue/Makefile
index a9a5d95d63385dc5060eeb5097fbc5a681516f21..fb36a0c876e3c1605ab3b035cdca41a8de24de35 100644 (file)
--- a/crypto/pqueue/Makefile
+++ b/crypto/pqueue/Makefile
@@ -33,7 +33,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/rand/Makefile b/crypto/rand/Makefile
index 41c39644a74fd8e6d24e6f5cd3a5f14880b7af6d..27694aa66498935d1327697c9c8a0a3035891476 100644 (file)
--- a/crypto/rand/Makefile
+++ b/crypto/rand/Makefile
@@ -35,7 +35,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/rc2/Makefile b/crypto/rc2/Makefile
index b888c4c9bcafedad9a25c35b680c5ce78e9764b4..73eac347e7fdf96324a0c4cc0bd0a88750fb77c6 100644 (file)
--- a/crypto/rc2/Makefile
+++ b/crypto/rc2/Makefile
@@ -33,7 +33,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/rc4/Makefile b/crypto/rc4/Makefile
index e2bbaa66179f74655d67426ff6368fcee69a6115..f7be5f92a178c9c2cbef9402a6201a3ae3952942 100644 (file)
--- a/crypto/rc4/Makefile
+++ b/crypto/rc4/Makefile
@@ -37,7 +37,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/rc5/Makefile b/crypto/rc5/Makefile
index 95f3f4203ac0673ad52a7ca88b2a9bbf8e248705..8a8b00eb89e6038b912ff722dd8a56713e5f82e8 100644 (file)
--- a/crypto/rc5/Makefile
+++ b/crypto/rc5/Makefile
@@ -38,7 +38,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/ripemd/Makefile b/crypto/ripemd/Makefile
index 118ddf0d7bb6e172553a2ca42e41b949d3785055..d5b1067dbeb2aba9e774759940464f4e563f9613 100644 (file)
--- a/crypto/ripemd/Makefile
+++ b/crypto/ripemd/Makefile
@@ -38,7 +38,7 @@ top:
 all:    lib
 
 lib:    $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/rsa/Makefile b/crypto/rsa/Makefile
index ba0bb7a2da0b85bb8eb8575ad2a0f5041da04533..bcf753c4e74443ce0f6aba59ef7217ad4c07c353 100644 (file)
--- a/crypto/rsa/Makefile
+++ b/crypto/rsa/Makefile
@@ -39,7 +39,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/seed/Makefile b/crypto/seed/Makefile
index e0a9b8e8f6c0ba26a5d1d525a10a830a861f54e1..4bc55e4916491bdd3a0c80a9be27424a0091705f 100644 (file)
--- a/crypto/seed/Makefile
+++ b/crypto/seed/Makefile
@@ -34,7 +34,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile
index a868873503e8b29f9ec6262d3c303e6098719279..a8c0cf78509d5852969eaca729d1177f8d61ff1c 100644 (file)
--- a/crypto/sha/Makefile
+++ b/crypto/sha/Makefile
@@ -38,7 +38,7 @@ top:
 all:    lib
 
 lib:    $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/stack/Makefile b/crypto/stack/Makefile
index 489a77b93c43907c5d7ff2a935465297cc86f396..5327692ac895cef5a4ae6abb620cd43c01326b07 100644 (file)
--- a/crypto/stack/Makefile
+++ b/crypto/stack/Makefile
@@ -33,7 +33,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/store/Makefile b/crypto/store/Makefile
index 2d42517d162e7584ae93384682212111ecf70e9f..0dcfd7857a37713f2959dcbd366246deb2943698 100644 (file)
--- a/crypto/store/Makefile
+++ b/crypto/store/Makefile
@@ -35,7 +35,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/ts/Makefile b/crypto/ts/Makefile
index 8e62bbbfb34742a6ca547e661a31f13c555bfbbb..c18234555be300a4d89ca7c1d6ddfa8c8cb3325e 100644 (file)
--- a/crypto/ts/Makefile
+++ b/crypto/ts/Makefile
@@ -47,7 +47,7 @@ test:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/txt_db/Makefile b/crypto/txt_db/Makefile
index 87e57b49f646e60e75502d80132ebbcf4ce494cb..e6f30331d8dd2f72395e7a50a64c97f07bbd479e 100644 (file)
--- a/crypto/txt_db/Makefile
+++ b/crypto/txt_db/Makefile
@@ -33,7 +33,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/ui/Makefile b/crypto/ui/Makefile
index 4755e206f667d420ac09ef3ad8e48580a0b21508..a685659fb4c88466d0e1e384ca81edfe43bbe976 100644 (file)
--- a/crypto/ui/Makefile
+++ b/crypto/ui/Makefile
@@ -37,7 +37,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/whrlpool/Makefile b/crypto/whrlpool/Makefile
index 0f8f307ed769fae05e7de05ddf737aaad899db20..566b996290511e98111834ee811775dd8de1b43c 100644 (file)
--- a/crypto/whrlpool/Makefile
+++ b/crypto/whrlpool/Makefile
@@ -38,7 +38,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/x509/Makefile b/crypto/x509/Makefile
index 92f130fb762d0771b99cc40f9e54f3970ea227cc..f168b473e792bbc5050114bd2c9a5311ca6ebf96 100644 (file)
--- a/crypto/x509/Makefile
+++ b/crypto/x509/Makefile
@@ -43,7 +43,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 

diff --git a/crypto/x509v3/Makefile b/crypto/x509v3/Makefile
index f598f236e25af2ec21c06536e3bf4fe57a6bae1d..cdbfd524039215e8a1f15df8672afcbf12af2db2 100644 (file)
--- a/crypto/x509v3/Makefile
+++ b/crypto/x509v3/Makefile
@@ -43,7 +43,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib