$NetBSD: patch-ab,v 1.1 1999/04/16 11:46:18 hubertf Exp $

--- shlib/Makefile.in.orig	Wed Apr 23 21:11:10 1997
+++ shlib/Makefile.in	Fri Apr 16 12:45:45 1999
@@ -11,7 +11,7 @@
 LIBS     	= @LIBS@
 SHLIB_CFLAGS 	= @SHLIB_CFLAGS@
 SHLIB_OFLAGS 	= @SHLIB_OFLAGS@
-SHLIB_LFLAGS 	= @SHLIB_LFLAGS@
+SHLIB_LFLAGS 	= @SHLIB_LFLAGS@ -R${PREFIX}/lib
 SHLIB_LIBS   	= @SHLIB_LIBS@
 PLUGIN_LIBS     = @PLUGIN_LIBS@
 SHLIB_LIB    	= @SHLIB_LIB@
@@ -63,25 +63,25 @@
 	(cd ..; CONFIG_FILES=shlib/runsocks CONFIG_HEADERS= ./config.status)
 
 libsocks5_sh.so: $(OBJS)
-	$(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(OBJS) $(LDFLAGS) $(SHLIB_LIBS) $(DLLIBS)
+	$(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(OBJS) $(SHLIB_LIBS) $(DLLIBS)
 
 libs5auth_u.so: $(AUTH_U_OBJS)
-	$(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(AUTH_U_OBJS) $(LDFLAGS) $(SHLIB_LIBS) $(DLLIBS)
+	$(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(AUTH_U_OBJS) $(SHLIB_LIBS) $(DLLIBS)
 
 libs5auth_k.so: $(AUTH_K_OBJS)
-	$(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(AUTH_K_OBJS) $(LDFLAGS) $(SHLIB_LIBS) $(DLLIBS)
+	$(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(AUTH_K_OBJS) $(SHLIB_LIBS) $(DLLIBS)
 
 libs5auth_c.so: $(AUTH_C_OBJS)
-	$(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(AUTH_C_OBJS) $(LDFLAGS) $(SHLIB_LIBS) $(DLLIBS)
+	$(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(AUTH_C_OBJS) $(SHLIB_LIBS) $(DLLIBS)
 
 libs5filter_p.so: $(FILTER_P_OBJS)
-	$(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(FILTER_P_OBJS) $(LDFLAGS) $(SHLIB_LIBS) $(DLLIBS)
+	$(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(FILTER_P_OBJS) $(SHLIB_LIBS) $(DLLIBS)
 
 install: Makefile $(SHLIB_LIB) runsocks
 	if [ -n "$(SHLIB_LIB)" -a -f "$(SHLIB_LIB)" ] ; then $(INSTALL) $(SHLIB_LIB) $(SHLIB_DIR) ; $(INSTALL) runsocks $(exec_prefix)/bin; fi
 
 clean:
-	-$(BINRM) *.o $(SHLIB_LIB) $(PLUGIN_LIBS) so_locations
+	-$(BINRM) *.o *.so $(SHLIB_LIB) $(PLUGIN_LIBS) so_locations
 
 distclean: clean
 	-$(BINRM) Makefile runsocks *~ #*# *.bak
@@ -92,70 +92,116 @@
 
 
 msg.o: $(srcdir)/../lib/msg.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/msg.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/msg.c -o msg.so
+	${LD} -x -r msg.so -o msg.o
+	rm -f msg.so
 
 protocol.o: $(srcdir)/../lib/protocol.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/protocol.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/protocol.c -o protocol.so
+	${LD} -x -r protocol.so -o protocol.o
+	rm -f protocol.so
 
 log.o: $(srcdir)/../lib/log.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/log.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/log.c -o log.so
+	${LD} -x -r log.so -o log.o
+	rm -f log.so
 
 hostname.o: $(srcdir)/../lib/hostname.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/hostname.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/hostname.c -o hostname.so
+	${LD} -x -r hostname.so -o hostname.o
+	rm -f hostname.so
 
 confutil.o: $(srcdir)/../lib/confutil.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/confutil.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/confutil.c -o confutil.so
+	${LD} -x -r confutil.so -o confutil.o
+	rm -f confutil.so
 
 buffer.o: $(srcdir)/../lib/buffer.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/buffer.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/buffer.c -o buffer.so
+	${LD} -x -r buffer.so -o buffer.o
+	rm -f buffer.so
 
 cache.o: $(srcdir)/../lib/cache.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/cache.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/cache.c -o cache.so
+	${LD} -x -r cache.so -o cache.o
+	rm -f cache.so
 
 wrap.o: $(srcdir)/../lib/wrap.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap.c -o wrap.so
+	${LD} -x -r wrap.so -o wrap.o
+	rm -f wrap.so
 
 wrap_tcp.o: $(srcdir)/../lib/wrap_tcp.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap_tcp.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap_tcp.c -o wrap_tcp.so
+	${LD} -x -r wrap_tcp.so -o wrap_tcp.o
+	rm -f wrap_tcp.so
 
 wrap_udp.o: $(srcdir)/../lib/wrap_udp.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap_udp.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap_udp.c -o wrap_udp.so
+	${LD} -x -r wrap_udp.so -o wrap_udp.o
+	rm -f wrap_udp.so
 
 conf.o: $(srcdir)/../lib/conf.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/conf.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/conf.c -o conf.so
+	${LD} -x -r conf.so -o conf.o
+	rm -f conf.so
 
 libproto.o: $(srcdir)/../lib/libproto.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/libproto.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/libproto.c -o libproto.so
+	${LD} -x -r libproto.so -o libproto.o
+	rm -f libproto.so
 
 select.o: $(srcdir)/../lib/select.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/select.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/select.c -o select.so
+	${LD} -x -r select.so -o select.o
+	rm -f select.so
 
 rld.o: $(srcdir)/../lib/rld.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/rld.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/rld.c -o rld.so
+	${LD} -x -r rld.so -o rld.o
+	rm -f rld.so
 
 null.o: $(srcdir)/../lib/null.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/null.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/null.c -o null.so
+	${LD} -x -r null.so -o null.o
+	rm -f null.so
 
 addr.o: $(srcdir)/../lib/addr.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/addr.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/addr.c -o addr.so
+	${LD} -x -r addr.so -o addr.o
+	rm -f addr.so
 
 shim.o: $(srcdir)/../lib/shim.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/shim.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/shim.c -o shim.so
+	${LD} -x -r shim.so -o shim.o
+	rm -f shim.so
 
 dpin.o: $(srcdir)/../lib/dpin.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/dpin.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/dpin.c -o dpin.so
+	${LD} -x -r dpin.so -o dpin.o
+	rm -f dpin.so
 
 dpinutil.o: $(srcdir)/../lib/dpinutil.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/dpinutil.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/dpinutil.c -o dpinutil.so
+	${LD} -x -r dpinutil.so -o dpinutil.o
+	rm -f dpinutil.so
 
 upwd.o: $(srcdir)/../lib/upwd.c
-	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/upwd.c
+	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/upwd.c -o upwd.so
+	${LD} -x -r upwd.so -o upwd.o
+	rm -f upwd.so
 
 gss.o: $(srcdir)/../lib/gss.c
-	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/gss.c
+	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/gss.c -o gss.so
+	${LD} -x -r gss.so -o gss.o
+	rm -f gss.so
 
 cram.o: $(srcdir)/../lib/cram.c
-	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/cram.c
+	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/cram.c -o cram.so
+	${LD} -x -r cram.so -o cram.o
+	rm -f cram.so
 
 packet.o: $(srcdir)/../server/packet.c
-	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../server/packet.c
+	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../server/packet.c -o packet.so
+	${LD} -x -r packet.so -o packet.o
+	rm -f packet.so