simplify build

2 files changed, 66 insertions, 37 deletions

diff --git a/ds9/make.include b/ds9/make.include
index 87b12d0..76aa699 100644
--- a/ds9/make.include
+++ b/ds9/make.include
@@ -1,56 +1,66 @@
 #--------------------------framework
 
-framework:
+framework: $(LIBDIR)/library $(LIBDIR)/doc $(LIBDIR)/cmaps $(LIBDIR)/template
+
+$(LIBDIR)/library :
 	cp -prf $(prefix)/ds9/library $(LIBDIR)/.
+# must do it this way for win
+	cd $@; \
+	echo "pkg_mkIndex . *.tcl; exit" | $(TCLSH_PROG)
+
+$(LIBDIR)/msgs :
 	cp -prf $(prefix)/ds9/msgs $(LIBDIR)/.
+
+$(LIBDIR)/doc :
 	cp -prf $(prefix)/ds9/doc $(LIBDIR)/.
+
+$(LIBDIR)/cmaps :
 	cp -prf $(prefix)/ds9/cmaps $(LIBDIR)/.
+
+$(LIBDIR)/template :
 	cp -prf $(prefix)/ds9/template $(LIBDIR)/.
-# must do it this way for win
-	cd $(LIBDIR)/library; \
-	echo "pkg_mkIndex . *.tcl; exit" | $(TCLSH_PROG)
 
 #--------------------------tkblt
 
