Commit 613f1c7e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fixes to build system to cleanly handle fipsdso

parent 9c823a2a

fips-1.0/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

fips-1.0/fipsld

+1 −1
Original line number Diff line number Diff line
@@ -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"