diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-01-26 20:13:12 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-01-26 20:13:12 (GMT) |
| commit | 2e6c8635389c11e90bf4405aa115f21b80af07c3 (patch) | |
| tree | f8999a2a9b80af654e48cc79cf768768f59223ff /unix | |
| parent | 2130155e11bfabd3b51b10d5a0946bef4f4abbbf (diff) | |
| download | blt-2e6c8635389c11e90bf4405aa115f21b80af07c3.zip blt-2e6c8635389c11e90bf4405aa115f21b80af07c3.tar.gz blt-2e6c8635389c11e90bf4405aa115f21b80af07c3.tar.bz2 | |
simplify Makefile
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 681a8c0..399bda3 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -14,12 +14,12 @@ ARCH = @ARCH@ TKFLAGS = @TKFLAGS@ JOBS = @CORES@ -WITHTCL = --with-tcl=$(prefix)/tcl$(TCLVER)/unix -WITHTK = --with-tk=$(prefix)/tk$(TCLVER)/unix $(WITHTCL) -CACHE = --config-cache --cache-file=$(prefix)/config.cache - include ./make.include +WITHTCL = --with-tcl=$(prefix)/tcl$(TCL_VERSION)/unix +WITHTK = --with-tk=$(prefix)/tk$(TCL_VERSION)/unix $(WITHTCL) +CACHE = --config-cache --cache-file=$(prefix)/config.cache + #--------------------------build .PHONY : saods9 tcl tk @@ -31,29 +31,29 @@ saods9 : tcl tk \ tkmpeg tkhtml1 tkcon \ tksao ds9 -tcl : tcl$(TCLVER)/unix/Makefile +tcl : tcl$(TCL_VERSION)/unix/Makefile @echo "" - @echo "*** Install tcl$(TCLVER) ***" - $(MAKE) -C tcl$(TCLVER)/unix -j $(JOBS) install + @echo "*** Install tcl$(TCL_VERSION) ***" + $(MAKE) -C tcl$(TCL_VERSION)/unix -j $(JOBS) install -tcl$(TCLVER)/unix/Makefile : +tcl$(TCL_VERSION)/unix/Makefile : @echo "" - @echo "*** Configure tcl$(TCLVER) ***" - cd tcl$(TCLVER)/unix; \ + @echo "*** Configure tcl$(TCL_VERSION) ***" + cd tcl$(TCL_VERSION)/unix; \ ./configure \ --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ --config-cache --cache-file=$(prefix)/config.cache -tk : tk$(TCLVER)/unix/Makefile +tk : tk$(TCL_VERSION)/unix/Makefile @echo "" - @echo "*** Install tk$(TCLVER) ***" - $(MAKE) -C tk$(TCLVER)/unix -j $(JOBS) install + @echo "*** Install tk$(TCL_VERSION) ***" + $(MAKE) -C tk$(TCL_VERSION)/unix -j $(JOBS) install -tk$(TCLVER)/unix/Makefile : +tk$(TCL_VERSION)/unix/Makefile : @echo "" - @echo "*** Configure tk$(TCLVER) ***" - cd tk$(TCLVER)/unix; \ + @echo "*** Configure tk$(TCL_VERSION) ***" + cd tk$(TCL_VERSION)/unix; \ ./configure \ $(TKFLAGS) \ --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ @@ -77,5 +77,5 @@ tkunixdistclean : .PHONY : dist dist : - cd bin; tar cvf - ds9* | gzip > $(prefix)/dist/ds9.$(ARCH).$(DS9VERSION).tar.gz - cd bin; tar cvf - xpa* | gzip > $(prefix)/dist/xpa.$(ARCH).$(XPAVERSION).tar.gz + cd bin; tar cvf - ds9* | gzip > $(prefix)/dist/ds9.$(ARCH).$(DS9_VERSION).tar.gz + cd bin; tar cvf - xpa* | gzip > $(prefix)/dist/xpa.$(ARCH).$(XPA_VERSION).tar.gz |