diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2016-12-30 18:10:41 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2016-12-30 18:10:41 (GMT) |
| commit | 454d54117e4b941dcf36ef15c8b56d7a1df9911d (patch) | |
| tree | a5431e0622ab1c4b042e7cb29e9621dc4f2ce39f | |
| parent | 7ca4bd29dc25c22094a0d55ac098de0d9b81e588 (diff) | |
| download | blt-454d54117e4b941dcf36ef15c8b56d7a1df9911d.zip blt-454d54117e4b941dcf36ef15c8b56d7a1df9911d.tar.gz blt-454d54117e4b941dcf36ef15c8b56d7a1df9911d.tar.bz2 | |
clean up config files
| -rw-r--r-- | ds9/macosx/Makefile.in | 5 | ||||
| -rw-r--r-- | ds9/unix/Makefile.in | 21 | ||||
| -rwxr-xr-x | ds9/win/Makefile.in | 9 |
3 files changed, 19 insertions, 16 deletions
diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in index 6099233..1f3b8c3 100644 --- a/ds9/macosx/Makefile.in +++ b/ds9/macosx/Makefile.in @@ -10,6 +10,7 @@ mandir = @mandir@ include $(prefix)/make.pkgs +TCL_VERSION = @TCL_VERSION@ TCL_LIB_SPEC = @TCL_LIB_SPEC@ TCL_STUB_LIB_SPEC= @TCL_STUB_LIB_SPEC@ TK_LIBS = @TK_LIBS@ @@ -118,8 +119,8 @@ tkAppInit.o : tkAppInit.c $(COMPILE) -DTK_LOCAL_APPINIT=SAOAppInit \ -DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook -c tkAppInit.c -o $@ -tkAppInit.c : $(prefix)/tk$(TCLVER)/unix/tkAppInit.c - cp $(prefix)/tk$(TCLVER)/unix/tkAppInit.c . +tkAppInit.c : $(prefix)/tk$(TCL_VERSION)/unix/tkAppInit.c + cp $(prefix)/tk$(TCL_VERSION)/unix/tkAppInit.c . ds9base : $(OBJS) $(LLIBS) $(RM) $@ diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in index 3415782..fe072a6 100644 --- a/ds9/unix/Makefile.in +++ b/ds9/unix/Makefile.in @@ -10,6 +10,7 @@ mandir = @mandir@ include $(prefix)/make.pkgs +TCL_VERSION = @TCL_VERSION@ TCL_LIB_SPEC = @TCL_LIB_SPEC@ TCL_STUB_LIB_SPEC= @TCL_STUB_LIB_SPEC@ TK_LIBS = @TK_LIBS@ @@ -50,9 +51,9 @@ ZDIR = zvfsmntpt OBJS = ds9.o tkAppInit.o FILES = \ - $(ZDIR)/tcl$(TCLVER) \ + $(ZDIR)/tcl$(TCL_VERSION) \ $(ZDIR)/tcl8 \ - $(ZDIR)/tk$(TCLVER) \ + $(ZDIR)/tk$(TCL_VERSION) \ $(ZDIR)/tkblt \ $(ZDIR)/tcllib \ $(ZDIR)/tkcon \ @@ -151,25 +152,25 @@ tkAppInit.o : tkAppInit.c $(COMPILE) -DTK_LOCAL_APPINIT=SAOAppInit \ -DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook -c tkAppInit.c -o $@ -tkAppInit.c : ../../tk$(TCLVER)/unix/tkAppInit.c - cp ../../tk$(TCLVER)/unix/tkAppInit.c . +tkAppInit.c : ../../tk$(TCL_VERSION)/unix/tkAppInit.c + cp ../../tk$(TCL_VERSION)/unix/tkAppInit.c . $(ZDIR) : mkdir $@ -$(ZDIR)/tcl$(TCLVER) : $(prefix)/lib/tcl$(TCLVER) +$(ZDIR)/tcl$(TCL_VERSION) : $(prefix)/lib/tcl$(TCL_VERSION) $(RM) -r $@ - cp -r $(prefix)/lib/tcl$(TCLVER) $(ZDIR)/. + cp -r $(prefix)/lib/tcl$(TCL_VERSION) $(ZDIR)/. $(ZDIR)/tcl8 : $(prefix)/lib/tcl8 $(RM) -r $@ cp -r $(prefix)/lib/tcl8 $(ZDIR)/. -$(ZDIR)/tk$(TCLVER) : $(prefix)/lib/tk$(TCLVER) +$(ZDIR)/tk$(TCL_VERSION) : $(prefix)/lib/tk$(TCL_VERSION) $(RM) -r $@ - cp -r $(prefix)/lib/tk$(TCLVER) $(ZDIR)/. - rm -rf $(ZDIR)/tk$(TCLVER)/images - rm -rf $(ZDIR)/tk$(TCLVER)/demos + cp -r $(prefix)/lib/tk$(TCL_VERSION) $(ZDIR)/. + rm -rf $(ZDIR)/tk$(TCL_VERSION)/images + rm -rf $(ZDIR)/tk$(TCL_VERSION)/demos $(ZDIR)/tkblt : $(RM) -r $@ diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in index 481b6e9..a527e9e 100755 --- a/ds9/win/Makefile.in +++ b/ds9/win/Makefile.in @@ -10,6 +10,7 @@ mandir = @mandir@ include $(prefix)/make.pkgs +TCL_VERSION = @TCL_VERSION@ TCL_LIB_SPEC = @TCL_LIB_SPEC@ TCL_STUB_LIB_SPEC= @TCL_STUB_LIB_SPEC@ TK_LIBS = @TK_LIBS@ @@ -107,13 +108,13 @@ winMain.o : winMain.c -DTK_LOCAL_APPINIT=SAOAppInit -DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook \ -c winMain.c -o $@ -winMain.c : $(prefix)/tk$(TCLVER)/win/winMain.c - cp $(prefix)/tk$(TCLVER)/win/winMain.c . +winMain.c : $(prefix)/tk$(TCL_VERSION)/win/winMain.c + cp $(prefix)/tk$(TCL_VERSION)/win/winMain.c . ds9.res.o: ds9.rc ds9.ico i686-w64-mingw32-windres -o $@ \ - --define STATIC_BUILD --include $(prefix)/tk$(TCLVER)/generic \ - --include $(prefix)/$(TCLDIR)/generic --include $(prefix)/tk$(TCLVER)/win/rc \ + --define STATIC_BUILD --include $(prefix)/tk$(TCL_VERSION)/generic \ + --include $(prefix)/$(TCLDIR)/generic --include $(prefix)/tk$(TCL_VERSION)/win/rc \ ds9.rc appdir : |