diff options
| -rw-r--r-- | macos/Makefile.in | 36 | ||||
| -rw-r--r-- | make.include | 53 | ||||
| -rw-r--r-- | unix/Makefile.in | 36 |
3 files changed, 54 insertions, 71 deletions
diff --git a/macos/Makefile.in b/macos/Makefile.in index 1bfa383..46c6c68 100644 --- a/macos/Makefile.in +++ b/macos/Makefile.in @@ -13,7 +13,7 @@ OS = @OS@ ARCH = @ARCH@ JOBS = @CORES@ -TLSFLAGS = --with-ssl-dir=$(prefix)/openssl +SSLCONFIG = ./config include ./make.include @@ -39,7 +39,7 @@ TKFILES = \ #--------------------------build -.PHONY : saods9 tcl tk tkmacosx openssl +.PHONY : saods9 tcl tk tkmacosx saods9 : dirs tcl tk \ openssl \ @@ -123,19 +123,6 @@ tclsignal/Makefile : $(STD) \ $(CACHE) -#--------------------------openssl - -openssl : openssl/Makefile - @echo "" - @echo "*** $@ ***" - $(MAKE) -C openssl -j $(JOBS) - -openssl/Makefile: - @echo "" - @echo "*** $@ ***" - cd openssl; \ - ./config --prefix=$(prefix) - #-------------------------- tkmacosx tkmacosx: tkmacosx/Makefile @@ -155,7 +142,7 @@ tkmacosx/Makefile : #--------------------------clean -.PHONY : tclclean tkclean osclean tclsignalclean tkmacosxclean opensslclean +.PHONY : tclclean tkclean osclean tclsignalclean tkmacosxclean tclclean : @echo "" @@ -167,7 +154,7 @@ tkclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/macosx clean -osclean : tclsignalclean tkmacosxclean opensslclean +osclean : tclsignalclean tkmacosxclean tclsignalclean : @echo "" @@ -179,14 +166,9 @@ tkmacosxclean : @echo "*** $@ ***" $(MAKE) -C tkmacosx clean -opensslclean: - @echo "" - @echo "*** $@ ***" - $(MAKE) -C openssl clean - #--------------------------distclean -.PHONY : tcldistclean tkdistclean openssldistclean +.PHONY : tcldistclean tkdistclean .PHONY : osdistclean tclsignaldistclean tkmacosxdistclean tcldistclean : @@ -199,7 +181,7 @@ tkdistclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/macosx distclean -osdistclean : tclsignaldistclean tkmacosxdistclean openssldistclean +osdistclean : tclsignaldistclean tkmacosxdistclean tclsignaldistclean : @echo "" @@ -212,12 +194,6 @@ tkmacosxdistclean : @echo "*** $@ ***" $(MAKE) -C tkmacosx distclean -openssldistclean : - @echo "" - @echo "*** $@ ***" - $(MAKE) -C openssl clean - rm -f openssl/Makefile - #--------------------------distribution .PHONY : dist diff --git a/make.include b/make.include index 6976bea..39d0f3a 100644 --- a/make.include +++ b/make.include @@ -66,7 +66,7 @@ TKIMGTMPFILES = \ .NOTPARALLEL : .PHONY : all dirs ds9 tcliis tclxml tclzipfs tls xpa .PHONY : tkblt tkcon tkhtml1 tkimg tkmpeg tkagif tksao tktable -.PHONY : ast funtools +.PHONY : ast funtools openssl all : saods9 @@ -99,6 +99,19 @@ ds9/$(OS)/Makefile : $(STD) \ $(CACHE) +#--------------------------openssl + +openssl : openssl/Makefile + @echo "" + @echo "*** $@ ***" + $(MAKE) -C openssl -j $(JOBS) + +openssl/Makefile: + @echo "" + @echo "*** $@ ***" + cd openssl; \ + $(SSLCONFIG) --prefix=$(prefix) + #-------------------------- tcliis tcliis : tcliis/Makefile @@ -148,7 +161,8 @@ tls/Makefile : @echo "*** $@ ***" cd tls; \ ./configure \ - $(TLSFLAGS) \ + --with-ssl-dir=$(prefix)/openssl \ + $(TLSFLAGS) \ $(WITHTCL) \ $(PREFIX) \ $(STD) @@ -434,13 +448,14 @@ scrub : .PHONY : clean .PHONY : dirsclean ds9clean ds9parsersclean localclean -.PHONY : tcliisclean +.PHONY : opensslclean tcliisclean .PHONY : tclxmlclean tlsclean .PHONY : tkbltclean tkconclean tkhtml1clean tkimgclean .PHONY : tkmpegclean tkagifclean .PHONY : tksaoclean astclean funtoolsclean tktableclean xpaclean clean : tclclean tkclean \ + opensslclean \ tcliisclean \ tlsclean tclxmlclean xpaclean \ tkbltclean tkconclean tktableclean tkimgclean \ @@ -468,6 +483,11 @@ localclean : @echo "*** $@ ***" -rm -f core *~ *# +opensslclean: + @echo "" + @echo "*** $@ ***" + $(MAKE) -C openssl clean + tcliisclean : @echo "" @echo "*** $@ ***" @@ -541,7 +561,7 @@ xpaclean : #-------------------------- distclean .PHONY : dirsdistclean ds9distclean localdistclean -.PHONY : tcliisdistclean +.PHONY : openssldistclean tcliisdistclean .PHONY : tclxmldistclean tlsdistclean .PHONY : tkbltdistclean tkcondistclean tkhtml1distclean .PHONY : tkimgdistclean tkmpegdistclean tkagifdistclean @@ -549,12 +569,12 @@ xpaclean : .PHONY : tktabledistclean xpadistclean distclean : tcldistclean tkdistclean \ - tcliisdistclean tclsignaldistclean \ - tlsdistclean tclxmldistclean xpadistclean \ - tkbltdistclean tktabledistclean tkcondistclean tkimgdistclean \ - tkmpegdistclean tkagifdistclean tkhtml1distclean \ - tksaodistclean astdistclean funtoolsdistclean ds9distclean \ - osdistclean dirsdistclean localdistclean scrub + openssldistclean tcliisdistclean tclsignaldistclean \ + tlsdistclean tclxmldistclean xpadistclean \ + tkbltdistclean tktabledistclean tkcondistclean tkimgdistclean \ + tkmpegdistclean tkagifdistclean tkhtml1distclean \ + tksaodistclean astdistclean funtoolsdistclean ds9distclean \ + osdistclean dirsdistclean localdistclean scrub dirsdistclean: @echo "" @@ -572,6 +592,19 @@ localdistclean : -rm -f core *~ *# -rm -f config.log config.status config.cache Makefile +openssldistclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C openssl clean + rm -f openssl/Makefile + rm -rf openssl/include + rm -f openssl/crypto/opensslconf.h + rm -f openssl/apps/CA.pl + rm -f openssl/tools/c_rehash + find openssl/test -type l -exec rm {} \; + find openssl/apps -type l -exec rm {} \; + find openssl/certs/demo -type l -exec rm {} \; + tcliisdistclean : @echo "" @echo "*** $@ ***" diff --git a/unix/Makefile.in b/unix/Makefile.in index ae5d66d..b540e31 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -15,8 +15,6 @@ TKFLAGS = @TKFLAGS@ SSLCONFIG = @SSLCONFIG@ JOBS = @CORES@ -TLSFLAGS = --with-ssl-dir=$(prefix)/openssl - include ./make.include WITHTCL = --with-tcl=$(prefix)/tcl$(TCL_VERSION)/unix @@ -25,7 +23,7 @@ CACHE = --config-cache --cache-file=$(prefix)/config.cache #--------------------------build -.PHONY : saods9 tcl tk openssl +.PHONY : saods9 tcl tk saods9 : dirs tcl tk \ openssl \ @@ -98,22 +96,9 @@ tclsignal/Makefile : $(STD) \ $(CACHE) -#--------------------------openssl - -openssl : openssl/Makefile - @echo "" - @echo "*** $@ ***" - $(MAKE) -C openssl -j $(JOBS) - -openssl/Makefile: - @echo "" - @echo "*** $@ ***" - cd openssl; \ - $(SSLCONFIG) --prefix=$(prefix) - #--------------------------clean -.PHONY : tclclean tkclean osclean tclzipfsclean tclsignalclean opensslclean +.PHONY : tclclean tkclean osclean tclzipfsclean tclsignalclean tclclean : @echo "" @@ -125,7 +110,7 @@ tkclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/unix clean -osclean : tclzipfsclean tclsignalclean opensslclean +osclean : tclzipfsclean tclsignalclean tclzipfsclean: @echo "" @@ -137,15 +122,10 @@ tclsignalclean : @echo "*** $@ ***" $(MAKE) -C tclsignal clean -opensslclean: - @echo "" - @echo "*** $@ ***" - $(MAKE) -C openssl clean - #--------------------------distclean .PHONY : tcldistclean tkdistclean -.PHONY : osdistclean tclzipfsdistclean tclsignaldistclean openssldistclean +.PHONY : osdistclean tclzipfsdistclean tclsignaldistclean tcldistclean : @echo "" @@ -157,7 +137,7 @@ tkdistclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/unix distclean -osdistclean : tclzipfsdistclean tclsignaldistclean openssldistclean +osdistclean : tclzipfsdistclean tclsignaldistclean tclzipfsdistclean: @echo "" @@ -171,12 +151,6 @@ tclsignaldistclean : $(MAKE) -C tclsignal distclean rm -f tclsignal/tclsignalConfig.sh -openssldistclean : - @echo "" - @echo "*** $@ ***" - $(MAKE) -C openssl clean - rm -f openssl/Makefile - #--------------------------distribution .PHONY : dist |