diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-01-30 18:34:10 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-01-30 18:34:10 (GMT) |
| commit | f769fff827484f7c1e4ee44a44593cf58c91351e (patch) | |
| tree | c02c5eb2f1264ada5823acce36ee70e190760490 | |
| parent | d974854609e78476964383aa9404b4a3b32efcf2 (diff) | |
| download | blt-f769fff827484f7c1e4ee44a44593cf58c91351e.zip blt-f769fff827484f7c1e4ee44a44593cf58c91351e.tar.gz blt-f769fff827484f7c1e4ee44a44593cf58c91351e.tar.bz2 | |
simplify build
| -rw-r--r-- | ds9/unix/Makefile.in | 4 | ||||
| -rw-r--r-- | make.include | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in index e93a345..cd7bc72 100644 --- a/ds9/unix/Makefile.in +++ b/ds9/unix/Makefile.in @@ -80,7 +80,7 @@ OBJS = ds9.o tkAppInit.o #--------------------------main .NOTPARALLEL : -.PHONY : ds9 debug appdir framework tcl tk tcllib tkcon tkblt +.PHONY : ds9 debug framework tcl tk tcllib tkcon tkblt ifeq (,$(findstring Darwin,$(system))) @@ -152,7 +152,7 @@ ds9base : $(OBJS) $(TK_LIBS) \ $(LIBS) -ds9.zip : appdir framework tcl tk tcllib tkblt tkcon +ds9.zip : $(APPDIR) framework tcl tk tcllib tkblt tkcon $(RM) $@ zip -r ds9.zip $(APPDIR) diff --git a/make.include b/make.include index 62614df..770711f 100644 --- a/make.include +++ b/make.include @@ -66,12 +66,12 @@ dirs : #-------------------------- ds9 -ds9 : scrub ds9/$(OS)/Makefile +ds9 : ds9/$(OS)/Makefile @echo "" @echo "*** Installing ds9 ***" $(MAKE) -C ds9/$(OS) -j $(JOBS) -debug : scrub ds9/$(OS)/Makefile +debug : ds9/$(OS)/Makefile @echo "" @echo "*** Installing ds9 ***" $(MAKE) -C ds9/$(OS) -j $(JOBS) debug @@ -426,7 +426,7 @@ language: scrub : find . -name "*[~#]" -exec rm {} \; - find . -name "autom4te.cache" -exec rm -rf {} \; + find . -d -name "autom4te.cache" -exec rm -rf {} \; #-------------------------- clean @@ -437,7 +437,8 @@ scrub : .PHONY : tkclean tkbltclean tkconclean tkhtml1clean tkimgclean .PHONY : tkmpegclean tksaoclean astclean funtoolsclean tktableclean xpaclean -clean : dirsclean tclclean tkclean \ +clean : scrub dirsclean \ + tclclean tkclean \ tclcheckdnsclean tcliisclean tclsignalclean \ tclzvfsclean tclxmlclean xpaclean \ tkbltclean tkconclean tktableclean tkimgclean \ @@ -521,7 +522,7 @@ distclean : tcldistclean tkdistclean \ tkbltdistclean tktabledistclean tkimgdistclean \ tkmpegdistclean tkhtml1distclean \ tksaodistclean astdistclean funtoolsdistclean ds9distclean \ - dirsdistclean localdistclean + dirsdistclean localdistclean scrub dirsdistclean: @for d in $(DIRS); do rm -rf $$d; done |