diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-02-02 19:42:36 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-02-02 19:42:36 (GMT) |
| commit | 34e69f8703fcecb689326ebd319af53f5aa17731 (patch) | |
| tree | 7502e468fd1cb3bdf4e0cd25c1309fae27f36368 /ds9 | |
| parent | 02b1b51b8ac5c3f0c125d7a5d993154b40bc8331 (diff) | |
| download | blt-34e69f8703fcecb689326ebd319af53f5aa17731.zip blt-34e69f8703fcecb689326ebd319af53f5aa17731.tar.gz blt-34e69f8703fcecb689326ebd319af53f5aa17731.tar.bz2 | |
simplify build
Diffstat (limited to 'ds9')
| -rw-r--r-- | ds9/macosx/Makefile.in | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in index 9017a68..46b59ff 100644 --- a/ds9/macosx/Makefile.in +++ b/ds9/macosx/Makefile.in @@ -71,10 +71,10 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) APPDIR = $(bindir)/SAOImage\ DS9.app MACDIR = $(APPDIR)/Contents/MacOS LIBDIR = $(APPDIR)/Contents/Frameworks/Tksao.framework/Resources -TCLDIR = $(APPDIR)/Contents/Frameworks/Tcl.framework/Resources -TKDIR = $(APPDIR)/Contents/Frameworks/Tk.framework/Resources -TCLFW = $(APPDIR)/Contents/Frameworks/Tcl.framework -TKFW = $(APPDIR)/Contents/Frameworks/Tk.framework +TCLSRC = $(prefix)/build/tcl/Tcl.framework/Versions/$(TCL_VERSION) +TCLDIR = $(APPDIR)/Contents/Frameworks/Tcl.framework +TKSRC = $(prefix)/build/tk/Tk.framework/Versions/$(TCL_VERSION) +TKDIR = $(APPDIR)/Contents/Frameworks/Tk.framework ID = $(shell finger $(shell whoami) | egrep -o 'Name: [a-zA-Z0-9 ]{1,}' | cut -d ':' -f 2 | xargs echo) @@ -118,6 +118,10 @@ LLIBS = \ PREQS = \ $(APPDIR) \ + $(TCLDIR)/Tcl \ + $(TCLDIR)/Resources \ + $(TKDIR)/Tk \ + $(TKDIR)/Resources \ $(LIBDIR)/library \ $(LIBDIR)/msgs \ $(LIBDIR)/doc \ @@ -130,15 +134,15 @@ PREQS = \ $(LIBDIR)/log \ $(LIBDIR)/textutil \ $(LIBDIR)/math \ - $(LIBDIR)/xpans + $(LIBDIR)/xpans \ + $(LIBDIR)/pcc-i386-snowleopard.tar.gz #--------------------------main .NOTPARALLEL : .PHONY : debug -$(MACDIR)/ds9 : ds9base $(PREQS) \ - $(TCLFW)/Tcl $(TKFW)/Tk $(LIBDIR)/pcc-i386-snowleopard.tar.gz +$(MACDIR)/ds9 : ds9base $(PREQS) cp -p ds9base "$@" strip "$@" install_name_tool -change \ @@ -151,8 +155,7 @@ $(MACDIR)/ds9 : ds9base $(PREQS) \ "$@" cd $(bindir); codesign --deep -f -s "$(ID)" SAOImage\ DS9.app -debug : ds9base $(PREQS) \ - $(TCLFW)/Tcl $(TKFW)/Tk $(LIBDIR)/pcc-i386-snowleopard.tar.gz +debug : ds9base $(PREQS) cp -p ds9base $(APPDIR)/Contents/MacOS/ds9 install_name_tool -change \ /Library/Frameworks/Tcl.framework/Versions/$(TCL_VERSION)/Tcl \ @@ -182,17 +185,21 @@ ds9base : $(OBJS) $(LLIBS) $(LIBS) $(APPDIR): - cp -prf SAOImage\ DS9.app $(bindir)/. + cp -prf SAOImage\ DS9.app $(bindir) -$(TCLFW)/Tcl : $(prefix)/build/tcl/Tcl.framework/Versions/$(TCL_VERSION)/Tcl - cp -pf $(prefix)/build/tcl/Tcl.framework/Versions/$(TCL_VERSION)/Tcl $(TCLFW)/. - cp -prf $(prefix)/build/tcl/Tcl.framework/Versions/$(TCL_VERSION)/Resources/* $(TCLDIR)/. +$(TCLDIR)/Tcl : $(TCLSRC)/Tcl + cp -p $? "$@" + +$(TCLDIR)/Resources : $(TCLSRC)/Resources + cp -prf $?/* "$@" + +$(TKDIR)/Tk : $(TKSRC)/Tk + cp -p $? "$@" -$(TKFW)/Tk : $(prefix)/build/tk/Tk.framework/Versions/$(TCL_VERSION)/Tk - cp -pf $(prefix)/build/tk/Tk.framework/Versions/$(TCL_VERSION)/Tk $(TKFW)/. - cp -pf $(prefix)/build/tk/Tk.framework/Versions/$(TCL_VERSION)/Resources/Info.plist $(TKDIR)/. - cp -pf $(prefix)/build/tk/Tk.framework/Versions/$(TCL_VERSION)/Resources/license.terms $(TKDIR)/. - cp -prf $(prefix)/build/tk/Tk.framework/Versions/$(TCL_VERSION)/Resources/Scripts $(TKDIR)/. +$(TKDIR)/Resources : $(TKSRC)/Resources + cp -p $(TKSRC)/Resources/Info.plist "$@" + cp -p $(TKSRC)/Resources/license.terms "$@" + cp -prf $(TKSRC)/Resources/Scripts "$@" $(LIBDIR)/xpans : $(bindir)/xpans cp -p $? "$@" |