1 Do not create a fipscanister.o, add the objects directly.
2 diff -up openssl-0.9.8j/fips/Makefile.nocanister openssl-0.9.8j/fips/Makefile
3 --- openssl-0.9.8j/fips/Makefile.nocanister 2009-01-13 18:26:15.000000000 +0100
4 +++ openssl-0.9.8j/fips/Makefile 2009-01-13 21:43:43.000000000 +0100
5 @@ -142,8 +142,24 @@ lib: $(LIB)
6 if [ "$(FIPSCANISTERINTERNAL)" = "n" -a -n "$(FIPSCANLOC)" ]; then $(AR) ../$(FIPSCANLIB).a $(FIPSCANLOC); fi
9 -$(LIB): $(FIPSLIBDIR)fipscanister.o
10 - $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
11 +$(LIB): $(LIBOBJ) $(FIPS_OBJ_LISTS)
13 + list="$(BN_ASM)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/bn/$$i" ; done; \
14 + list="$(AES_ASM_OBJ)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/aes/$$i" ; done; \
15 + list="$(DES_ENC)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/des/$$i" ; done; \
16 + list="$(SHA1_ASM_OBJ)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/sha/$$i" ; done; \
17 + if [ -n "$(CPUID_OBJ)" ]; then \
18 + CPUID=../crypto/$(CPUID_OBJ) ; \
22 + objs="$(LIBOBJ) $(FIPS_EX_OBJ) $$CPUID $$FIPS_ASM"; \
23 + for i in $(FIPS_OBJ_LISTS); do \
24 + dir=`dirname $$i`; script="s|^|$$dir/|;s| | $$dir/|g"; \
25 + objs="$$objs `sed "$$script" $$i`"; \
29 $(RANLIB) $(LIB) || echo Never mind.
31 $(FIPSCANLIB): $(FIPSCANLOC)