From 73b3069211ac6813bbc8c23b9ffdbf71b1df33e8 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Wed, 25 Jan 2017 17:39:55 -0500
Subject: simplify

---
 ds9/unix/Makefile.in | 30 ++++++++++++++----------------
 make.pkgs            |  1 -
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in
index ff923db..2ee7c15 100644
--- a/ds9/unix/Makefile.in
+++ b/ds9/unix/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@
@@ -82,18 +83,6 @@ FILES	= \
 	$(ZDIR)/cmaps \
 	$(ZDIR)/template
 
-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
-
 #--------------------------main
 
 .NOTPARALLEL :
@@ -135,12 +124,20 @@ debug: ds9base ds9.zip
 
 endif
 
-ds9base	: $(OBJS) $(LLIBS)
+ds9base	: $(OBJS)
 	$(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) \
@@ -158,7 +155,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)
 
 ds9.zip	: $(ZDIR) $(FILES)
 	$(RM) $@
diff --git a/make.pkgs b/make.pkgs
index b8895e0..154f184 100644
--- a/make.pkgs
+++ b/make.pkgs
@@ -30,4 +30,3 @@ XPAVERSION=2.1.17
 TCLVER=8.6
 TCLXMLVER=3.2
 TKCONVER=2.7
-TKIMGVER=1.4.6
-- 
cgit v0.12