Sophie: montage-6.0-4.mga9 src

montage-6.0-4.mga9.src.rpm

From: Ole Streicher <olebole@debian.org>
Date: Thu, 22 Dec 2016 14:24:44 +0100
Subject: Use system libs for wcstools cfitsio, and jpeg

---
 Makefile                                |  15 +--
 Montage/Makefile.LINUX                  |   4 +-
 MontageLib/ArchiveExec/Makefile         |   4 +-
 MontageLib/ArchiveGet/Makefile          |   4 +-
 MontageLib/ArchiveList/Makefile.LINUX   |   6 +-
 MontageLib/BgExec/Makefile              |   4 +-
 MontageLib/DiffExec/Makefile            |   4 +-
 MontageLib/DiffFitExec/Makefile         |   4 +-
 MontageLib/FitExec/Makefile             |   4 +-
 MontageLib/Makefile                     | 181 --------------------------------
 MontageLib/ProjExec/Makefile            |   4 +-
 MontageLib/TANHdr/Makefile              |   4 +-
 MontageLib/montage.h                    |   2 +-
 grid/Globus/ExecTG/Makefile.LINUX       |   2 +-
 grid/Globus/NotifyTG/Makefile.LINUX     |   2 +-
 grid/Pegasus/Makefile.LINUX             |   4 +-
 lib/src/Makefile                        |  10 --
 lib/src/two_plane_v1.1/test/Makefile    |   2 +-
 util/Archive/ArchiveExec/Makefile       |   2 +-
 util/Archive/ArchiveGet/Makefile.LINUX  |   2 +-
 util/Archive/ArchiveList/Makefile.LINUX |   4 +-
 util/BestImage/Makefile                 |   2 +-
 util/CatMap/Makefile.LINUX              |   2 +-
 util/Examine/Makefile.LINUX             |   2 +-
 util/Exec/Makefile.LINUX                |   2 +-
 util/FixNaN/Makefile.LINUX              |   2 +-
 util/Hdr/Makefile.LINUX                 |   4 +-
 util/JPEG/Makefile.LINUX                |   2 +-
 util/MovingTarget/Makefile.LINUX        |   4 +-
 util/Pad/Makefile.LINUX                 |   2 +-
 util/Pix2Coord/Makefile.LINUX           |   2 +-
 util/Rotate/Makefile.LINUX              |   2 +-
 util/Search/Makefile.LINUX              |   2 +-
 util/ShrinkHdr/Makefile.LINUX           |   2 +-
 util/Transpose/Makefile.LINUX           |   2 +-
 util/Viewer/Makefile.LINUX              |   4 +-
 36 files changed, 58 insertions(+), 246 deletions(-)

diff --git a/Makefile b/Makefile
index e979748..de040ed 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+
+CPPFLAGS += -I/usr/include/libwcs -I/usr/include/freetype2
+
 all:
 	mkdir -p bin
 	mkdir -p lib/include
