diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-01-28 19:49:03 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-01-28 19:49:03 (GMT) |
| commit | 463004daf73b6a8c890b2447616f2fb9d553fbc2 (patch) | |
| tree | 27618f3342c727f7d9ed807bf595e495116e37b2 /ds9/win | |
| parent | bf5eeb8966fad58381718e1e8f1c6be9f486ee8d (diff) | |
| download | blt-463004daf73b6a8c890b2447616f2fb9d553fbc2.zip blt-463004daf73b6a8c890b2447616f2fb9d553fbc2.tar.gz blt-463004daf73b6a8c890b2447616f2fb9d553fbc2.tar.bz2 | |
simplify build
Diffstat (limited to 'ds9/win')
| -rwxr-xr-x | ds9/win/Makefile.in | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in index 6b4db0e..04c69e9 100755 --- a/ds9/win/Makefile.in +++ b/ds9/win/Makefile.in @@ -75,14 +75,14 @@ OBJS = ds9.o winMain.o ds9.res.o #--------------------------main .NOTPARALLEL : -.PHONY : ds9 debug appdir framework frame2 tcltk tcllib tkcon tkblt xpa cleanup +.PHONY : ds9 debug appdir framework tcl tk tcllib tkcon tkblt xpa vbs -ds9 : ds9Base$(EXEEXT) appdir framework frame2 tcltk tcllib tkcon tkblt xpa cleanup +ds9 : ds9Base$(EXEEXT) appdir framework tcl tk tcllib tkcon tkblt xpa vbs cp -p ds9base$(EXEEXT) ds9$(EXEEXT) $(STRIP) ds9$(EXEEXT) cp -p ds9$(EXEEXT) $(APPDIR)/. -debug : ds9Base$(EXEEXT) appdir framework frame2 tcltk tcllib tkcon tkblt cleanup +debug : ds9Base$(EXEEXT) appdir framework tcl tk tcllib tkcon tkblt xpa vbs mv ds9base$(EXEEXT) ds9$(EXEEXT) cp -p ds9$(EXEEXT) $(APPDIR)/. @@ -133,37 +133,26 @@ winMain.c : $(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$(TCL_VERSION)/generic \ - --include $(prefix)/$(TCLDIR)/generic --include $(prefix)/tk$(TCL_VERSION)/win/rc \ + --include $(prefix)/$(TCLDIR)/generic \ + --include $(prefix)/tk$(TCL_VERSION)/win/rc \ ds9.rc -include ../make.include - appdir : rm -rf $(APPDIR) mkdir $(APPDIR) -frame2: - cp install.vbs $(APPDIR)/. - -tcltk : +tcl : cp -pr $(prefix)/lib/tcl8 $(APPDIR)/. cp -pr $(prefix)/lib/tcl8.6 $(APPDIR)/. + +tk : cp -pr $(prefix)/lib/tk8.6 $(APPDIR)/. xpa : cp -p $(bindir)/xpans.exe $(APPDIR)/. -cleanup: - cd $(APPDIR); find . -depth -name CVS -exec rm -rf {} \; - -#--------------------------cleanup - -.PHONY : clean distclean +vbs : + cp install.vbs $(APPDIR)/. -clean : - cd ../library; $(MAKE) clean - $(RM) core *~ *# ds9Base ds9 *.o +include ../make.include -distclean: clean - -rm -f Makefile config.cache config.log config.status - -rm -rf autom4te.cache |