diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-01-25 22:44:20 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-01-25 22:44:20 (GMT) |
| commit | 5c904f24fbf3072ac298f494ce97e23018551eb3 (patch) | |
| tree | 4c33602f7bc8c6cae2cdcc3a1253ed047f5ecf97 /ds9 | |
| parent | c46120cfca51e31ea1dab606c2ae6d7b4a90777f (diff) | |
| download | blt-5c904f24fbf3072ac298f494ce97e23018551eb3.zip blt-5c904f24fbf3072ac298f494ce97e23018551eb3.tar.gz blt-5c904f24fbf3072ac298f494ce97e23018551eb3.tar.bz2 | |
simplify
Diffstat (limited to 'ds9')
| -rw-r--r-- | ds9/macosx/Makefile.in | 2 | ||||
| -rwxr-xr-x | ds9/win/Makefile.in | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in index b701af1..c9caa6b 100644 --- a/ds9/macosx/Makefile.in +++ b/ds9/macosx/Makefile.in @@ -113,7 +113,7 @@ tkAppInit.o : tkAppInit.c tkAppInit.c : $(prefix)/tk$(TCL_VERSION)/unix/tkAppInit.c cp $(prefix)/tk$(TCL_VERSION)/unix/tkAppInit.c . -ds9base : $(OBJS) $(LLIBS) +ds9base : $(OBJS) $(RM) $@ $(CC) $(CFLAGS) -o $@ \ $(OBJS) \ diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in index 374ae03..2fc11aa 100755 --- a/ds9/win/Makefile.in +++ b/ds9/win/Makefile.in @@ -23,6 +23,7 @@ pngtcl_LIB_SPEC = @pngtcl_LIB_SPEC@ jpegtcl_LIB_SPEC= @jpegtcl_LIB_SPEC@ zlibtcl_LIB_SPEC= @zlibtcl_LIB_SPEC@ tkimg_LIB_SPEC = @tkimg_LIB_SPEC@ +tkimg_VERSION = @tkimg_VERSION@ tclxml_LIB_SPEC = @tclxml_LIB_SPEC@ @@ -64,18 +65,6 @@ STRIP = i686-w64-mingw32-strip.exe OBJS = ds9.o winMain.o ds9.res.o LLIBS = \ - $(libdir)/libfuntools.a \ - $(libdir)/libast.a \ - $(libdir)/libast_err.a \ - $(libdir)/libast_pal.a \ - $(libdir)/tkimgtiff$(TKIMGVER)/libtkimgtiff146.a \ - $(libdir)/tkimgpng$(TKIMGVER)/libtkimgpng146.a \ - $(libdir)/tkimgjpeg$(TKIMGVER)/libtkimgjpeg146.a \ - $(libdir)/tkimggif$(TKIMGVER)/libtkimggif146.a \ - $(libdir)/tkimgwindow$(TKIMGVER)/libtkimgwindow146.a \ - $(libdir)/libxpa.a \ - $(libdir)/libxml2.a \ - $(libdir)/libz.a APPDIR = $(bindir)/ds9app @@ -93,12 +82,23 @@ debug : ds9Base$(EXEEXT) appdir framework tcltk tcllib tkcon tkblt cleanup mv ds9base$(EXEEXT) ds9$(EXEEXT) cp -p ds9$(EXEEXT) $(APPDIR)/. -ds9Base$(EXEEXT): $(OBJS) $(LLIBS) +ds9Base$(EXEEXT): $(OBJS) $(RM) $@ $(CC) $(CFLAGS) -o $@ \ $(OBJS) \ $(tksao_LIB_SPEC) \ - $(LLIBS) \ + $(libdir)/libfuntools.a \ + $(libdir)/libast.a \ + $(libdir)/libast_err.a \ + $(libdir)/libast_pal.a \ + $(libdir)/tkimgtiff$(tkimg_VERSION)/libtkimgtiff$(tkimg_VERSION).a \ + $(libdir)/tkimgpng$(tkimg_VERSION)/libtkimgpng$(tkimg_VERSION).a \ + $(libdir)/tkimgjpeg$(tkimg_VERSION)/libtkimgjpeg$(tkimg_VERSION).a \ + $(libdir)/tkimggif$(tkimg_VERSION)/libtkimggif$(tkimg_VERSION).a \ + $(libdir)/tkimgwindow$(tkimg_VERSION)/libtkimgwindow$(tkimg_VERSION).a \ + $(libdir)/libxpa.a \ + $(libdir)/libxml2.a \ + $(libdir)/libz.a \ $(tifftcl_LIB_SPEC) \ $(pngtcl_LIB_SPEC) \ $(jpegtcl_LIB_SPEC) \ |