@@ -12,9 +15,9 @@ clean:
 	mkdir -p bin
 	mkdir -p lib/include
 	rm -rf bin/*
-	if test -d lib/src;    then (cd lib/src;    make clean); fi
-	if test -d Montage;    then (cd Montage;    make clean); fi
-	if test -d util;       then (cd util;       make clean); fi
-	if test -d grid;       then (cd grid;       make clean); fi
-	if test -d MontageLib; then (cd MontageLib; make clean); fi
-	if test -d ancillary;  then (cd ancillary;  make clean); fi
+	if test -d lib/src;    then (cd lib/src;    make clean); fi || true
+	if test -d Montage;    then (cd Montage;    make clean); fi || true
+	if test -d util;       then (cd util;       make clean); fi || true
+	if test -d grid;       then (cd grid;       make clean); fi || true
+	if test -d MontageLib; then (cd MontageLib; make clean); fi || true
+	if test -d ancillary;  then (cd ancillary;  make clean); fi || true
diff --git a/Montage/Makefile.LINUX b/Montage/Makefile.LINUX
index 57ea4eb..7588213 100644
--- a/Montage/Makefile.LINUX
+++ b/Montage/Makefile.LINUX
@@ -49,8 +49,8 @@
 CC     =	gcc
 MPICC  =
 CFLAGS =	-g -I. -I../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99
-LIBS   =	-L../lib -lwcs -lcfitsio -lcoord -lmtbl -lsvc \
-		   -lwww -lboundaries -lpixbounds -ltwoplane -lnsl -lm
+LIBS   =	-L../lib -lwcstools -lcfitsio -lcoord -lmtbl -lsvc \
+		-lwww -lboundaries -lpixbounds -ltwoplane -lm
 
 SBINS  =  mConvert mFlattenExec mHdrCheck mHdrtbl mTblSort mTileHdr mTileImage
 MBINS  =  mProjExecMPI mFitExecMPI mDiffExecMPI mBgExecMPI mAddMPI  mAddExecMPI
diff --git a/MontageLib/ArchiveExec/Makefile b/MontageLib/ArchiveExec/Makefile
index 8c230b0..ec0ff13 100644
--- a/MontageLib/ArchiveExec/Makefile
+++ b/MontageLib/ArchiveExec/Makefile
@@ -8,8 +8,8 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I.. -I../../lib/include -fPIC
-LIBS   =	-L../../lib -lwcs -lmtbl -lbz2
+CFLAGS +=	-I/usr/include/wcstools  -I. -I.. -I../../lib/include -fPIC
+LIBS   =	-L../../lib -lwcstools -lmtbl -lbz2
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/MontageLib/ArchiveGet/Makefile b/MontageLib/ArchiveGet/Makefile
index d3eb260..9258c9a 100644
--- a/MontageLib/ArchiveGet/Makefile
+++ b/MontageLib/ArchiveGet/Makefile
@@ -2,8 +2,8 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc
-CFLAGS =	-g -I. -I.. -I../../lib/include -fPIC
-LIBS   =	 -L../../lib -lbz2
+CFLAGS +=	-I/usr/include/wcstools -I. -I.. -I../../lib/include -fPIC
+LIBS   =	$(LDFLAGS) -L../../lib -lbz2
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/MontageLib/ArchiveList/Makefile.LINUX b/MontageLib/ArchiveList/Makefile.LINUX
index 7b29ad0..4062500 100644
--- a/MontageLib/ArchiveList/Makefile.LINUX
+++ b/MontageLib/ArchiveList/Makefile.LINUX
@@ -8,9 +8,9 @@
 .SUFFIXES: .c .o
 
 CC     =	cc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I.. -I../../lib/include -fPIC
-LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lmtbl -lsvc \
-		-lboundaries -lnsl -lm
+CFLAGS +=	-I/usr/include/wcstools -I. -I.. -I../../lib/include -fPIC
+LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lcfitsio -lcoord -lmtbl -lsvc \
+		-lboundaries -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/MontageLib/BgExec/Makefile b/MontageLib/BgExec/Makefile
index 406c211..a8c2710 100644
--- a/MontageLib/BgExec/Makefile
+++ b/MontageLib/BgExec/Makefile
@@ -2,8 +2,8 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc
-CFLAGS =	-g -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC -Wall
-LIBS   =	-L../../lib -lwcs -lmtbl -lcfitsio -lm
+CFLAGS +=	-I/usr/include/wcstools -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lmtbl -lcfitsio -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/MontageLib/DiffExec/Makefile b/MontageLib/DiffExec/Makefile
index 144f945..a425438 100644
--- a/MontageLib/DiffExec/Makefile
+++ b/MontageLib/DiffExec/Makefile
@@ -2,8 +2,8 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc
-CFLAGS =	-g -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC -Wall
-LIBS   =	-L../../lib -lwcs -lmtbl -lcfitsio -lm
+CFLAGS +=	-I/usr/include/libwcs -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lmtbl -lcfitsio -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/MontageLib/DiffFitExec/Makefile b/MontageLib/DiffFitExec/Makefile
index 48bab6e..2276542 100644
--- a/MontageLib/DiffFitExec/Makefile
+++ b/MontageLib/DiffFitExec/Makefile
@@ -2,8 +2,8 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc
-CFLAGS =	-g -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC -Wall
-LIBS   =	-L../../lib -lwcs -lmtbl -lpixbounds -lcfitsio -lm
+CFLAGS +=	-I/usr/include/libwcs -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lmtbl -lpixbounds -lcfitsio -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/MontageLib/FitExec/Makefile b/MontageLib/FitExec/Makefile
index 0c204a7..a6d5d4a 100644
--- a/MontageLib/FitExec/Makefile
+++ b/MontageLib/FitExec/Makefile
@@ -2,8 +2,8 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc
-CFLAGS =	-g -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC -Wall
-LIBS   =	-L../../lib -lwcs -lmtbl -lpixbounds -lcfitsio -lm
+CFLAGS +=	-I/usr/include/libwcs -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lmtbl -lpixbounds -lcfitsio -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/MontageLib/Makefile b/MontageLib/Makefile
index 0906b16..478b39b 100644
--- a/MontageLib/Makefile
+++ b/MontageLib/Makefile
@@ -180,69 +180,6 @@ pythonlibs:
 			DiffFitExec/montageDiffFitExec.o \
 			ProjExec/montageProjExec.o \
 			../lib/src/boundaries/boundaries.o \
-			../lib/src/cfitsio-3.25/buffers.o \
-			../lib/src/cfitsio-3.25/cfileio.o \
-			../lib/src/cfitsio-3.25/checksum.o \
-			../lib/src/cfitsio-3.25/drvrfile.o \
-			../lib/src/cfitsio-3.25/drvrgsiftp.o \
-			../lib/src/cfitsio-3.25/drvrmem.o \
-			../lib/src/cfitsio-3.25/drvrnet.o \
-			../lib/src/cfitsio-3.25/drvrsmem.o \
-			../lib/src/cfitsio-3.25/editcol.o \
-			../lib/src/cfitsio-3.25/edithdu.o \
-			../lib/src/cfitsio-3.25/eval_f.o \
-			../lib/src/cfitsio-3.25/eval_l.o \
-			../lib/src/cfitsio-3.25/eval_y.o \
-			../lib/src/cfitsio-3.25/f77_wrap1.o \
-			../lib/src/cfitsio-3.25/f77_wrap2.o \
-			../lib/src/cfitsio-3.25/f77_wrap3.o \
-			../lib/src/cfitsio-3.25/f77_wrap4.o \
-			../lib/src/cfitsio-3.25/fitscore.o \
-			../lib/src/cfitsio-3.25/fits_hcompress.o \
-			../lib/src/cfitsio-3.25/fits_hdecompress.o \
-			../lib/src/cfitsio-3.25/getcolb.o \
-			../lib/src/cfitsio-3.25/getcold.o \
-			../lib/src/cfitsio-3.25/getcole.o \
-			../lib/src/cfitsio-3.25/getcoli.o \
-			../lib/src/cfitsio-3.25/getcolj.o \
-			../lib/src/cfitsio-3.25/getcolk.o \
-			../lib/src/cfitsio-3.25/getcoll.o \
-			../lib/src/cfitsio-3.25/getcol.o \
-			../lib/src/cfitsio-3.25/getcolsb.o \
-			../lib/src/cfitsio-3.25/getcols.o \
-			../lib/src/cfitsio-3.25/getcolui.o \
-			../lib/src/cfitsio-3.25/getcoluj.o \
-			../lib/src/cfitsio-3.25/getcoluk.o \
-			../lib/src/cfitsio-3.25/getkey.o \
-			../lib/src/cfitsio-3.25/group.o \
-			../lib/src/cfitsio-3.25/grparser.o \
-			../lib/src/cfitsio-3.25/histo.o \
-			../lib/src/cfitsio-3.25/imcompress.o \
-			../lib/src/cfitsio-3.25/iraffits.o \
-			../lib/src/cfitsio-3.25/modkey.o \
-			../lib/src/cfitsio-3.25/pliocomp.o \
-			../lib/src/cfitsio-3.25/putcolb.o \
-			../lib/src/cfitsio-3.25/putcold.o \
-			../lib/src/cfitsio-3.25/putcole.o \
-			../lib/src/cfitsio-3.25/putcoli.o \
-			../lib/src/cfitsio-3.25/putcolj.o \
-			../lib/src/cfitsio-3.25/putcolk.o \
-			../lib/src/cfitsio-3.25/putcoll.o \
-			../lib/src/cfitsio-3.25/putcol.o \
-			../lib/src/cfitsio-3.25/putcolsb.o \
-			../lib/src/cfitsio-3.25/putcols.o \
-			../lib/src/cfitsio-3.25/putcolui.o \
-			../lib/src/cfitsio-3.25/putcoluj.o \
-			../lib/src/cfitsio-3.25/putcoluk.o \
-			../lib/src/cfitsio-3.25/putcolu.o \
-			../lib/src/cfitsio-3.25/putkey.o \
-			../lib/src/cfitsio-3.25/quantize.o \
-			../lib/src/cfitsio-3.25/region.o \
-			../lib/src/cfitsio-3.25/ricecomp.o \
-			../lib/src/cfitsio-3.25/scalnull.o \
-			../lib/src/cfitsio-3.25/swapproc.o \
-			../lib/src/cfitsio-3.25/wcssub.o \
-			../lib/src/cfitsio-3.25/wcsutil.o \
 			../lib/src/cmd/cmd.o \
 			../lib/src/coord/ccalc.o \
 			../lib/src/coord/computeFKCorrections.o \
@@ -256,52 +193,6 @@ pythonlibs:
 			../lib/src/coord/precessBesselian.o \
 			../lib/src/coord/precessJulian.o \
 			../lib/src/coord/sexToDecimalDegree.o \
-			../lib/src/jpeg-8b/jaricom.o \
-			../lib/src/jpeg-8b/jcapimin.o \
-			../lib/src/jpeg-8b/jcapistd.o \
-			../lib/src/jpeg-8b/jcarith.o \
-			../lib/src/jpeg-8b/jccoefct.o \
-			../lib/src/jpeg-8b/jccolor.o \
-			../lib/src/jpeg-8b/jcdctmgr.o \
-			../lib/src/jpeg-8b/jchuff.o \
-			../lib/src/jpeg-8b/jcinit.o \
-			../lib/src/jpeg-8b/jcmainct.o \
-			../lib/src/jpeg-8b/jcmarker.o \
-			../lib/src/jpeg-8b/jcmaster.o \
-			../lib/src/jpeg-8b/jcomapi.o \
-			../lib/src/jpeg-8b/jcparam.o \
-			../lib/src/jpeg-8b/jcprepct.o \
-			../lib/src/jpeg-8b/jcsample.o \
-			../lib/src/jpeg-8b/jctrans.o \
-			../lib/src/jpeg-8b/jdapimin.o \
-			../lib/src/jpeg-8b/jdapistd.o \
-			../lib/src/jpeg-8b/jdarith.o \
-			../lib/src/jpeg-8b/jdatadst.o \
-			../lib/src/jpeg-8b/jdatasrc.o \
-			../lib/src/jpeg-8b/jdcoefct.o \
-			../lib/src/jpeg-8b/jdcolor.o \
-			../lib/src/jpeg-8b/jddctmgr.o \
-			../lib/src/jpeg-8b/jdhuff.o \
-			../lib/src/jpeg-8b/jdinput.o \
-			../lib/src/jpeg-8b/jdmainct.o \
-			../lib/src/jpeg-8b/jdmarker.o \
-			../lib/src/jpeg-8b/jdmaster.o \
-			../lib/src/jpeg-8b/jdmerge.o \
-			../lib/src/jpeg-8b/jdpostct.o \
-			../lib/src/jpeg-8b/jdsample.o \
-			../lib/src/jpeg-8b/jdtrans.o \
-			../lib/src/jpeg-8b/jerror.o \
-			../lib/src/jpeg-8b/jfdctflt.o \
-			../lib/src/jpeg-8b/jfdctfst.o \
-			../lib/src/jpeg-8b/jfdctint.o \
-			../lib/src/jpeg-8b/jidctflt.o \
-			../lib/src/jpeg-8b/jidctfst.o \
-			../lib/src/jpeg-8b/jidctint.o \
-			../lib/src/jpeg-8b/jmemmgr.o \
-			../lib/src/jpeg-8b/jmemnobs.o \
-			../lib/src/jpeg-8b/jquant1.o \
-			../lib/src/jpeg-8b/jquant2.o \
-			../lib/src/jpeg-8b/jutils.o \
 			../lib/src/json/jsonlib.o \
 			../lib/src/lodepng_20140823/lodepng.o \
 			../lib/src/mtbl/mtbl.o \
@@ -310,81 +201,9 @@ pythonlibs:
 			../lib/src/two_plane_v1.1/redefine_pointing.o \
 			../lib/src/two_plane_v1.1/two_plane.o \
 			../lib/src/two_plane_v1.1/undistort.o \
-			../lib/src/wcssubs3.9.0_montage/cel.o \
-			../lib/src/wcssubs3.9.0_montage/dateutil.o \
-			../lib/src/wcssubs3.9.0_montage/dsspos.o \
-			../lib/src/wcssubs3.9.0_montage/fileutil.o \
-			../lib/src/wcssubs3.9.0_montage/fitsfile.o \
-			../lib/src/wcssubs3.9.0_montage/hget.o \
-			../lib/src/wcssubs3.9.0_montage/hput.o \
-			../lib/src/wcssubs3.9.0_montage/iget.o \
-			../lib/src/wcssubs3.9.0_montage/imhfile.o \
-			../lib/src/wcssubs3.9.0_montage/imio.o \
-			../lib/src/wcssubs3.9.0_montage/lin.o \
-			../lib/src/wcssubs3.9.0_montage/platepos.o \
-			../lib/src/wcssubs3.9.0_montage/poly.o \
-			../lib/src/wcssubs3.9.0_montage/proj.o \
-			../lib/src/wcssubs3.9.0_montage/sph.o \
-			../lib/src/wcssubs3.9.0_montage/tnxpos.o \
-			../lib/src/wcssubs3.9.0_montage/wcscon.o \
-			../lib/src/wcssubs3.9.0_montage/wcsinit.o \
-			../lib/src/wcssubs3.9.0_montage/wcslib.o \
-			../lib/src/wcssubs3.9.0_montage/wcs.o \
-			../lib/src/wcssubs3.9.0_montage/wcstrig.o \
-			../lib/src/wcssubs3.9.0_montage/worldpos.o \
-			../lib/src/wcssubs3.9.0_montage/zpxpos.o \
 			../lib/src/www/www.o \
-			../lib/src/freetype-2.9.1//objs/.libs/autofit.o \
-			../lib/src/freetype-2.9.1//objs/.libs/bdf.o \
-			../lib/src/freetype-2.9.1//objs/.libs/cff.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftbase.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftbbox.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftbdf.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftbitmap.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftbzip2.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftcache.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftcid.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftdebug.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftfstype.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftgasp.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftglyph.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftgxval.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftgzip.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftinit.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftlzw.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftmm.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftotval.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftpatent.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftpfr.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftstroke.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftsynth.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftsystem.o \
-			../lib/src/freetype-2.9.1//objs/.libs/fttype1.o \
-			../lib/src/freetype-2.9.1//objs/.libs/ftwinfnt.o \
-			../lib/src/freetype-2.9.1//objs/.libs/pcf.o \
-			../lib/src/freetype-2.9.1//objs/.libs/pfr.o \
-			../lib/src/freetype-2.9.1//objs/.libs/psaux.o \
-			../lib/src/freetype-2.9.1//objs/.libs/pshinter.o \
-			../lib/src/freetype-2.9.1//objs/.libs/psnames.o \
-			../lib/src/freetype-2.9.1//objs/.libs/raster.o \
-			../lib/src/freetype-2.9.1//objs/.libs/sfnt.o \
-			../lib/src/freetype-2.9.1//objs/.libs/smooth.o \
-			../lib/src/freetype-2.9.1//objs/.libs/truetype.o \
-			../lib/src/freetype-2.9.1//objs/.libs/type1.o \
-			../lib/src/freetype-2.9.1//objs/.libs/type1cid.o \
-			../lib/src/freetype-2.9.1//objs/.libs/type42.o \
-			../lib/src/freetype-2.9.1//objs/.libs/winfnt.o \
-			../lib/src/bzip2-1.0.6/blocksort.o \
-			../lib/src/bzip2-1.0.6/huffman.o \
-			../lib/src/bzip2-1.0.6/crctable.o \
-			../lib/src/bzip2-1.0.6/randtable.o \
-			../lib/src/bzip2-1.0.6/decompress.o \
-			../lib/src/bzip2-1.0.6/bzlib.o \
          ../python/MontagePy/lib
 		-cp ../lib/src/two_plane_v1.1/distort.o       ../python/MontagePy/lib/two_plane_distort.o
-		-cp ../lib/src/wcssubs3.9.0_montage/distort.o ../python/MontagePy/lib/distort.o
-		-cp ../lib/src/bzip2-1.0.6/compress.o         ../python/MontagePy/lib/bzip2_compress.o
-		-cp ../lib/src/cfitsio-3.25/compress.o        ../python/MontagePy/lib/compress.o
 # The last four lines are needed because we have .o file name conflicts
 
 doc:
diff --git a/MontageLib/ProjExec/Makefile b/MontageLib/ProjExec/Makefile
index b16bc77..ee29d15 100644
--- a/MontageLib/ProjExec/Makefile
+++ b/MontageLib/ProjExec/Makefile
@@ -2,8 +2,8 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc
-CFLAGS =	-g -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC -Wall
-LIBS   =	-L../../lib -lwcs -lmtbl -lwww -lcoord -ltwoplane -lcfitsio -lm
+CFLAGS +=	-I/usr/include/libwcs -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lmtbl -lwww -lcoord -ltwoplane -lcfitsio -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/MontageLib/TANHdr/Makefile b/MontageLib/TANHdr/Makefile
index c35aad9..3fd61b6 100644
--- a/MontageLib/TANHdr/Makefile
+++ b/MontageLib/TANHdr/Makefile
@@ -2,8 +2,8 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc
-CFLAGS =	-g -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC -Wall
-LIBS   =	-L../../lib -lwcs -lmtbl -lcfitsio -lm
+CFLAGS +=	-I/usr/include/libwcs -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lmtbl -lcfitsio -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/MontageLib/montage.h b/MontageLib/montage.h
index 257ea6d..e3b0eae 100644
--- a/MontageLib/montage.h
+++ b/MontageLib/montage.h
@@ -1,7 +1,7 @@
 #ifndef MONTAGE_H
 #define MONTAGE_H
 
-#include <wcs.h>
+#include <libwcs/wcs.h>
 
 
 /*************************************/
