From 1ea3cd7a5f436d8baa13fb53007773dcee637bd1 Mon Sep 17 00:00:00 2001 From: William Joye Date: Mon, 23 Mar 2020 16:09:03 -0400 Subject: libutil --- make.include | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 7 deletions(-) diff --git a/make.include b/make.include index 0a2e9e2..b0686a9 100644 --- a/make.include +++ b/make.include @@ -67,7 +67,7 @@ TKIMGTMPFILES = \ .NOTPARALLEL : .PHONY : all dirs ds9 tclfitsy tcliis tclxml tclzipfs tls xpa .PHONY : tkblt tkcon tkhtml1 tkimg tkmpeg tkagif tksao tktable -.PHONY : vector ast funtools openssl +.PHONY : util vector fitsy ast funtools openssl all : saods9 @@ -332,6 +332,23 @@ tksao/Makefile : $(STD) \ $(CACHE) +#-------------------------- util + +util : util/Makefile + @echo "" + @echo "*** $@ ***" + $(MAKE) -C util -j $(JOBS) install + +util/Makefile : + @echo "" + @echo "*** $@ ***" + cd util; \ + ./configure \ + $(WITHTCL) \ + $(PREFIX) \ + $(STD) \ + $(CACHE) + #-------------------------- vector vector : vector/Makefile @@ -349,6 +366,23 @@ vector/Makefile : $(STD) \ $(CACHE) +#-------------------------- fitsy + +fitsy : fitsy/Makefile + @echo "" + @echo "*** $@ ***" + $(MAKE) -C fitsy -j $(JOBS) install + +fitsy/Makefile : + @echo "" + @echo "*** $@ ***" + cd fitsy; \ + ./configure \ + $(WITHTCL) \ + $(PREFIX) \ + $(STD) \ + $(CACHE) + #-------------------------- ast ast : ast/Makefile ast/ast.h ast/.libs/libast.a ast/.libs/libast_err.a ast/.libs/libast_pal.a @@ -486,7 +520,9 @@ scrub : .PHONY : tclxmlclean tlsclean .PHONY : tkbltclean tkconclean tkhtml1clean tkimgclean .PHONY : tkmpegclean tkagifclean -.PHONY : tksaoclean vectorclean astclean funtoolsclean tktableclean xpaclean +.PHONY : tktableclean xpaclean +.PHONY : utilclean vectorclean fitsyclean astclean funtoolsclean +.PHONY : tksaoclean clean : tclclean tkclean \ opensslclean \ @@ -494,8 +530,8 @@ clean : tclclean tkclean \ tlsclean tclxmlclean xpaclean \ tkbltclean tkconclean tktableclean tkimgclean \ tkmpegclean tkagifclean tkhtml1clean \ - tksaoclean vectorclean astclean funtoolsclean ds9clean \ - osclean dirsclean localclean scrub + utilclean vectorclean fitsyclean astclean funtoolsclean ds9clean \ + tksaoclean osclean dirsclean localclean scrub dirsclean : @echo "" @@ -577,11 +613,21 @@ tksaoclean : @echo "*** $@ ***" $(MAKE) -C tksao clean +utilclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C util clean + vectorclean : @echo "" @echo "*** $@ ***" $(MAKE) -C vector clean +fitsyclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C fitsy clean + astclean : @echo "" @echo "*** $@ ***" @@ -609,8 +655,10 @@ xpaclean : .PHONY : tclxmldistclean tlsdistclean .PHONY : tkbltdistclean tkcondistclean tkhtml1distclean .PHONY : tkimgdistclean tkmpegdistclean tkagifdistclean -.PHONY : tksaodistclean vectordistclean astdistclean funtoolsdistclean .PHONY : tktabledistclean xpadistclean +.PHONY : utildistclean vectordistclean fitsydistclean +.PHONY : astdistclean funtoolsdistclean +.PHONY : tksaodistclean distclean : tcldistclean tkdistclean \ openssldistclean tclfitsydistclean tcliisdistclean \ @@ -618,9 +666,10 @@ distclean : tcldistclean tkdistclean \ tlsdistclean tclxmldistclean xpadistclean \ tkbltdistclean tktabledistclean tkcondistclean tkimgdistclean \ tkmpegdistclean tkagifdistclean tkhtml1distclean \ - tksaodistclean vectordistclean astdistclean \ + utildistclean vectordistclean fitsydistclean astdistclean \ + vectordistclean fitsydistclean astdistclean \ funtoolsdistclean ds9distclean \ - osdistclean dirsdistclean localdistclean scrub + tksaodistclean osdistclean dirsdistclean localdistclean scrub dirsdistclean: @echo "" @@ -723,11 +772,21 @@ astdistclean : @echo "*** $@ ***" $(MAKE) -C ast distclean +utildistclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C util distclean + vectordistclean : @echo "" @echo "*** $@ ***" $(MAKE) -C vector distclean +fitsydistclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C fitsy distclean + funtoolsdistclean : @echo "" @echo "*** $@ ***" -- cgit v0.12