-tkblt	:
-	mkdir -p $(LIBDIR)/tkblt
-	cp -pf $(prefix)/tkblt/library/*.tcl $(LIBDIR)/tkblt/.
+$(LIBDIR)/tkblt	:
+	mkdir -p $@
+	cp -pf $(prefix)/tkblt/library/*.tcl $@/.
 # must do it this way for win
-	cd $(LIBDIR)/tkblt; \
+	cd $@; \
 	echo "pkg_mkIndex . *.tcl; exit" | $(TCLSH_PROG)
 
 #--------------------------tkcon
 
-tkcon	:
-	mkdir -p $(LIBDIR)/tkcon
-	cp -pf $(prefix)/tkcon/*.tcl $(LIBDIR)/tkcon/.
+$(LIBDIR)/tkcon	:
+	mkdir -p $@
+	cp -pf $(prefix)/tkcon/*.tcl $@/.
 # must do it this way for win
-	cd $(LIBDIR)/tkcon; \
+	cd $@; \
 	echo "pkg_mkIndex . *.tcl; exit" | $(TCLSH_PROG)
 
 #--------------------------tcllib
 
-tcllib	: base64 ftp log textutil math
+tcllib	: $(LIBDIR)/base64 $(LIBDIR)/ftp $(LIBDIR)/log $(LIBDIR)/textutil $(LIBDIR)/math
 
-base64	:
-	mkdir -p $(LIBDIR)/base64
-	cp -prf $(prefix)/tcllib/modules/base64/*.tcl $(LIBDIR)/base64/.
+$(LIBDIR)/base64:
+	mkdir -p $@
+	cp -prf $(prefix)/tcllib/modules/base64/*.tcl $@
 
-ftp	:
-	mkdir -p $(LIBDIR)/ftp
-	cp -prf $(prefix)/tcllib/modules/ftp/*.tcl $(LIBDIR)/ftp/.
+$(LIBDIR)/ftp	:
+	mkdir -p $@
+	cp -prf $(prefix)/tcllib/modules/ftp/*.tcl $@
 
-log	:
-	mkdir -p $(LIBDIR)/log
-	cp -prf $(prefix)/tcllib/modules/log/*.tcl $(LIBDIR)/log/.
+$(LIBDIR)/log	:
+	mkdir -p $@
+	cp -prf $(prefix)/tcllib/modules/log/*.tcl $@
 
-textutil:
-	mkdir -p $(LIBDIR)/textutil
-	cp -prf $(prefix)/tcllib/modules/textutil/*.tcl $(LIBDIR)/textutil/.
+$(LIBDIR)/textutil:
+	mkdir -p $@
+	cp -prf $(prefix)/tcllib/modules/textutil/*.tcl $@
 
-math	:
-	mkdir -p $(LIBDIR)/math
-	cp -prf $(prefix)/tcllib/modules/math/*.tcl $(LIBDIR)/math/.
+$(LIBDIR)/math	:
+	mkdir -p $@
+	cp -prf $(prefix)/tcllib/modules/math/*.tcl $@/.
 
 #--------------------------distclean
 
diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in
index cd7bc72..9c334fa 100644
--- a/ds9/unix/Makefile.in
+++ b/ds9/unix/Makefile.in
@@ -77,10 +77,27 @@ ID	= $(shell finger $(shell whoami) | egrep -o 'Name: [a-zA-Z0-9 ]{1,}' | cut -d
 
 OBJS	= ds9.o tkAppInit.o
 
+PREQS	= \
+	$(APPDIR) \
+	$(LIBDIR)/tcl$(TCL_VERSION) \
+	$(LIBDIR)/tcl8 \
+	$(LIBDIR)/tk$(TCL_VERSION) \
+	$(LIBDIR)/library \
+	$(LIBDIR)/doc \
+	$(LIBDIR)/cmaps \
+	$(LIBDIR)/template \
+	$(LIBDIR)/base64 \
+	$(LIBDIR)/ftp \
+	$(LIBDIR)/log \
+	$(LIBDIR)/textutil \
+	$(LIBDIR)/math \
+	$(LIBDIR)/tkblt \
+	$(LIBDIR)/tkcon
+
 #--------------------------main
 
 .NOTPARALLEL :
-.PHONY	: ds9 debug framework tcl tk tcllib tkcon tkblt
+.PHONY	: ds9 debug tcl framework tcllib
 
 ifeq (,$(findstring Darwin,$(system)))
 
@@ -152,26 +169,28 @@ ds9base	: $(OBJS)
 	$(TK_LIBS) \
 	$(LIBS)
 
-ds9.zip	: $(APPDIR) framework tcl tk tcllib tkblt tkcon
+ds9.zip	: $(PREQS)
 	$(RM) $@
 	zip -r ds9.zip $(APPDIR)
 
 tkAppInit.o : tkAppInit.c
 	$(COMPILE) -DTK_LOCAL_APPINIT=SAOAppInit \
-	-DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook -c tkAppInit.c -o $@
+	-DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook -c $? -o $@
 
 tkAppInit.c : $(prefix)/tk$(TCL_VERSION)/unix/tkAppInit.c
-	cp $(prefix)/tk$(TCL_VERSION)/unix/tkAppInit.c .
+	cp $? .
 
 $(APPDIR) : 
 	mkdir -p $@
 
-tcl	: $(prefix)/lib/tcl$(TCL_VERSION)
-	cp -r $(prefix)/lib/tcl$(TCL_VERSION) $(APPDIR)/.
-	cp -r $(prefix)/lib/tcl8 $(APPDIR)/.
+$(LIBDIR)/tcl$(TCL_VERSION) :
+	cp -prf $(prefix)/lib/tcl$(TCL_VERSION) $(LIBDIR)/.
+
+$(LIBDIR)/tcl8 :
+	cp -prf $(prefix)/lib/tcl8 $(LIBDIR)/.
 
-tk	: $(prefix)/lib/tk$(TCL_VERSION)
-	cp -r $(prefix)/lib/tk$(TCL_VERSION) $(APPDIR)/.
+$(LIBDIR)/tk$(TCL_VERSION) :
+	cp -prf $(prefix)/lib/tk$(TCL_VERSION) $(LIBDIR)/.
 	rm -rf $(APPDIR)/tk$(TCL_VERSION)/images
 	rm -rf $(APPDIR)/tk$(TCL_VERSION)/demos