diff --git a/grid/Globus/ExecTG/Makefile.LINUX b/grid/Globus/ExecTG/Makefile.LINUX
index 95734b6..33a846b 100644
--- a/grid/Globus/ExecTG/Makefile.LINUX
+++ b/grid/Globus/ExecTG/Makefile.LINUX
@@ -9,7 +9,7 @@
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I../../../lib/include -I../../../Montage
-LIBS   =	-L../../../lib -lsvc -lmtbl -lwcs -lcfitsio -lcoord -lnsl -lm
+LIBS   =	-L../../../lib -lsvc -lmtbl -lwcstools -lcfitsio -lcoord -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/grid/Globus/NotifyTG/Makefile.LINUX b/grid/Globus/NotifyTG/Makefile.LINUX
index 987db41..d70f4dd 100644
--- a/grid/Globus/NotifyTG/Makefile.LINUX
+++ b/grid/Globus/NotifyTG/Makefile.LINUX
@@ -9,7 +9,7 @@
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I../../../lib/include -I../../../Montage
-LIBS   =	-L../../../lib -lsvc -lmtbl -lwcs -lcfitsio -lcoord -lnsl -lm
+LIBS   =	-L../../../lib -lsvc -lmtbl -lwcstools -lcfitsio -lcoord -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/grid/Pegasus/Makefile.LINUX b/grid/Pegasus/Makefile.LINUX
index 8d03ee2..fbcdc3e 100644
--- a/grid/Pegasus/Makefile.LINUX
+++ b/grid/Pegasus/Makefile.LINUX
@@ -16,8 +16,8 @@
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I../../Montage -I../../lib/include
-LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lmtbl -lsvc \
-		-lboundaries -lnsl -lm
+LIBS   =	-L../../lib -lwcstools -lcfitsio -lcoord -lmtbl -lsvc \
+		-lboundaries -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/lib/src/Makefile b/lib/src/Makefile
index bdd6044..4c379cc 100644
--- a/lib/src/Makefile
+++ b/lib/src/Makefile
@@ -1,6 +1,4 @@
 all:
