simplify build

5 files changed, 29 insertions, 28 deletions

diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl
index 7d08002..e215945 100755
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
@@ -197,12 +197,12 @@ switch $ds9(wm) {
 	source $ds9(root)/tk8.6/optMenu.tcl
 	source $ds9(root)/tk8.6/unsupported.tcl
 
-	source $ds9(root)/tcllib/base64/base64.tcl
-	source $ds9(root)/tcllib/log/log.tcl
-	source $ds9(root)/tcllib/ftp/ftp.tcl
-	source $ds9(root)/tcllib/textutil/repeat.tcl
-	source $ds9(root)/tcllib/textutil/tabify.tcl
-	source $ds9(root)/tcllib/math/fuzzy.tcl
+	source $ds9(root)/base64/base64.tcl
+	source $ds9(root)/log/log.tcl
+	source $ds9(root)/ftp/ftp.tcl
+	source $ds9(root)/textutil/repeat.tcl
+	source $ds9(root)/textutil/tabify.tcl
+	source $ds9(root)/math/fuzzy.tcl
 
 	source $ds9(root)/tkcon/tkcon.tcl
 	source $ds9(root)/tkblt/graph.tcl
diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in
index 8738614..141748b 100644
--- a/ds9/macosx/Makefile.in
+++ b/ds9/macosx/Makefile.in
@@ -184,13 +184,6 @@ tk_debug:
 	cp -rp $(prefix)/build/tk/Tk.framework/Versions/8.6/Resources/Scripts \
 	$(TKDIR)/.
 
-tcllib	:
-	cp -pr $(prefix)/tcllib/modules/base64 $(LIBDIR)/.
-	cp -pr $(prefix)/tcllib/modules/ftp $(LIBDIR)/.
-	cp -pr $(prefix)/tcllib/modules/log $(LIBDIR)/.
-	cp -pr $(prefix)/tcllib/modules/textutil $(LIBDIR)/.
-	cp -pr $(prefix)/tcllib/modules/math $(LIBDIR)/.
-
 xpa	:
 	cp -pr $(bindir)/xpans $(LIBDIR)/.
 
diff --git a/ds9/make.include b/ds9/make.include
index 0bc1e6c..44dad80 100644
--- a/ds9/make.include
+++ b/ds9/make.include
@@ -21,3 +21,26 @@ tkcon	:
 # must do it this way for win
 	cd $(LIBDIR)/tkcon; \
 	echo "pkg_mkIndex . *.tcl; exit" | $(TCLSH_PROG)
+
+tcllib	: base64 ftp log textutil math
+
+base64	:
+	mkdir $(LIBDIR)/base64
+	cp -r $(prefix)/tcllib/modules/base64/*.tcl $(LIBDIR)/base64/.
+
+ftp	:
+	mkdir $(LIBDIR)/ftp
+	cp -r $(prefix)/tcllib/modules/ftp/*.tcl $(LIBDIR)/ftp/.
+
+log	:
+	mkdir $(LIBDIR)/log
+	cp -r $(prefix)/tcllib/modules/log/*.tcl $(LIBDIR)/log/.
+
+textutil:
+	mkdir $(LIBDIR)/textutil
+	cp -r $(prefix)/tcllib/modules/textutil/*.tcl $(LIBDIR)/textutil/.
+
+math	:
+	mkdir $(LIBDIR)/math
+	cp -r $(prefix)/tcllib/modules/math/*.tcl $(LIBDIR)/math/.
+
diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in
index 18a7621..d55285e 100644
--- a/ds9/unix/Makefile.in
+++ b/ds9/unix/Makefile.in
@@ -194,14 +194,6 @@ $(APPDIR)/tk$(TCL_VERSION) : $(prefix)/lib/tk$(TCL_VERSION)
 	rm -rf $(APPDIR)/tk$(TCL_VERSION)/images
 	rm -rf $(APPDIR)/tk$(TCL_VERSION)/demos
 
-$(APPDIR)/tcllib :
-	mkdir $(APPDIR)/tcllib
-	cp -r $(prefix)/tcllib/modules/base64 $(APPDIR)/tcllib/.
-	cp -r $(prefix)/tcllib/modules/ftp $(APPDIR)/tcllib/.
-	cp -r $(prefix)/tcllib/modules/log $(APPDIR)/tcllib/.
-	cp -r $(prefix)/tcllib/modules/textutil $(APPDIR)/tcllib/.
-	cp -r $(prefix)/tcllib/modules/math $(APPDIR)/tcllib/.
-
 #--------------------------cleanup
 
 .PHONY	: clean distclean
diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in
index 6973839..6b4db0e 100755
--- a/ds9/win/Makefile.in
+++ b/ds9/win/Makefile.in
@@ -150,13 +150,6 @@ tcltk	:
 	cp -pr $(prefix)/lib/tcl8.6 $(APPDIR)/.
 	cp -pr $(prefix)/lib/tk8.6 $(APPDIR)/.
 
-tcllib	:
-	cp -pr $(prefix)/tcllib/modules/base64 $(APPDIR)/.
-	cp -pr $(prefix)/tcllib/modules/ftp $(APPDIR)/.
-	cp -pr $(prefix)/tcllib/modules/log $(APPDIR)/.
-	cp -pr $(prefix)/tcllib/modules/textutil $(APPDIR)/.
-	cp -pr $(prefix)/tcllib/modules/math $(APPDIR)/.
-
 xpa	:
 	cp -p $(bindir)/xpans.exe $(APPDIR)/.