diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-01-27 18:59:30 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-01-27 18:59:30 (GMT) |
| commit | e1605708257f4ef5800a57af05039a72d4a353f6 (patch) | |
| tree | 004b7a38c0bd8cafcfa6dd231bb5dbb916cf1117 /ds9 | |
| parent | 9212f790aaf716a609290e68b6edbadfec78553d (diff) | |
| download | blt-e1605708257f4ef5800a57af05039a72d4a353f6.zip blt-e1605708257f4ef5800a57af05039a72d4a353f6.tar.gz blt-e1605708257f4ef5800a57af05039a72d4a353f6.tar.bz2 | |
simplify build
Diffstat (limited to 'ds9')
| -rw-r--r-- | ds9/macosx/Makefile.in | 10 | ||||
| -rw-r--r-- | ds9/make.include | 18 | ||||
| -rw-r--r-- | ds9/unix/Makefile.in | 10 | ||||
| -rwxr-xr-x | ds9/win/Makefile.in | 10 |
4 files changed, 18 insertions, 30 deletions
diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in index df97176..9baffc0 100644 --- a/ds9/macosx/Makefile.in +++ b/ds9/macosx/Makefile.in @@ -192,16 +192,6 @@ tcllib : cp -pr $(prefix)/tcllib/modules/textutil $(TKSAORES)/. cp -pr $(prefix)/tcllib/modules/math $(TKSAORES)/. -tkblt : - mkdir $(TKSAORES)/tkblt - cp -p $(prefix)/tkblt/library/graph.tcl $(TKSAORES)/tkblt/. - echo "pkg_mkIndex $(TKSAORES)/tkblt *.tcl; exit" | $(bindir)/tclsh8.6 - -tkcon : - mkdir $(TKSAORES)/tkcon - cp -p $(prefix)/tkcon/*.tcl $(TKSAORES)/tkcon/. - echo "pkg_mkIndex $(TKSAORES)/tkcon *.tcl; exit" | $(bindir)/tclsh8.6 - xpa : cp -pr $(bindir)/xpans $(TKSAORES)/. diff --git a/ds9/make.include b/ds9/make.include index 96699f8..47952bc 100644 --- a/ds9/make.include +++ b/ds9/make.include @@ -4,5 +4,21 @@ framework: cp -pr $(prefix)/ds9/doc $(TKSAORES)/. cp -pr $(prefix)/ds9/cmaps $(TKSAORES)/. cp -pr $(prefix)/ds9/template $(TKSAORES)/. - echo "pkg_mkIndex $(TKSAORES)/library *.tcl; exit" | $(TCLSH_PROG) +# must do it this way for win + cd $(TKSAORES)/library; \ + echo "pkg_mkIndex . *.tcl; exit" | $(TCLSH_PROG) +tkblt : + mkdir $(APPDIR)/tkblt + cp -p $(prefix)/tkblt/library/*.tcl $(APPDIR)/tkblt/. +# must do it this way for win + cd $(APPDIR)/tkblt; \ + echo "pkg_mkIndex . *.tcl; exit" | $(TCLSH_PROG) + + +tkcon : + mkdir $(APPDIR)/tkcon + cp -p $(prefix)/tkcon/*.tcl $(APPDIR)/tkcon/. +# must do it this way for win + cd $(APPDIR)/tkcon; \ + echo "pkg_mkIndex . *.tcl; exit" | $(TCLSH_PROG) diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in index 4b93160..f1673d9 100644 --- a/ds9/unix/Makefile.in +++ b/ds9/unix/Makefile.in @@ -165,7 +165,7 @@ ds9base : $(OBJS) $(TK_LIBS) \ $(LIBS) -ds9.zip : $(APPDIR) framework $(FILES) +ds9.zip : $(APPDIR) framework tkblt tkcon $(FILES) $(RM) $@ find $(APPDIR) -depth -name "CVS" -exec rm -r {} \; zip -r ds9.zip $(APPDIR) @@ -202,14 +202,6 @@ $(APPDIR)/tcllib : cp -r $(prefix)/tcllib/modules/textutil $(APPDIR)/tcllib/. cp -r $(prefix)/tcllib/modules/math $(APPDIR)/tcllib/. -$(APPDIR)/tkblt : - mkdir $(APPDIR)/tkblt - cp $(prefix)/tkblt/library/graph.tcl $(APPDIR)/tkblt/. - -$(APPDIR)/tkcon : - mkdir $(APPDIR)/tkcon - cp $(prefix)/tkcon/*.tcl $@ - #--------------------------cleanup .PHONY : clean distclean diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in index af02f16..fd3e758 100755 --- a/ds9/win/Makefile.in +++ b/ds9/win/Makefile.in @@ -157,16 +157,6 @@ tcllib : cp -pr $(prefix)/tcllib/modules/textutil $(APPDIR)/. cp -pr $(prefix)/tcllib/modules/math $(APPDIR)/. -tkblt : - mkdir $(APPDIR)/tkblt - cp -p $(prefix)/tkblt/library/graph.tcl $(APPDIR)/tkblt/. - echo "pkg_mkIndex ../../bin/ds9app/tkblt *.tcl; exit" | $(bindir)/tclsh86s - -tkcon : - mkdir $(APPDIR)/tkcon - cp -p $(prefix)/tkcon/*.tcl $(APPDIR)/tkcon/. - echo "pkg_mkIndex ../../bin/ds9app/tkblt *.tcl; exit" | $(bindir)/tclsh86s - xpa : cp -p $(bindir)/xpans.exe $(APPDIR)/. |