summaryrefslogtreecommitdiffstats
path: root/ds9/macosx
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2017-01-31 22:35:16 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2017-01-31 22:35:16 (GMT)
commit027964bb2dc1bfd7a8ea14db6673e2ac2c2f3df6 (patch)
tree792447883658432f1b67a3a81e03a9228c499540 /ds9/macosx
parent93eac4bc6784e365ef00479761641c9d88547498 (diff)
downloadblt-027964bb2dc1bfd7a8ea14db6673e2ac2c2f3df6.zip
blt-027964bb2dc1bfd7a8ea14db6673e2ac2c2f3df6.tar.gz
blt-027964bb2dc1bfd7a8ea14db6673e2ac2c2f3df6.tar.bz2
simplify build
Diffstat (limited to 'ds9/macosx')
-rw-r--r--ds9/macosx/Makefile.in26
1 files changed, 20 insertions, 6 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)/.