From 2e247af5ad994fb192d72a6ecf6aa1c7ec897c72 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 6 Jul 2017 12:16:14 -0400 Subject: fix distclean macos --- ds9/doc/release/r7.6.html | 2 ++ macos/Makefile.in | 24 ++++++++++++++++++++++-- make.include | 28 ++++------------------------ unix/Makefile.in | 24 ++++++++++++++++++++++-- win/Makefile.in | 25 +++++++++++++++++++++++-- 5 files changed, 73 insertions(+), 30 deletions(-) diff --git a/ds9/doc/release/r7.6.html b/ds9/doc/release/r7.6.html index 58b048f..96c603e 100644 --- a/ds9/doc/release/r7.6.html +++ b/ds9/doc/release/r7.6.html @@ -104,6 +104,8 @@
  • 06.28.2017 TKHTML1: Fixed a problem with a compiler issue with va_args and 64bit.
  • 06.29.2017 TKHTML1: Properly init all memory allocation.
  • 07.04.2017 RELEASE version 7.6b3
    • +
  • 07.06.2017 XPA: set XPA_CONNECTION_TIMEOUT to 3 secs.
    • +
  • 07.06.2017 GUI: set title to rootname (removes any extension).
    • diff --git a/macos/Makefile.in b/macos/Makefile.in index f4293c7..c6ab04d 100644 --- a/macos/Makefile.in +++ b/macos/Makefile.in @@ -121,7 +121,17 @@ tkmacosx/Makefile : #--------------------------clean -.PHONY : tkosclean +.PHONY : tclclean tkclean tkosclean + +tclclean : + @echo "" + @echo "*** tclclean ***" + $(MAKE) -C tcl$(TCL_VERSION)/macosx clean + +tkclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tk$(TCL_VERSION)/macosx clean tkosclean : @echo "" @@ -130,7 +140,17 @@ tkosclean : #--------------------------distclean -.PHONY : tkosdistclean +.PHONY : tcldistclean tkdistclean tkosdistclean + +tcldistclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tcl$(TCL_VERSION)/macosx distclean + +tkdistclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tk$(TCL_VERSION)/macosx distclean tkosdistclean : @echo "" diff --git a/make.include b/make.include index a5302b0..1a6597c 100644 --- a/make.include +++ b/make.include @@ -452,9 +452,9 @@ scrub : .PHONY : clean .PHONY : dirsclean ds9clean localclean -.PHONY : tclclean tclcheckdnsclean tcliisclean tclsignalclean +.PHONY : tclcheckdnsclean tcliisclean tclsignalclean .PHONY : tclxmlclean tclzvfsclean tlsclean -.PHONY : tkclean tkbltclean tkconclean tkhtml1clean tkimgclean +.PHONY : tkbltclean tkconclean tkhtml1clean tkimgclean .PHONY : tkmpegclean tksaoclean astclean funtoolsclean tktableclean xpaclean clean : tclclean tkclean \ @@ -480,11 +480,6 @@ localclean : @echo "*** $@ ***" -rm -f core *~ *# -tclclean : - @echo "" - @echo "*** tclclean ***" - $(MAKE) -C tcl$(TCL_VERSION)/$(OS) clean - tclcheckdnsclean : @echo "" @echo "*** $@ ***" @@ -515,11 +510,6 @@ tlsclean: @echo "*** $@ ***" $(MAKE) -C tls clean -tkclean : - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tk$(TCL_VERSION)/$(OS) clean - tkbltclean: @echo "" @echo "*** $@ ***" @@ -573,9 +563,9 @@ xpaclean : #-------------------------- distclean .PHONY : dirsdistclean ds9distclean localdistclean -.PHONY : tcldistclean tclcheckdnsdistclean tcliisdistclean tclsignaldistclean +.PHONY : tclcheckdnsdistclean tcliisdistclean tclsignaldistclean .PHONY : tclxmldistclean tclzvfsdistclean tlsdistclean -.PHONY : tkdistclean tkbltdistclean tkcondistclean tkhtml1distclean +.PHONY : tkbltdistclean tkcondistclean tkhtml1distclean .PHONY : tkimgdistclean tkmpegdistclean .PHONY : tksaodistclean astdistclean funtoolsdistclean .PHONY : tktabledistclean xpadistclean @@ -604,11 +594,6 @@ localdistclean : -rm -f core *~ *# -rm -f config.log config.status config.cache Makefile -tcldistclean : - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tcl$(TCL_VERSION)/$(OS) distclean - tclcheckdnsdistclean : @echo "" @echo "*** $@ ***" @@ -639,11 +624,6 @@ tlsdistclean: @echo "*** $@ ***" $(MAKE) -C tls distclean -tkdistclean : - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tk$(TCL_VERSION)/$(OS) distclean - tkcondistclean: @echo "" @echo "*** $@ ***" diff --git a/unix/Makefile.in b/unix/Makefile.in index 86195f9..9d3f655 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -63,7 +63,17 @@ tk$(TCL_VERSION)/unix/Makefile : #--------------------------clean -.PHONY : tkosclean +.PHONY : tclclean tkclean tkosclean + +tclclean : + @echo "" + @echo "*** tclclean ***" + $(MAKE) -C tcl$(TCL_VERSION)/unix clean + +tkclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tk$(TCL_VERSION)/unix clean tkosclean : @echo "" @@ -71,7 +81,17 @@ tkosclean : #--------------------------distclean -.PHONY : tkosdistclean +.PHONY : tcldistclean tkdistclean tkosdistclean + +tcldistclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tcl$(TCL_VERSION)/unix distclean + +tkdistclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tk$(TCL_VERSION)/unix distclean tkosdistclean : @echo "" diff --git a/win/Makefile.in b/win/Makefile.in index 38a5878..5ebca7e 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -135,7 +135,17 @@ openssl/Makefile: #--------------------------clean -.PHONY : tkosclean libxml2clean zlibclean opensslclean +.PHONY : tclclean tkclean tkosclean libxml2clean zlibclean opensslclean + +tclclean : + @echo "" + @echo "*** tclclean ***" + $(MAKE) -C tcl$(TCL_VERSION)/win clean + +tkclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tk$(TCL_VERSION)/win clean tkosclean : libxml2clean zlibclean opensslclean @echo "" @@ -159,7 +169,18 @@ opensslclean: #--------------------------distclean -.PHONY : tkosdistclean libxml2distclean zlibdistclean openssldistclean +.PHONY : tcldistclean tkdistclean tkosdistclean +.PHONY : libxml2distclean zlibdistclean openssldistclean + +tcldistclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tcl$(TCL_VERSION)/win distclean + +tkdistclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tk$(TCL_VERSION)/win distclean tkosdistclean : libxml2distclean zlibdistclean openssldistclean @echo "" -- cgit v0.12