Fix all the broken RPATH stuff we said we'd fix "some day".

svn path=/configure; revision=3615

2 files changed, 35 insertions, 30 deletions

diff --git a/openssl/tests/Makefile b/openssl/tests/Makefile
deleted file mode 100644
index 4e38c699..00000000
--- a/openssl/tests/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id$
-
-OPENSSL_DIR = ../openssl
-
-CFLAGS = -g -I${OPENSSL_DIR}/include
-
-# -H -Wl,-t
-
-BIN = resource-set-test
-OBJ = resource-set-test.o
-LIB = ${OPENSSL_DIR}/libcrypto.a
-
-all: ${BIN}
-
-clean:
-	rm -f ${BIN} ${OBJ}
-
-${BIN}: ${OBJ} ${LIB} Makefile
-	${CC} -g -o $@ ${OBJ} ${LIB}
-
-# This test needs more work
-
-test: ${BIN} test.cer
-	./${BIN} -v -a AS:17 -i IPv4:10.0.0.44 -d test.cer
-
-test.cer: test.conf
-	${OPENSSL_DIR}/apps/openssl req -new -x509 -config test.conf -keyout test.key -out test.cer -outform DER
-
-distclean: clean
-	rm -f test.key test.cer
diff --git a/openssl/tests/Makefile.in b/openssl/tests/Makefile.in
new file mode 100644
index 00000000..42a3cd74
--- /dev/null
+++ b/openssl/tests/Makefile.in
@@ -0,0 +1,35 @@
+# $Id$
+
+NAME = resource-set-test
+
+BIN = ${NAME}
+SRC = ${NAME}.c
+OBJ = ${NAME}.o
+
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+
+abs_top_srcdir	 = @abs_top_srcdir@
+abs_top_builddir = @abs_top_builddir@
+
+OPENSSL	= ${abs_top_builddir}/openssl/openssl/apps/openssl
+
+all: ${BIN}
+
+clean:
+	rm -f ${BIN} ${OBJ}
+
+${BIN}: ${SRC}
+	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
+
+# This test needs more work
+
+test: ${BIN} test.cer
+	./${BIN} -v -a AS:17 -i IPv4:10.0.0.44 -d test.cer
+
+test.cer: test.conf
+	${OPENSSL} req -new -x509 -config test.conf -keyout test.key -out test.cer -outform DER
+
+distclean: clean
+	rm -f test.key test.cer