From 1bbcadbbf51acf6737841266505cb3a230ca690f Mon Sep 17 00:00:00 2001 From: William Joye Date: Tue, 9 May 2017 17:25:51 -0400 Subject: final push for beta release --- macos/Makefile.in | 8 ++++---- macos/configure | 2 +- macos/configure.ac | 2 +- make.include | 4 ++-- unix/Makefile.in | 8 ++++---- win/Makefile.in | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/macos/Makefile.in b/macos/Makefile.in index b557595..f4293c7 100644 --- a/macos/Makefile.in +++ b/macos/Makefile.in @@ -121,18 +121,18 @@ tkmacosx/Makefile : #--------------------------clean -.PHONY : tkmacosxclean +.PHONY : tkosclean -tkmacosxclean : +tkosclean : @echo "" @echo "*** $@ ***" $(MAKE) -C tkmacosx clean #--------------------------distclean -.PHONY : tkmacosxdistclean +.PHONY : tkosdistclean -tkmacosxdistclean : +tkosdistclean : @echo "" @echo "*** $@ ***" $(MAKE) -C tkmacosx distclean diff --git a/macos/configure b/macos/configure index a98aa7b..5ac0bd4 100755 --- a/macos/configure +++ b/macos/configure @@ -1853,7 +1853,7 @@ else fi -OS="macosx" +OS="macos" ARCH=$with_arch diff --git a/macos/configure.ac b/macos/configure.ac index e5abba6..db692da 100755 --- a/macos/configure.ac +++ b/macos/configure.ac @@ -35,7 +35,7 @@ AC_CONFIG_AUX_DIR(../tclconfig) AC_ARG_WITH([arch],AC_HELP_STRING([--with-arch],[build name]),[],[with_arch=unknown]) -OS="macosx" +OS="macos" AC_SUBST(OS) ARCH=$with_arch diff --git a/make.include b/make.include index 3c48b07..ed4e1d6 100644 --- a/make.include +++ b/make.include @@ -463,7 +463,7 @@ clean : tclclean tkclean \ tkbltclean tkconclean tktableclean tkimgclean \ tkmpegclean tkhtml1clean \ tksaoclean astclean funtoolsclean ds9clean \ - tk$(OS)clean dirsclean localclean scrub + tkosclean dirsclean localclean scrub dirsclean : @echo "" @@ -586,7 +586,7 @@ distclean : tcldistclean tkdistclean \ tkbltdistclean tktabledistclean tkcondistclean tkimgdistclean \ tkmpegdistclean tkhtml1distclean \ tksaodistclean astdistclean funtoolsdistclean ds9distclean \ - tk$(OS)distclean dirsdistclean localdistclean scrub + tkosdistclean dirsdistclean localdistclean scrub dirsdistclean: @echo "" diff --git a/unix/Makefile.in b/unix/Makefile.in index 749e592..86195f9 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -63,17 +63,17 @@ tk$(TCL_VERSION)/unix/Makefile : #--------------------------clean -.PHONY : tkunixclean +.PHONY : tkosclean -tkunixclean : +tkosclean : @echo "" @echo "*** $@ ***" #--------------------------distclean -.PHONY : tkunixdistclean +.PHONY : tkosdistclean -tkunixdistclean : +tkosdistclean : @echo "" @echo "*** $@ ***" diff --git a/win/Makefile.in b/win/Makefile.in index bea959a..38a5878 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -135,9 +135,9 @@ openssl/Makefile: #--------------------------clean -.PHONY : tkwinclean libxml2clean zlibclean opensslclean +.PHONY : tkosclean libxml2clean zlibclean opensslclean -tkwinclean : libxml2clean zlibclean opensslclean +tkosclean : libxml2clean zlibclean opensslclean @echo "" @echo "*** $@ ***" $(MAKE) -C tkwin clean @@ -159,9 +159,9 @@ opensslclean: #--------------------------distclean -.PHONY : tkwindistclean libxml2distclean zlibdistclean openssldistclean +.PHONY : tkosdistclean libxml2distclean zlibdistclean openssldistclean -tkwindistclean : libxml2distclean zlibdistclean openssldistclean +tkosdistclean : libxml2distclean zlibdistclean openssldistclean @echo "" @echo "*** $@ ***" $(MAKE) -C tkwin distclean -- cgit v0.12