--- Makefile.in	Tue Aug 21 01:52:21 2001
+++ Makefile.in	Sat Jul 10 17:51:42 2004
@@ -34,5 +34,5 @@
 #========================================================================
 
-lib_BINARIES	=	$(Trf_LIB_FILE) $(Trf_STUB_LIB_FILE) $(MD5_LIB_FILE)
+lib_BINARIES	=	$(Trf_LIB_FILE) $(Trf_STUB_LIB_FILE)
 BINARIES	=	$(lib_BINARIES)
 
@@ -50,5 +50,4 @@
 TRF_BASE_SRC	=	$(TRF_GENSRCDIR)/zlib.c		\
 			$(TRF_GENSRCDIR)/bz2lib.c	\
-			$(TRF_GENSRCDIR)/loadman.c	\
 			$(TRF_GENSRCDIR)/init.c		\
 			$(TRF_GENSRCDIR)/registry.c	\
@@ -123,7 +123,5 @@
 			$(TRF_COMPRESS_OBJ)
 
-TRF_BASE_OBJ	=	@DL_OBJS@ bz2lib.$(OBJEXT)	\
-			zlib.$(OBJEXT)		\
-			loadman.$(OBJEXT) 	\
+TRF_BASE_OBJ	=	@DL_OBJS@ 		\
 			init.$(OBJEXT)		\
 			registry.$(OBJEXT) 	\
@@ -191,5 +190,5 @@
 #========================================================================
 
-Trf_LIB_FILE			=	@Trf_LIB_FILE@
+Trf_LIB_FILE			=	libTrf2.so.1
 $(Trf_LIB_FILE)_OBJECTS		=	$(Trf_OBJECTS)
 
@@ -299,10 +298,10 @@
 RANLIB			= @RANLIB@
 SHLIB_CFLAGS		= @SHLIB_CFLAGS@
-SHLIB_LD		= @SHLIB_LD@
+SHLIB_LD		= $(CC) -shared
 SHLIB_LDFLAGS		= @SHLIB_LDFLAGS@
-SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
+SHLIB_LD_LIBS		= -lcrypto -lbz2 -lz @SHLIB_LD_LIBS@
 STLIB_LD		= @STLIB_LD@
 TCL_BIN_DIR		= @TCL_BIN_DIR@
-TCL_DEFS		= @TCL_DEFS@
+TCL_DEFS		= @TCL_DEFS@ -DHAVE_BZLIB_H
 TCL_EXTRA_CFLAGS	= @TCL_EXTRA_CFLAGS@
 TCL_LD_FLAGS		= @TCL_LD_FLAGS@
@@ -346,5 +345,5 @@
 LIBS		= @LIBS@
 AR		= ar
-CFLAGS		= @CFLAGS@
+CFLAGS		+= @CFLAGS@
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 
@@ -431,5 +430,5 @@
 
 check:	test
-test:
+test:	$(Trf_LIB_FILE)
 	LD_LIBRARY_PATH="$(srcdir):../tea/:$(ZLIB_LIB_DIR):$(SSL_LIB_DIR)"; \
 	export LD_LIBRARY_PATH; \
@@ -755,5 +757,5 @@
 	done
 	if test "x$(MAKE_LIB)" = "x$(MAKE_SHARED_LIB)"; then \
-	  $(TCLSH_PROG) mkIndex.tcl $(lib_BINARIES); \
+	  $(TCLSH_PROG) mkIndex.tcl $(Trf_LIB_FILE); \
 	fi