Fixes to build system to cleanly handle fipsdso

This commit is contained in:
Dr. Stephen Henson 2007-01-25 21:29:07 +00:00
parent 9c823a2ab4
commit 613f1c7e91
2 changed files with 2 additions and 2 deletions

View File

@ -137,7 +137,7 @@ lib: $(FIPSCANLOC) delexobj
@touch lib
shared: fips_premain_dso$(EXE_EXT)
if [ -n "$(SHARED_LIBS)" ]; then \
if [ -n "$(SHARED_LIBS)" -a "$(FIPSCANLIB)" != "libfips" ]; then \
(cd ..; $(MAKE) FIPSLD_CC=$(CC) FIPSLD=fips-1.0/fipsld $(SHARED_LIB)); \
fi

View File

@ -64,7 +64,7 @@ case "${TARGET}" in
esac
case "${TARGET}" in
*${FIPCANLIB}*|*.dll) # must be linking a shared lib...
*${FIPSCANLIB}*|*.dll) # must be linking a shared lib...
# Shared lib creation can be taking place in the source
# directory only!!!
FINGERTYPE="${THERE}/fips-1.0/sha/fips_standalone_sha1"