diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-01-27 16:26:18 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-01-27 16:26:18 (GMT) |
| commit | c61430660f5c657a7ef2344cf3541687abfc1e67 (patch) | |
| tree | da8b88758f1c705b06d615e742706190e4e1158e /ds9/macosx | |
| parent | f374041570ddc22b4901a6fa6705efb9edf39a7e (diff) | |
| download | blt-c61430660f5c657a7ef2344cf3541687abfc1e67.zip blt-c61430660f5c657a7ef2344cf3541687abfc1e67.tar.gz blt-c61430660f5c657a7ef2344cf3541687abfc1e67.tar.bz2 | |
simplify build
Diffstat (limited to 'ds9/macosx')
| -rw-r--r-- | ds9/macosx/Makefile.in | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in index d6ba339..df97176 100644 --- a/ds9/macosx/Makefile.in +++ b/ds9/macosx/Makefile.in @@ -9,6 +9,8 @@ datarootdir = @datarootdir@ datadir = @datadir@ mandir = @mandir@ +TCLSH_PROG = @TCLSH_PROG@ + TCL_VERSION = @TCL_VERSION@ TCL_LIB_SPEC = @TCL_LIB_SPEC@ TCL_STUB_LIB_SPEC= @TCL_STUB_LIB_SPEC@ @@ -64,18 +66,16 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) .C.@OBJEXT@: $(COMPILE) -c $< -o $@ -include ../make.include - #--------------------------defines APPDIR = $(bindir)/SAOImage\ DS9.app +TKSAORES= $(bindir)/SAOImage\ DS9.app/Contents/Frameworks/Tksao.framework/Resources ID = $(shell finger $(shell whoami) | egrep -o 'Name: [a-zA-Z0-9 ]{1,}' | cut -d ':' -f 2 | xargs echo) OBJS = ds9.o tkAppInit.o TKSAOFW = $(bindir)/SAOImage\ DS9.app/Contents/Frameworks/Tksao.framework -TKSAORES= $(bindir)/SAOImage\ DS9.app/Contents/Frameworks/Tksao.framework/Resources TCLFW = $(bindir)/SAOImage\ DS9.app/Contents/Frameworks/Tcl.framework TCLRES = $(bindir)/SAOImage\ DS9.app/Contents/Frameworks/Tcl.framework/Resources TKFW = $(bindir)/SAOImage\ DS9.app/Contents/Frameworks/Tk.framework @@ -153,20 +153,12 @@ ds9base : $(OBJS) $(TK_LIBS) \ $(LIBS) +include ../make.include + appdir : rm -rf $(APPDIR) cp -rp SAOImage\ DS9.app $(bindir)/. -framework: - cp -pr ../library $(TKSAORES)/. - cp -pr ../msgs $(TKSAORES)/. - cp -pr ../doc $(TKSAORES)/. - cp -pr ../cmaps $(TKSAORES)/. - cp -pr ../template $(TKSAORES)/. - - rm $(TKSAORES)/library/source.tcl - echo "pkg_mkIndex $(TKSAORES)/library *.tcl; exit" | $(bindir)/tclsh8.6 - tcl : cp -p $(prefix)/build/tcl/Tcl.framework/Versions/8.6/Tcl $(TCLFW)/. cp -pr $(prefix)/build/tcl/Tcl.framework/Versions/8.6/Resources/* $(TCLRES)/. |