diff options
author | William Joye <wjoye@cfa.harvard.edu> | 2019-01-18 21:26:30 (GMT) |
---|---|---|
committer | William Joye <wjoye@cfa.harvard.edu> | 2019-01-18 21:26:30 (GMT) |
commit | 6778583e11a97fbc5de7894532772c314c2ff29b (patch) | |
tree | 3bf6ee48bd7b4dbf9e0e3dd8579f16086fdb0f25 | |
parent | 63bde237e4ea1cf00764d0cfddb88536163ddc37 (diff) | |
download | blt-6778583e11a97fbc5de7894532772c314c2ff29b.zip blt-6778583e11a97fbc5de7894532772c314c2ff29b.tar.gz blt-6778583e11a97fbc5de7894532772c314c2ff29b.tar.bz2 |
clean up build
-rw-r--r-- | ds9/library/ds9.tcl | 1 | ||||
-rw-r--r-- | macos/Makefile.in | 25 | ||||
-rw-r--r-- | make.include | 4 | ||||
-rw-r--r-- | unix/Makefile.in | 13 | ||||
-rw-r--r-- | win/Makefile.in | 26 |
5 files changed, 38 insertions, 31 deletions
diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl index fc99a39..11af7f3 100644 --- a/ds9/library/ds9.tcl +++ b/ds9/library/ds9.tcl @@ -212,6 +212,7 @@ switch $ds9(wm) { win32 { set ds9(root) [file dirname [file dirname $argv0]] set auto_path [list $ds9(root) $ds9(root)/tcl8.6 $ds9(root)/tk8.6 $ds9(root)/tk8.6/ttk] + } } package require msgcat diff --git a/macos/Makefile.in b/macos/Makefile.in index bb51181..a07012d 100644 --- a/macos/Makefile.in +++ b/macos/Makefile.in @@ -140,7 +140,7 @@ tkmacosx/Makefile : #--------------------------clean -.PHONY : tclclean tkclean tkosclean tclsignalclean +.PHONY : tclclean tkclean osclean tclsignalclean tkmacosxclean tclclean : @echo "" @@ -152,19 +152,22 @@ tkclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/macosx clean -tkosclean : tclsignalclean - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tkmacosx clean +osclean : tclsignalclean tkmacosx tclsignalclean : @echo "" @echo "*** $@ ***" $(MAKE) -C tclsignal clean +tkmacosxclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tkmacosx clean + #--------------------------distclean -.PHONY : tcldistclean tkdistclean tkosdistclean tclsignaldistclean +.PHONY : tcldistclean tkdistclean +.PHONY : osdistclean tclsignaldistclean tkmacosxdistclean tcldistclean : @echo "" @@ -176,10 +179,7 @@ tkdistclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/macosx distclean -tkosdistclean : tclsignaldistclean - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tkmacosx distclean +osdistclean : tclsignaldistclean tkmacosxclean tclsignaldistclean : @echo "" @@ -187,6 +187,11 @@ tclsignaldistclean : $(MAKE) -C tclsignal distclean rm -f tclsignal/tclsignalConfig.sh +tkmacosxdistclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tkmacosx distclean + #--------------------------distribution .PHONY : dist diff --git a/make.include b/make.include index cfb2b14..7782ac8 100644 --- a/make.include +++ b/make.include @@ -410,7 +410,7 @@ clean : tclclean tkclean \ tkbltclean tkconclean tktableclean tkimgclean \ tkmpegclean tkhtml1clean \ tksaoclean astclean funtoolsclean ds9clean \ - tkosclean dirsclean localclean scrub + osclean dirsclean localclean scrub dirsclean : @echo "" @@ -513,7 +513,7 @@ distclean : tcldistclean tkdistclean \ tkbltdistclean tktabledistclean tkcondistclean tkimgdistclean \ tkmpegdistclean tkhtml1distclean \ tksaodistclean astdistclean funtoolsdistclean ds9distclean \ - tkosdistclean dirsdistclean localdistclean scrub + osdistclean dirsdistclean localdistclean scrub dirsdistclean: @echo "" diff --git a/unix/Makefile.in b/unix/Makefile.in index d29fa3b..73bb63a 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -97,7 +97,7 @@ tclsignal/Makefile : #--------------------------clean -.PHONY : tclclean tkclean tkosclean tclzipfsclean tclsignalclean +.PHONY : tclclean tkclean osclean tclzipfsclean tclsignalclean tclclean : @echo "" @@ -109,9 +109,7 @@ tkclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/unix clean -tkosclean : tclzipfsclean tclsignalclean - @echo "" - @echo "*** $@ ***" +osclean : tclzipfsclean tclsignalclean tclzipfsclean: @echo "" @@ -125,7 +123,8 @@ tclsignalclean : #--------------------------distclean -.PHONY : tcldistclean tkdistclean tkosdistclean tclzipfsdistclean tclsignaldistclean +.PHONY : tcldistclean tkdistclean +.PHONY : osdistclean tclzipfsdistclean tclsignaldistclean tcldistclean : @echo "" @@ -137,9 +136,7 @@ tkdistclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/unix distclean -tkosdistclean : tclzipfsdistclean tclsignaldistclean - @echo "" - @echo "*** $@ ***" +osdistclean : tclzipfsdistclean tclsignaldistclean tclzipfsdistclean: @echo "" diff --git a/win/Makefile.in b/win/Makefile.in index 7e53f86..32522ee 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -123,7 +123,7 @@ openssl/Makefile: #--------------------------clean -.PHONY : tclclean tkclean tkosclean libxml2clean opensslclean +.PHONY : tclclean tkclean osclean libxml2clean opensslclean tkwinclean tclclean : @echo "" @@ -135,10 +135,7 @@ tkclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/win clean -tkosclean : libxml2clean opensslclean - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tkwin clean +osclean : libxml2clean opensslclean tkwinclean libxml2clean : @echo "" @@ -150,10 +147,15 @@ opensslclean: @echo "*** $@ ***" $(MAKE) -C openssl clean +tkosclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tkwin clean + #--------------------------distclean -.PHONY : tcldistclean tkdistclean tkosdistclean -.PHONY : libxml2distclean openssldistclean +.PHONY : tcldistclean tkdistclean +.PHONY : osdistclean libxml2distclean openssldistclean tkwindistclean tcldistclean : @echo "" @@ -165,10 +167,7 @@ tkdistclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/win distclean -tkosdistclean : libxml2distclean openssldistclean - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tkwin distclean +osdistclean : libxml2distclean openssldistclean tkwindistclean libxml2distclean : @echo "" @@ -181,6 +180,11 @@ openssldistclean : $(MAKE) -C openssl clean rm -f openssl/Makefile +tkwindistclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tkwin distclean + #--------------------------distribution .PHONY : dist |