diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-01-25 22:41:50 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-01-25 22:41:50 (GMT) |
| commit | c46120cfca51e31ea1dab606c2ae6d7b4a90777f (patch) | |
| tree | 4dc2adb18de8501a691bb2ab323a9135039c89aa | |
| parent | 73b3069211ac6813bbc8c23b9ffdbf71b1df33e8 (diff) | |
| download | blt-c46120cfca51e31ea1dab606c2ae6d7b4a90777f.zip blt-c46120cfca51e31ea1dab606c2ae6d7b4a90777f.tar.gz blt-c46120cfca51e31ea1dab606c2ae6d7b4a90777f.tar.bz2 | |
simplify
| -rw-r--r-- | ds9/macosx/Makefile.in | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in index aa5fad8..b701af1 100644 --- a/ds9/macosx/Makefile.in +++ b/ds9/macosx/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@ tclcheckdns_LIB_SPEC= @tclcheckdns_LIB_SPEC@ tcliis_LIB_SPEC = @tcliis_LIB_SPEC@ @@ -66,18 +67,6 @@ ID = $(shell finger $(shell whoami) | egrep -o 'Name: [a-zA-Z0-9 ]{1,}' | cut -d OBJS = ds9.o tkAppInit.o -LLIBS = \ - $(libdir)/libfuntools.a \ - $(libdir)/libast.a \ - $(libdir)/libast_err.a \ - $(libdir)/libast_pal.a \ - $(libdir)/tkimgtiff$(TKIMGVER)/libtkimgtiff$(TKIMGVER).a \ - $(libdir)/tkimgpng$(TKIMGVER)/libtkimgpng$(TKIMGVER).a \ - $(libdir)/tkimgjpeg$(TKIMGVER)/libtkimgjpeg$(TKIMGVER).a \ - $(libdir)/tkimggif$(TKIMGVER)/libtkimggif$(TKIMGVER).a \ - $(libdir)/tkimgwindow$(TKIMGVER)/libtkimgwindow$(TKIMGVER).a \ - $(libdir)/libxpa.a - APPDIR = $(bindir)/SAOImage\ DS9.app TKSAOFW = $(bindir)/SAOImage\ DS9.app/Contents/Frameworks/Tksao.framework TKSAORES= $(bindir)/SAOImage\ DS9.app/Contents/Frameworks/Tksao.framework/Resources @@ -128,8 +117,16 @@ ds9base : $(OBJS) $(LLIBS) $(RM) $@ $(CC) $(CFLAGS) -o $@ \ $(OBJS) \ - $(LLIBS) \ - $(LIBS) \ + $(libdir)/libfuntools.a \ + $(libdir)/libast.a \ + $(libdir)/libast_err.a \ + $(libdir)/libast_pal.a \ + $(libdir)/libxpa.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 \ $(tifftcl_LIB_SPEC) \ $(pngtcl_LIB_SPEC) \ $(jpegtcl_LIB_SPEC) \ @@ -147,7 +144,8 @@ ds9base : $(OBJS) $(LLIBS) $(tktable_LIB_SPEC) \ $(TK_STUB_LIB_SPEC) $(TK_LIB_SPEC) \ $(TCL_STUB_LIB_SPEC) $(TCL_LIB_SPEC) \ - $(TK_LIBS) + $(TK_LIBS) \ + $(LIBS) appdir : rm -rf $(APPDIR) |