-	(cd bzip2-1.0.6; make; cp libbz2.a ../..; cp bzlib.h ../../include)
-	(cd cfitsio-3.25; ./configure; make; cp libcfitsio.a ../..; cp *.h ../../include)
 	(cd cmd; make; make install)
 	(cd coord; make; make install)
 	(cd mtbl; make; make install)
@@ -9,18 +7,13 @@ all:
 	(cd boundaries; make; make install)
 	(cd pixbounds; make; make install)
 	(cd www; make; make install)
-	(cd wcssubs3.9.0_montage; make; cp libwcs.a ../..; cp *.h ../../include)
 	(cd two_plane_v1.1; make; make install)
 	(cd lodepng_20140823; make; make install)
-	(cd jpeg-8b; ./configure --with-pic; make; cp .libs/libjpeg.a ../..; cp jpeglib.h jconfig.h jmorecfg.h ../../include)
-	(cd freetype-2.9.1; ./configure --prefix=`pwd`/../../freetype --without-png --without-zlib; make; make install)
 	(cd ..; ranlib *.a)
 	chmod 644 ../include/*.h
 
 clean:
 	rm -rf ../include/* ../freetype ../*.a
-	(cd bzip2-1.0.6; make clean)
-	(cd cfitsio-3.25; make clean; rm -rf config.log config.cache config.status lib)
 	(cd cmd; make clean)
 	(cd coord; make clean)
 	(cd mtbl; make clean)
@@ -30,8 +23,5 @@ clean:
 	(cd www; make clean)
 	(cd pixbounds; make clean)
 	(cd www; make clean)
-	(cd wcssubs3.9.0_montage; make clean)
 	(cd two_plane_v1.1; make clean)
 	(cd lodepng_20140823; make clean)
-	(cd jpeg-8b; make clean)
-	(cd freetype-2.9.1; make clean; rm -rf objs/libfreetype.la  objs/.libs)
diff --git a/lib/src/two_plane_v1.1/test/Makefile b/lib/src/two_plane_v1.1/test/Makefile
index 925e1f3..b6bc8fd 100644
--- a/lib/src/two_plane_v1.1/test/Makefile
+++ b/lib/src/two_plane_v1.1/test/Makefile
@@ -1,6 +1,6 @@
 TwoPlaneTest:	TwoPlaneTest.o
 		gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -o TwoPlaneTest TwoPlaneTest.o \
-		-L../../.. -ltwoplane -lwcs -lcfitsio -lsocket -lnsl -lm
+		-L../../.. -ltwoplane -lwcstools -lcfitsio -lsocket -lnsl -lm
 
 TwoPlaneTest.o:	TwoPlaneTest.c
 		gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I../../../include \
diff --git a/util/Archive/ArchiveExec/Makefile b/util/Archive/ArchiveExec/Makefile
index 41d6a9a..a8389f2 100644
--- a/util/Archive/ArchiveExec/Makefile
+++ b/util/Archive/ArchiveExec/Makefile
@@ -9,7 +9,7 @@
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I../../../lib/include
-LIBS   =	-L../../../lib -lwcs -lmtbl -lsvc
+LIBS   =	-L../../../lib -lwcstools -lmtbl -lsvc
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/Archive/ArchiveGet/Makefile.LINUX b/util/Archive/ArchiveGet/Makefile.LINUX
index 97303d2..402e8c1 100644
--- a/util/Archive/ArchiveGet/Makefile.LINUX
+++ b/util/Archive/ArchiveGet/Makefile.LINUX
@@ -9,7 +9,7 @@
 
 CC     =	gcc
 CFLAGS =	-g -I../../../Montage -I../../../lib/include
-LIBS   =	 -L../../../lib -lwcs -lcfitsio -lmcurl -lcurl -lnsl -lidn -lssl -lcrypto -ldl -llber -lldap -lz -lrt -L/usr/kerberos/lib64 -lm
+LIBS   =	 -L../../../lib -lwcstools -lcfitsio -lmcurl -lcurl -lnsl -lidn -lssl -lcrypto -ldl -llber -lldap -lz -lrt -L/usr/kerberos/lib64 -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/Archive/ArchiveList/Makefile.LINUX b/util/Archive/ArchiveList/Makefile.LINUX
index 19516b8..ffaf89f 100644
--- a/util/Archive/ArchiveList/Makefile.LINUX
+++ b/util/Archive/ArchiveList/Makefile.LINUX
@@ -9,8 +9,8 @@
 
 CC     =	cc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I../../../lib/include
-LIBS   =	-L../../../lib -lwcs -lcfitsio -lcoord -lmtbl -lsvc \
-		-lboundaries -lnsl -lm
+LIBS   =	-L../../../lib -lwcstools -lcfitsio -lcoord -lmtbl -lsvc \
+		-lboundaries -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/BestImage/Makefile b/util/BestImage/Makefile
index 7e5cb20..6e3785f 100644
--- a/util/BestImage/Makefile
+++ b/util/BestImage/Makefile
@@ -9,7 +9,7 @@
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I../../lib/include
-LIBS   =	-L../../lib -lwcs -lmtbl -lsvc -lm
+LIBS   =	-L../../lib -lwcstools -lmtbl -lsvc -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/CatMap/Makefile.LINUX b/util/CatMap/Makefile.LINUX
index 9a41477..b8c61a4 100644
--- a/util/CatMap/Makefile.LINUX
+++ b/util/CatMap/Makefile.LINUX
@@ -9,7 +9,7 @@
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lmtbl -lcoord -lwcs -lcfitsio -lnsl -lm
+LIBS   =	-L../../lib -lmtbl -lcoord -lwcstools -lcfitsio -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/Examine/Makefile.LINUX b/util/Examine/Makefile.LINUX
index 5c5c770..a633504 100644
--- a/util/Examine/Makefile.LINUX
+++ b/util/Examine/Makefile.LINUX
@@ -9,7 +9,7 @@
 
 CC     =	gcc -std=c99 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99
 CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lnsl -lm
+LIBS   =	-L../../lib -lwcstools -lcfitsio -lcoord -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/Exec/Makefile.LINUX b/util/Exec/Makefile.LINUX
index d318acf..8ed05d6 100644
--- a/util/Exec/Makefile.LINUX
+++ b/util/Exec/Makefile.LINUX
@@ -9,7 +9,7 @@
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lsvc -lmtbl -lwcs -lcfitsio -lcoord -lnsl -lm
+LIBS   =	-L../../lib -lsvc -lmtbl -lwcstools -lcfitsio -lcoord -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/FixNaN/Makefile.LINUX b/util/FixNaN/Makefile.LINUX
index db52488..f88d931 100644
--- a/util/FixNaN/Makefile.LINUX
+++ b/util/FixNaN/Makefile.LINUX
@@ -9,7 +9,7 @@
 
 CC     =	gcc -std=c99 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lwcs -lcfitsio -lnsl -lm
+LIBS   =	-L../../lib -lwcstools -lcfitsio -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/Hdr/Makefile.LINUX b/util/Hdr/Makefile.LINUX
index 56bebc7..9c7ea35 100644
--- a/util/Hdr/Makefile.LINUX
+++ b/util/Hdr/Makefile.LINUX
@@ -9,8 +9,8 @@
 
 CC     =	cc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I../../lib/include
-LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lmtbl -lsvc \
-		-lboundaries -lnsl -lm
+LIBS   =	-L../../lib -lwcstools -lcfitsio -lcoord -lmtbl -lsvc \
+		-lboundaries -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/JPEG/Makefile.LINUX b/util/JPEG/Makefile.LINUX
index 21c128f..2a57f00 100644
--- a/util/JPEG/Makefile.LINUX
+++ b/util/JPEG/Makefile.LINUX
@@ -10,7 +10,7 @@
 
 CC     =	gcc -std=c99 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99
 CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lwcs -lcoord -lcfitsio -ljpeg -lnsl -lm
+LIBS   =	-L../../lib -lwcstools -lcoord -lcfitsio -ljpeg -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/MovingTarget/Makefile.LINUX b/util/MovingTarget/Makefile.LINUX
index 540709c..1457726 100644
--- a/util/MovingTarget/Makefile.LINUX
+++ b/util/MovingTarget/Makefile.LINUX
@@ -8,9 +8,9 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I./rtree -I../../lib/include -I../../Montage
+CFLAGS +=	-I/usr/include/wcstools -I. -I./rtree -I../../lib/include -I../../Montage
 LIBS   =	-Lrtree -lrtree \
-		-L../../lib -lcmd -lwcs -lcoord -lmtbl -lcfitsio -lnsl -lm
+		-L../../lib -lcmd -lwcstools -lcoord -lmtbl -lcfitsio -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/Pad/Makefile.LINUX b/util/Pad/Makefile.LINUX
index acf4c25..da1df54 100644
--- a/util/Pad/Makefile.LINUX
+++ b/util/Pad/Makefile.LINUX
@@ -9,7 +9,7 @@
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99
 CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lwcs -lcfitsio -lnsl -lm
+LIBS   =	-L../../lib -lwcs -lcfitsio -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/Pix2Coord/Makefile.LINUX b/util/Pix2Coord/Makefile.LINUX
index 4c6d394..72c2a00 100644
--- a/util/Pix2Coord/Makefile.LINUX
+++ b/util/Pix2Coord/Makefile.LINUX
@@ -9,7 +9,7 @@
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lwcs -lcoord -lcfitsio -ljpeg -lnsl -lm
+LIBS   =	-L../../lib -lwcstools -lcoord -lcfitsio -ljpeg -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/Rotate/Makefile.LINUX b/util/Rotate/Makefile.LINUX
index 1475c3c..31300ca 100644
--- a/util/Rotate/Makefile.LINUX
+++ b/util/Rotate/Makefile.LINUX
@@ -9,7 +9,7 @@
 
 CC     =	gcc -std=c99 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99
 CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lnsl -lm
+LIBS   =	-L../../lib -lwcstools -lcfitsio -lcoord -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/Search/Makefile.LINUX b/util/Search/Makefile.LINUX
index 7941efb..c8c15a4 100644
--- a/util/Search/Makefile.LINUX
+++ b/util/Search/Makefile.LINUX
@@ -10,7 +10,7 @@
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I./rtree -I../../lib/include -I../../Montage
 LIBS   =	-Lrtree -lrtree \
-		-L../../lib -lcmd -lwcs -lcoord -lmtbl -lcfitsio -lnsl -lm
+		-L../../lib -lcmd -lwcstools -lcoord -lmtbl -lcfitsio -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/ShrinkHdr/Makefile.LINUX b/util/ShrinkHdr/Makefile.LINUX
index 5b8ee6e..3f2058c 100644
--- a/util/ShrinkHdr/Makefile.LINUX
+++ b/util/ShrinkHdr/Makefile.LINUX
@@ -9,7 +9,7 @@
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lwcs -lcoord -lcfitsio -ljpeg -lnsl -lm
+LIBS   =	-L../../lib -lwcstools -lcoord -lcfitsio -ljpeg -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/Transpose/Makefile.LINUX b/util/Transpose/Makefile.LINUX
index ec7aac7..bdb0157 100644
--- a/util/Transpose/Makefile.LINUX
+++ b/util/Transpose/Makefile.LINUX
@@ -9,7 +9,7 @@
 
 CC     =	gcc -std=c99 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lnsl -lm
+LIBS   =	-L../../lib -lwcstools -lcfitsio -lcoord -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/Viewer/Makefile.LINUX b/util/Viewer/Makefile.LINUX
index 459664f..ee56db8 100644
--- a/util/Viewer/Makefile.LINUX
+++ b/util/Viewer/Makefile.LINUX
@@ -13,8 +13,8 @@ CC     =        gcc -std=c99 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99
                 -DFONT_DIR='"$(DATA_DIR)/fonts/"'
 CFLAGS =	-g -I. -I../../lib/include -I../../lib/freetype/include \
 		-I../../lib/freetype/include/freetype2 -I../../Montage
-LIBS   =        -L../../lib -lwcs -lcoord -lcfitsio -ljpeg -llodepng -lmtbl -lcmd \
-                -L../../lib/freetype/lib -lfreetype -lnsl -lm
+LIBS   =        -L../../lib -lwcstools -lcoord -lcfitsio -ljpeg -llodepng -lmtbl -lcmd \
+                -L../../lib/freetype/lib -lfreetype -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c