--- ../Xsi.org/cWnn/jutil/Makefile.in	Sun Jan 30 14:54:49 2000
+++ cWnn/jutil/Makefile.in	Thu Aug 31 10:07:33 2000
@@ -108,65 +108,69 @@
 
 all:: $(PROGRAMS)
 
+clean::
+	$(RM) -r .libs
+	$(RM) *.lo *.la
+
 catod: $(OBJATOD)
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
 
 clean::
 	$(RM) catod
 
 catof: $(OBJATOF)
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
 
 clean::
 	$(RM) catof
 
 cwnntouch: $(OBJTOUCH)
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
 
 clean::
 	$(RM) cwnntouch
 
 cdicsort: $(OBJSORT)
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
 
 clean::
 	$(RM) cdicsort
 
 cdtoa: $(OBJDTOA)
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
 
 clean::
 	$(RM) cdtoa
 
-cwnnstat: $(OBJSTAT) $(CWNNJLIB)
+cwnnstat: $(OBJSTAT) @DEPCWNNJLIB@
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(CWNNJLIB) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(CWNNJLIB) @LIBS@
 
 clean::
 	$(RM) cwnnstat
 
-cwnnkill: $(OBJKILL) $(CWNNJLIB)
+cwnnkill: $(OBJKILL) @DEPCWNNJLIB@
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(CWNNJLIB) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(CWNNJLIB) @LIBS@
 
 clean::
 	$(RM) cwnnkill
 
-cwddel: $(OBJWDDEL) $(CWNNJLIB)
+cwddel: $(OBJWDDEL) @DEPCWNNJLIB@
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(CWNNJLIB) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(CWNNJLIB) @LIBS@
 
 clean::
 	$(RM) cwddel
 
-cwdreg: $(OBJWDREG) $(CWNNJLIB)
+cwdreg: $(OBJWDREG) @DEPCWNNJLIB@
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(CWNNJLIB) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(CWNNJLIB) @LIBS@
 
 clean::
 	$(RM) cwdreg
@@ -324,7 +328,7 @@
 	@for flag in ${MAKEFLAGS} ''; do \
 	case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \
 	for i in $(PROGRAMS); do \
-	(set -x; $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(CWNNBINDIR)); \
+	(set -x; $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(CWNNBINDIR)); \
 	done
 
 $(OBJ1) : $(SRC1)