--- SAOImageDS9/make.include.orig 2022-12-16 23:30:11.000000000 +0100 +++ SAOImageDS9/make.include 2023-01-18 22:17:11.140466543 +0100 @@ -30,7 +30,6 @@ # openssl 1.0.2u DS9_VERSION = 8.4.1 -XPA_VERSION = 2.1.20 TCL_VERSION = 8.6 Tidy = \ @@ -51,29 +50,12 @@ PREFIX = --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) STD = --disable-shared --disable-stubs --enable-symbols -#-------------------------- tkimg tmp files - -TKIMGTMPFILES = \ - tkimg/libjpeg/libjpeg \ - tkimg/libtiff/build \ - tkimg/libtiff/contrib \ - tkimg/libtiff/html \ - tkimg/libtiff/libtiff \ - tkimg/libtiff/libtool \ - tkimg/libtiff/man \ - tkimg/libtiff/mkg3states \ - tkimg/libtiff/mkg3states.dSYM \ - tkimg/libtiff/port \ - tkimg/libtiff/test \ - tkimg/libtiff/tif_fax3sm.c \ - tkimg/libtiff/tools - #-------------------------- main .NOTPARALLEL : -.PHONY : all dirs ds9 tcliis tclxml tclzipfs tls xpa -.PHONY : tkblt tclfitsy tkcon tkhtml1 tkimg tkmpeg tksvg tkagif tksao tktable -.PHONY : util vector fitsy ast funtools openssl +.PHONY : all dirs ds9 tcliis tclxml +.PHONY : tclfitsy tkcon tkhtml1 tkmpeg tksvg tkagif tksao tktable +.PHONY : util vector fitsy ast funtools all : saods9 @@ -109,17 +91,6 @@ #--------------------------openssl -openssl : openssl/Makefile - @echo "" - @echo "*** $@ ***" - $(MAKE) -C openssl -j $(JOBS) - -openssl/Makefile: - @echo "" - @echo "*** $@ ***" - cd openssl; \ - $(SSLCONFIG) --prefix=$(prefix) - #-------------------------- tclfitsy tclfitsy: tclfitsy/Makefile @@ -173,61 +144,15 @@ $(PREFIX) \ $(STD) \ $(CACHE) - + #-------------------------- tls -# no cache (win) -tls : tls/Makefile - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tls install - -tls/Makefile : - @echo "" - @echo "*** $@ ***" - cd tls; \ - ./configure \ - --with-ssl-dir=$(prefix)/openssl \ - $(TLSFLAGS) \ - $(WITHTCL) \ - $(PREFIX) \ - $(STD) #-------------------------- xpa -# no config.cache -xpa : xpa/Makefile - @echo "" - @echo "*** $@ ***" - $(MAKE) -C xpa -j $(JOBS) install - -xpa/Makefile : - @echo "" - @echo "*** $@ ***" - cd xpa; \ - ./configure \ - $(CONFIGFLAGS) $(TARGET) $(XPAFLAGS) \ - $(WITHTCL) \ - $(PREFIX) \ - $(STD) \ - --with-x=disabled #-------------------------- tkblt -tkblt : tkblt/Makefile - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tkblt -j $(JOBS) install - -tkblt/Makefile : - @echo "" - @echo "*** $@ ***" - cd tkblt; \ - ./configure \ - $(WITHTK) \ - $(PREFIX) \ - $(STD) \ - $(CACHE) #-------------------------- tkcon @@ -245,6 +170,8 @@ $(PREFIX) \ $(CACHE) + + #-------------------------- tkhtml1 # no parallel @@ -267,27 +194,6 @@ #-------------------------- tkimg -tkimg : tkimg/Makefile - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tkimg -j $(JOBS) all - $(MAKE) -C tkimg/base -j $(JOBS) install - $(MAKE) -C tkimg/tiff -j $(JOBS) install - $(MAKE) -C tkimg/libtiff -j $(JOBS) install - $(MAKE) -C tkimg/jpeg -j $(JOBS) install - $(MAKE) -C tkimg/libjpeg -j $(JOBS) install - $(MAKE) -C tkimg/window -j $(JOBS) install - $(MAKE) -C tkimg/zlib -j $(JOBS) install - -# no config.cache -tkimg/Makefile : - @echo "" - @echo "*** $@ ***" - cd tkimg; \ - ./configure \ - $(WITHTK) \ - $(PREFIX) \ - $(STD) #-------------------------- tkmpeg @@ -550,19 +456,18 @@ .PHONY : clean .PHONY : dirsclean ds9clean ds9parsersclean localclean -.PHONY : opensslclean tcliisclean -.PHONY : tclxmlclean tlsclean -.PHONY : tkbltclean tclfitsy tkconclean tkhtml1clean tkimgclean +.PHONY : tcliisclean +.PHONY : tclxmlclean +.PHONY : tclfitsy tkconclean tkhtml1clean .PHONY : tkmpegclean tksvgclean tkagifclean -.PHONY : tktableclean xpaclean +.PHONY : tktableclean .PHONY : utilclean vectorclean fitsyclean astclean funtoolsclean .PHONY : tksaoclean -clean : tclclean tkclean \ - opensslclean \ +clean : tkclean \ tcliisclean \ - tlsclean tclxmlclean xpaclean \ - tkbltclean tclfitsy tkconclean tktableclean tkimgclean \ + tclxmlclean \ + tclfitsy tkconclean tktableclean \ tkmpegclean tksvgclean tkagifclean tkhtml1clean \ utilclean vectorclean fitsyclean astclean funtoolsclean ds9clean \ tksaoclean osclean dirsclean localclean scrub @@ -587,11 +492,6 @@ @echo "*** $@ ***" -rm -f core *~ *# -opensslclean: - @echo "" - @echo "*** $@ ***" - $(MAKE) -C openssl clean - tclfitsyclean : @echo "" @echo "*** $@ ***" @@ -606,17 +506,7 @@ @echo "" @echo "*** $@ ***" $(MAKE) -C tclxml clean - -tlsclean: - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tls clean - -tkbltclean: - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tkblt clean - + tkconclean: @echo "" @echo "*** $@ ***" @@ -627,11 +517,6 @@ @echo "*** $@ ***" $(MAKE) -C tkhtml1 clean -tkimgclean: - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tkimg clean - tkmpegclean: @echo "" @echo "*** $@ ***" @@ -682,29 +567,24 @@ @echo "*** $@ ***" $(MAKE) -C tktable clean -xpaclean : - @echo "" - @echo "*** $@ ***" - $(MAKE) -C xpa clean #-------------------------- distclean .PHONY : dirsdistclean ds9distclean localdistclean -.PHONY : openssldistclean tcliisdistclean -.PHONY : tclxmldistclean tlsdistclean -.PHONY : tkbltdistclean tclfitsydistclean tkcondistclean tkhtml1distclean -.PHONY : tkimgdistclean tkmpegdistclean tksvgdistclean tkagifdistclean -.PHONY : tktabledistclean xpadistclean +.PHONY : tcliisdistclean +.PHONY : tclxmldistclean +.PHONY : tclfitsydistclean tkcondistclean tkhtml1distclean +.PHONY : tkmpegdistclean tksvgdistclean tkagifdistclean +.PHONY : tktabledistclean .PHONY : utildistclean vectordistclean fitsydistclean .PHONY : astdistclean funtoolsdistclean .PHONY : tksaodistclean -distclean : tcldistclean tkdistclean \ - openssldistclean tcliisdistclean \ +distclean : tcliisdistclean \ tclsignaldistclean \ - tlsdistclean tclxmldistclean xpadistclean \ - tkbltdistclean tclfitsydistclean tktabledistclean \ - tkcondistclean tkimgdistclean \ + tclxmldistclean \ + tclfitsydistclean tktabledistclean \ + tkcondistclean \ tkmpegdistclean tksvgdistclean tkagifdistclean tkhtml1distclean \ utildistclean vectordistclean fitsydistclean astdistclean \ vectordistclean fitsydistclean astdistclean \ @@ -727,19 +607,6 @@ -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 {} \; - tclfitsydistclean : @echo "" @echo "*** $@ ***" @@ -758,23 +625,12 @@ $(MAKE) -C tclxml distclean rm -f tclxml/tclxmlConfig.sh rm -f tclxml/include/tclxml/tclxml.h - -tlsdistclean: - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tls distclean - rm -f tls/tlsConfig.sh - + tkcondistclean: @echo "" @echo "*** $@ ***" $(MAKE) -C tkcon distclean -tkbltdistclean: - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tkblt distclean - rm -f tkblt/tkbltConfig.sh tkhtml1distclean: @echo "" @@ -782,14 +638,6 @@ $(MAKE) -C tkhtml1 distclean rm -f tkhtml1/tkhtml1Config.sh -tkimgdistclean: - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tkimg distclean - find tkimg -name "pkgIndex.tcl" -exec rm {} \; - find tkimg -name "*Config.sh" -exec rm {} \; - rm -rf $(TKIMGTMPFILES) - tkmpegdistclean: @echo "" @echo "*** $@ ***" @@ -847,9 +695,3 @@ @echo "*** $@ ***" $(MAKE) -C tktable distclean rm -f tktable/tktableConfig.sh - -xpadistclean : - @echo "" - @echo "*** $@ ***" - $(MAKE) -C xpa distclean -