diff options
| -rw-r--r-- | macos/Makefile.in | 38 | ||||
| -rw-r--r-- | make.include | 36 | ||||
| -rw-r--r-- | unix/Makefile.in | 36 |
3 files changed, 70 insertions, 40 deletions
diff --git a/macos/Makefile.in b/macos/Makefile.in index b123463..bb51181 100644 --- a/macos/Makefile.in +++ b/macos/Makefile.in @@ -104,6 +104,25 @@ tk$(TCL_VERSION)/macosx/Makefile : --enable-symbols \ $(CACHE) +#-------------------------- tclsignal + +tclsignal: tclsignal/Makefile + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tclsignal install + +tclsignal/Makefile : + @echo "" + @echo "*** $@ ***" + cd tclsignal; \ + ./configure \ + $(WITHTCL) \ + $(PREFIX) \ + $(STD) \ + $(CACHE) + +#-------------------------- tkmacosx + tkmacosx: tkmacosx/Makefile @echo "" @echo "*** $@ ***" @@ -121,7 +140,7 @@ tkmacosx/Makefile : #--------------------------clean -.PHONY : tclclean tkclean tkosclean +.PHONY : tclclean tkclean tkosclean tclsignalclean tclclean : @echo "" @@ -133,14 +152,19 @@ tkclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/macosx clean -tkosclean : +tkosclean : tclsignalclean @echo "" @echo "*** $@ ***" $(MAKE) -C tkmacosx clean +tclsignalclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tclsignal clean + #--------------------------distclean -.PHONY : tcldistclean tkdistclean tkosdistclean +.PHONY : tcldistclean tkdistclean tkosdistclean tclsignaldistclean tcldistclean : @echo "" @@ -152,11 +176,17 @@ tkdistclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/macosx distclean -tkosdistclean : +tkosdistclean : tclsignaldistclean @echo "" @echo "*** $@ ***" $(MAKE) -C tkmacosx distclean +tclsignaldistclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tclsignal distclean + rm -f tclsignal/tclsignalConfig.sh + #--------------------------distribution .PHONY : dist diff --git a/make.include b/make.include index 9694201..cfb2b14 100644 --- a/make.include +++ b/make.include @@ -51,7 +51,7 @@ TKIMGTMPFILES = \ #-------------------------- main .NOTPARALLEL : -.PHONY : all dirs ds9 tcliis tclsignal tclxml tclzipfs tls xpa +.PHONY : all dirs ds9 tcliis tclxml tclzipfs tls xpa .PHONY : tkblt tkcon tkhtml1 tkimg tkmpeg tksao tktable .PHONY : ast funtools @@ -103,23 +103,6 @@ tcliis/Makefile : $(STD) \ $(CACHE) -#-------------------------- tclsignal - -tclsignal: tclsignal/Makefile - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tclsignal install - -tclsignal/Makefile : - @echo "" - @echo "*** $@ ***" - cd tclsignal; \ - ./configure \ - $(WITHTCL) \ - $(PREFIX) \ - $(STD) \ - $(CACHE) - #-------------------------- tclxml # no parallel @@ -416,13 +399,13 @@ scrub : .PHONY : clean .PHONY : dirsclean ds9clean ds9parsersclean localclean -.PHONY : tcliisclean tclsignalclean +.PHONY : tcliisclean .PHONY : tclxmlclean tlsclean .PHONY : tkbltclean tkconclean tkhtml1clean tkimgclean .PHONY : tkmpegclean tksaoclean astclean funtoolsclean tktableclean xpaclean clean : tclclean tkclean \ - tcliisclean tclsignalclean \ + tcliisclean \ tlsclean tclxmlclean xpaclean \ tkbltclean tkconclean tktableclean tkimgclean \ tkmpegclean tkhtml1clean \ @@ -454,11 +437,6 @@ tcliisclean : @echo "*** $@ ***" $(MAKE) -C tcliis clean -tclsignalclean : - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tclsignal clean - tclxmlclean: @echo "" @echo "*** $@ ***" @@ -522,7 +500,7 @@ xpaclean : #-------------------------- distclean .PHONY : dirsdistclean ds9distclean localdistclean -.PHONY : tcliisdistclean tclsignaldistclean +.PHONY : tcliisdistclean .PHONY : tclxmldistclean tlsdistclean .PHONY : tkbltdistclean tkcondistclean tkhtml1distclean .PHONY : tkimgdistclean tkmpegdistclean @@ -559,12 +537,6 @@ tcliisdistclean : $(MAKE) -C tcliis distclean rm -f tcliis/tcliisConfig.sh -tclsignaldistclean : - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tclsignal distclean - rm -f tclsignal/tclsignalConfig.sh - tclxmldistclean: @echo "" @echo "*** $@ ***" diff --git a/unix/Makefile.in b/unix/Makefile.in index 4b1a5a4..d29fa3b 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -78,9 +78,26 @@ tclzipfs/Makefile : $(STD) \ $(CACHE) +#-------------------------- tclsignal + +tclsignal: tclsignal/Makefile + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tclsignal install + +tclsignal/Makefile : + @echo "" + @echo "*** $@ ***" + cd tclsignal; \ + ./configure \ + $(WITHTCL) \ + $(PREFIX) \ + $(STD) \ + $(CACHE) + #--------------------------clean -.PHONY : tclclean tkclean tkosclean tclzipfsclean +.PHONY : tclclean tkclean tkosclean tclzipfsclean tclsignalclean tclclean : @echo "" @@ -92,7 +109,7 @@ tkclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/unix clean -tkosclean : tclzipfsclean +tkosclean : tclzipfsclean tclsignalclean @echo "" @echo "*** $@ ***" @@ -101,9 +118,14 @@ tclzipfsclean: @echo "*** $@ ***" $(MAKE) -C tclzipfs clean +tclsignalclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tclsignal clean + #--------------------------distclean -.PHONY : tcldistclean tkdistclean tkosdistclean tclzipfsdistclean +.PHONY : tcldistclean tkdistclean tkosdistclean tclzipfsdistclean tclsignaldistclean tcldistclean : @echo "" @@ -115,7 +137,7 @@ tkdistclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/unix distclean -tkosdistclean : tclzipfsdistclean +tkosdistclean : tclzipfsdistclean tclsignaldistclean @echo "" @echo "*** $@ ***" @@ -125,6 +147,12 @@ tclzipfsdistclean: $(MAKE) -C tclzipfs distclean rm -f tclzipfs/tclzipfsConfig.sh +tclsignaldistclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C tclsignal distclean + rm -f tclsignal/tclsignalConfig.sh + #--------------------------distribution .PHONY : dist |