--- ../Xsi.org/Wnn/jutil/Makefile.in	Sun Jan 30 12:50:59 2000
+++ Wnn/jutil/Makefile.in	Thu Aug 31 10:03:49 2000
@@ -108,72 +108,76 @@
 
 all:: $(PROGRAMS)
 
+clean::
+	$(RM) -r .libs
+	$(RM) *.lo *.la
+
 atod: $(OBJATOD)
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
 
 clean::
 	$(RM) atod
 
 atof: $(OBJATOF)
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
 
 clean::
 	$(RM) atof
 
 wnntouch: $(OBJTOUCH)
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
 
 clean::
 	$(RM) wnntouch
 
 dicsort: $(OBJSORT)
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
 
 clean::
 	$(RM) dicsort
 
 oldatonewa: $(OBJOLDTONEW)
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJOLDTONEW) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJOLDTONEW) @LIBS@
 
 clean::
 	$(RM) oldatonewa
 
 dtoa: $(OBJDTOA)
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
 
 clean::
 	$(RM) dtoa
 
-wnnstat: $(OBJSTAT) $(WNNJLIB)
+wnnstat: $(OBJSTAT) @DEPWNNJLIB@
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(WNNJLIB) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(WNNJLIB) @LIBS@
 
 clean::
 	$(RM) wnnstat
 
-wnnkill: $(OBJKILL) $(WNNJLIB)
+wnnkill: $(OBJKILL) @DEPWNNJLIB@
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(WNNJLIB) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(WNNJLIB) @LIBS@
 
 clean::
 	$(RM) wnnkill
 
-wddel: $(OBJWDDEL) $(WNNJLIB)
+wddel: $(OBJWDDEL) @DEPWNNJLIB@
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(WNNJLIB) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(WNNJLIB) @LIBS@
 
 clean::
 	$(RM) wddel
 
-wdreg: $(OBJWDREG) $(WNNJLIB)
+wdreg: $(OBJWDREG) @DEPWNNJLIB@
 	$(RM) $@
-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(WNNJLIB) @LIBS@
+	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(WNNJLIB) @LIBS@
 
 clean::
 	$(RM) wdreg
@@ -184,7 +188,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)$(JWNNBINDIR)); \
+	(set -x; $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(JWNNBINDIR)); \
 	done
 
 $(OBJ1) : $(SRC1)
