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 /win | |
| parent | 2130155e11bfabd3b51b10d5a0946bef4f4abbbf (diff) | |
| download | blt-2e6c8635389c11e90bf4405aa115f21b80af07c3.zip blt-2e6c8635389c11e90bf4405aa115f21b80af07c3.tar.gz blt-2e6c8635389c11e90bf4405aa115f21b80af07c3.tar.bz2 | |
simplify Makefile
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 95c71bb..cb064e9 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -19,12 +19,13 @@ ASTFLAGS = CFLAGS=-DCMINPACK_NO_DLL XPAFLAGS = CFLAGS=-DSTATIC_BUILD TCLXMLFLAGS = --with-xml-static=yes TARGET = --build=x86_64-unknown-mingw32 -WITHTCL = --with-tcl=$(prefix)/tcl$(TCLVER)/win -WITHTK = --with-tk=$(prefix)/tk$(TCLVER)/win $(WITHTCL) -CACHE = --config-cache --cache-file=$(prefix)/config.cache include ./make.include +WITHTCL = --with-tcl=$(prefix)/tcl$(TCL_VERSION)/win +WITHTK = --with-tk=$(prefix)/tk$(TCL_VERSION)/win $(WITHTCL) +CACHE = --config-cache --cache-file=$(prefix)/config.cache + #--------------------------build .PHONY : saods9 tcl tk tkwin libxml2 libxslt zlib @@ -39,30 +40,30 @@ saods9 : tcl tk \ # posix- tclcheckdns tcliis tclsignal # no symbols -tcl : tcl$(TCLVER)/win/Makefile +tcl : tcl$(TCL_VERSION)/win/Makefile @echo "" - @echo "*** Install tcl$(TCLVER) ***" - $(MAKE) -C tcl$(TCLVER)/win -j $(JOBS) - $(MAKE) -C tcl$(TCLVER)/win install + @echo "*** Install tcl$(TCL_VERSION) ***" + $(MAKE) -C tcl$(TCL_VERSION)/win -j $(JOBS) + $(MAKE) -C tcl$(TCL_VERSION)/win install -tcl$(TCLVER)/win/Makefile : +tcl$(TCL_VERSION)/win/Makefile : @echo "" - @echo "*** Configure tcl$(TCLVER) ***" - cd tcl$(TCLVER)/win; \ + @echo "*** Configure tcl$(TCL_VERSION) ***" + cd tcl$(TCL_VERSION)/win; \ ./configure \ --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared \ --config-cache --cache-file=$(prefix)/config.cache -tk : tk$(TCLVER)/win/Makefile +tk : tk$(TCL_VERSION)/win/Makefile @echo "" - @echo "*** Install tk$(TCLVER) ***" - $(MAKE) -C tk$(TCLVER)/win -j $(JOBS) install + @echo "*** Install tk$(TCL_VERSION) ***" + $(MAKE) -C tk$(TCL_VERSION)/win -j $(JOBS) install -tk$(TCLVER)/win/Makefile : +tk$(TCL_VERSION)/win/Makefile : @echo "" - @echo "*** Configure tk$(TCLVER) ***" - cd tk$(TCLVER)/win; \ + @echo "*** Configure tk$(TCL_VERSION) ***" + cd tk$(TCL_VERSION)/win; \ ./configure \ $(WITHTCL) \ $(TKFLAGS) \ @@ -165,5 +166,5 @@ zlibdistclean : .PHONY : dist dist : all - cd bin; tar cvf - ds9$(EXEEXT) $(ZIPFILE) | gzip > dist/ds9.$(ARCH).$(DS9VERSION).tar.gz + cd bin; tar cvf - ds9$(EXEEXT) $(ZIPFILE) | gzip > dist/ds9.$(ARCH).$(DS9_VERSION).tar.gz |