Commit e45b2a62 authored by Richard Levitte's avatar Richard Levitte
Browse files

Some ld implementations use LD_LIBRARY_PATH to find libraries, and

what's worse, they seem to use LD_LIBRARY_PATH as the first
directories to look into.  This is documented in the manual page for
ld on OpenUNIX 8.  Therefore, we need to hack LD_LIBRARY_PATH to
include the directory where the newly built libcrypto and libssl are.
parent 5d4bf96a
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ all: exe
exe:	$(PROGRAM)

req: sreq.o $(A_OBJ) $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o req $(CFLAG) sreq.o $(A_OBJ) $(RAND_OBJ) $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

sreq.o: req.c 
@@ -135,6 +136,7 @@ $(DLIBCRYPTO):

$(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
	$(RM) $(PROGRAM)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)
	-(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; $(PERL) tools/c_rehash certs)

+24 −0
Original line number Diff line number Diff line
@@ -253,75 +253,99 @@ $(DLIBCRYPTO):
	(cd ..; $(MAKE) DIRS=crypto all)

$(RSATEST): $(RSATEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(RSATEST) $(CFLAGS) $(RSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(BNTEST): $(BNTEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(EXPTEST): $(EXPTEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(IDEATEST): $(IDEATEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(IDEATEST) $(CFLAGS) $(IDEATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(MD2TEST): $(MD2TEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(MD2TEST) $(CFLAGS) $(MD2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(SHATEST): $(SHATEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(SHATEST) $(CFLAGS) $(SHATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(SHA1TEST): $(SHA1TEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(SHA1TEST) $(CFLAGS) $(SHA1TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(RMDTEST): $(RMDTEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(RMDTEST) $(CFLAGS) $(RMDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(MDC2TEST): $(MDC2TEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(MDC2TEST) $(CFLAGS) $(MDC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(MD4TEST): $(MD4TEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(MD4TEST) $(CFLAGS) $(MD4TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(MD5TEST): $(MD5TEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(MD5TEST) $(CFLAGS) $(MD5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(HMACTEST): $(HMACTEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(RC2TEST): $(RC2TEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(RC2TEST) $(CFLAGS) $(RC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(BFTEST): $(BFTEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(BFTEST) $(CFLAGS) $(BFTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(CASTTEST): $(CASTTEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(CASTTEST) $(CFLAGS) $(CASTTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(RC4TEST): $(RC4TEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(RC4TEST) $(CFLAGS) $(RC4TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(RC5TEST): $(RC5TEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(RC5TEST) $(CFLAGS) $(RC5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(DESTEST): $(DESTEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(RANDTEST): $(RANDTEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(RANDTEST) $(CFLAGS) $(RANDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(DHTEST): $(DHTEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(DHTEST) $(CFLAGS) $(DHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(DSATEST): $(DSATEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(DSATEST) $(CFLAGS) $(DSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(METHTEST): $(METHTEST).o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

$(SSLTEST): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)

dummytest: dummytest.o $(DLIBCRYPTO)
	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
	$(CC) -o dummytest $(CFLAGS) dummytest.o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

# DO NOT DELETE THIS LINE -- make depend depends on it.