diff options
| -rw-r--r-- | ds9/macosx/Makefile.in | 26 | ||||
| -rw-r--r-- | ds9/make.include | 66 |
2 files changed, 53 insertions, 39 deletions
diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in index f197291..213c49b 100644 --- a/ds9/macosx/Makefile.in +++ b/ds9/macosx/Makefile.in @@ -80,11 +80,26 @@ ID = $(shell finger $(shell whoami) | egrep -o 'Name: [a-zA-Z0-9 ]{1,}' | cut -d OBJS = ds9.o tkAppInit.o +PREQS = \ + $(APPDIR) \ + $(LIBDIR)/library \ + $(LIBDIR)/msgs \ + $(LIBDIR)/doc \ + $(LIBDIR)/cmaps \ + $(LIBDIR)/template \ + $(LIBDIR)/tkblt \ + $(LIBDIR)/tkcon \ + $(LIBDIR)/base64 \ + $(LIBDIR)/ftp \ + $(LIBDIR)/log \ + $(LIBDIR)/textutil \ + $(LIBDIR)/math \ + $(LIBDIR)/xpans + #--------------------------main .NOTPARALLEL : -.PHONY : ds9 debug framework tcl tcl_debug tk tk_debug -.PHONY : tcllib tkcon tkblt compiler cleanup +.PHONY : ds9 debug tcl tcl_debug tk tk_debug compiler cleanup ds9 : ds9base ds9ext cp -p ds9base $(APPDIR)/Contents/MacOS/ds9 @@ -152,7 +167,7 @@ ds9base : $(OBJS) $(TK_LIBS) \ $(LIBS) -ds9ext : $(APPDIR) framework tcl tk tcllib tkcon tkblt $(LIBDIR)/xpa compiler cleanup +ds9ext : $(APPDIR) $(PREQS) tcl tk compiler cleanup $(APPDIR): cp -prf SAOImage\ DS9.app $(bindir)/. @@ -177,9 +192,8 @@ tk_debug: cp -pf $(prefix)/build/tk/Tk.framework/Versions/8.6/Resources/license.terms $(TKDIR)/. cp -prf $(prefix)/build/tk/Tk.framework/Versions/8.6/Resources/Scripts $(TKDIR)/. -$(LIBDIR)/xpa : - cp -prf $(bindir)/xpans $(LIBDIR)/. - echo "***" +$(LIBDIR)/xpans : $(bindir)/xpans + cp -p $? "$@" compiler: cp -pf $(prefix)/compilers/pcc-i386-snowleopard.tar.gz $(LIBDIR)/. diff --git a/ds9/make.include b/ds9/make.include index 0664476..40d9271 100644 --- a/ds9/make.include +++ b/ds9/make.include @@ -1,76 +1,76 @@ #--------------------------framework $(LIBDIR)/library : $(prefix)/ds9/library/*.tcl - mkdir -p $@ - cp -p $? $@ + mkdir -p "$@" + cp -p $? "$@" # must do it this way for win - cd $@; \ + cd "$@"; \ echo "pkg_mkIndex . *.tcl; exit" | $(TCLSH_PROG) - touch $@ + touch "$@" $(LIBDIR)/msgs : $(prefix)/ds9/msgs/*.msg - mkdir -p $@ - cp -p $? $@ - touch $@ + mkdir -p "$@" + cp -p $? "$@" + touch "$@" $(LIBDIR)/doc : cp -prf $(prefix)/ds9/doc $(LIBDIR)/. - touch $@ + touch "$@" $(LIBDIR)/cmaps : cp -prf $(prefix)/ds9/cmaps $(LIBDIR)/. - touch $@ + touch "$@" $(LIBDIR)/template : cp -prf $(prefix)/ds9/template $(LIBDIR)/. - touch $@ + touch "$@" #--------------------------tkblt $(LIBDIR)/tkblt : $(prefix)/tkblt/library/*.tcl - mkdir -p $@ - cp -p $? $@ + mkdir -p "$@" + cp -p $? "$@" # must do it this way for win - cd $@; \ + cd "$@"; \ echo "pkg_mkIndex . *.tcl; exit" | $(TCLSH_PROG) - touch $@ + touch "$@" #--------------------------tkcon $(LIBDIR)/tkcon : $(prefix)/tkcon/*.tcl - mkdir -p $@ - cp -p $? $@ + mkdir -p "$@" + cp -p $? "$@" # must do it this way for win - cd $@; \ + cd "$@"; \ echo "pkg_mkIndex . *.tcl; exit" | $(TCLSH_PROG) - touch $@ + touch "$@" #--------------------------tcllib $(LIBDIR)/base64: $(prefix)/tcllib/modules/base64/*.tcl - mkdir -p $@ - cp -p $? $@ - touch $@ + mkdir -p "$@" + cp -p $? "$@" + touch "$@" $(LIBDIR)/ftp : $(prefix)/tcllib/modules/ftp/*.tcl - mkdir -p $@ - cp -p $? $@ - touch $@ + mkdir -p "$@" + cp -p $? "$@" + touch "$@" $(LIBDIR)/log : $(prefix)/tcllib/modules/log/*.tcl - mkdir -p $@ - cp -p $? $@ - touch $@ + mkdir -p "$@" + cp -p $? "$@" + touch "$@" $(LIBDIR)/textutil: $(prefix)/tcllib/modules/textutil/*.tcl - mkdir -p $@ - cp -p $? $@ - touch $@ + mkdir -p "$@" + cp -p $? "$@" + touch "$@" $(LIBDIR)/math : $(prefix)/tcllib/modules/math/*.tcl - mkdir -p $@ - cp -p $? $@ - touch $@ + mkdir -p "$@" + cp -p $? "$@" + touch "$@" #--------------------------distclean |