From 2be44edb14a4f1eb2493ac252d9ddb560ff99a88 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sat, 20 Jan 2007 18:49:05 +0000 Subject: Link fips utilities only against fipscanister.o --- test/Makefile | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/test/Makefile b/test/Makefile index 189d14ed49..317df837fe 100644 --- a/test/Makefile +++ b/test/Makefile @@ -336,8 +336,22 @@ BUILD_CMD=SHARED_LIBS="$(SHARED_LIBS)"; \ $(CC) -o $$target$(EXE_EXT) $(CFLAGS) $$target.o $(PEX_LIBS) $(LIBSSL) $(LIBKRB5) $(LIBCRYPTO) $(EX_LIBS) ; \ fi +STANDALONE_BUILD_CMD=SHARED_LIBS="$(SHARED_LIBS)"; \ + if [ "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \ + SHARED_LIBS=""; \ + fi; \ + if [ -z "$$SHARED_LIBS" ]; then \ + set -x; $${CC:-$(CC)} -o $$target$(EXE_EXT) $(CFLAGS) $$target.o $(PEX_LIBS) $(LIBKRB5) $(EX_LIBS) ; \ + else set -x; LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \ + $(CC) -o $$target$(EXE_EXT) $(CFLAGS) $$target.o $(PEX_LIBS) $(LIBKRB5) $(EX_LIBS) ; \ + fi + FIPS_BUILD_CMD=if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ FIPSLD_CC=$(CC); CC=$(TOP)/fips-1.0/fipsld; export CC FIPSLD_CC; \ + fi; $(STANDALONE_BUILD_CMD) + +FIPS_CRYPTO_BUILD_CMD=if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ + FIPSLD_CC=$(CC); CC=$(TOP)/fips-1.0/fipsld; export CC FIPSLD_CC; \ fi; $(BUILD_CMD) $(FIPS_AESTEST)$(EXE_EXT): $(FIPS_AESTEST).o $(DLIBCRYPTO) @@ -446,7 +460,7 @@ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO) @target=$(METHTEST); $(BUILD_CMD) $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) - @target=$(SSLTEST); $(FIPS_BUILD_CMD) + @target=$(SSLTEST); $(FIPS_CRYPTO_BUILD_CMD) $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO) @target=$(ENGINETEST); $(BUILD_CMD) -- cgit v1.2.3