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: Propagate CFLAGS & Co. for hardening and wcstools incpath

Closes: #915263
---
 Montage/Makefile.LINUX                  | 18 +++++++++---------
 MontageLib/Add/Makefile.LINUX           |  6 +++---
 MontageLib/AddCube/Makefile.LINUX       |  6 +++---
 MontageLib/ArchiveExec/Makefile         |  2 +-
 MontageLib/ArchiveGet/Makefile          |  2 +-
 MontageLib/ArchiveList/Makefile.LINUX   |  2 +-
 MontageLib/Background/Makefile.LINUX    |  6 +++---
 MontageLib/BestImage/Makefile           |  4 ++--
 MontageLib/BgModel/Makefile             |  4 ++--
 MontageLib/CoverageCheck/Makefile.LINUX |  6 +++---
 MontageLib/Diff/Makefile.LINUX          |  6 +++---
 MontageLib/Examine/Makefile.LINUX       |  6 +++---
 MontageLib/Fitplane/Makefile            |  6 +++---
 MontageLib/FixNaN/Makefile.LINUX        |  6 +++---
 MontageLib/GetHdr/Makefile              |  6 +++---
 MontageLib/Hdr/Makefile.LINUX           |  8 ++++----
 MontageLib/Histogram/Makefile           |  4 ++--
 MontageLib/Imgtbl/Makefile.LINUX        |  6 +++---
 MontageLib/MakeHdr/Makefile.LINUX       |  6 +++---
 MontageLib/MakeImg/Makefile.LINUX       |  6 +++---
 MontageLib/Makefile                     |  2 +-
 MontageLib/Overlaps/Makefile.LINUX      |  6 +++---
 MontageLib/Project/Makefile.LINUX       |  6 +++---
 MontageLib/ProjectCube/Makefile.LINUX   |  6 +++---
 MontageLib/ProjectPP/Makefile.LINUX     |  6 +++---
 MontageLib/ProjectQL/Makefile.LINUX     |  6 +++---
 MontageLib/PutHdr/Makefile              |  6 +++---
 MontageLib/Shrink/Makefile              |  6 +++---
 MontageLib/ShrinkCube/Makefile          |  6 +++---
 MontageLib/SubCube/Makefile.LINUX       |  6 +++---
 MontageLib/Subimage/Makefile.LINUX      |  6 +++---
 MontageLib/Subset/Makefile.LINUX        |  6 +++---
 MontageLib/Transpose/Makefile.LINUX     |  6 +++---
 MontageLib/Viewer/Makefile.LINUX        | 16 ++++++++--------
 MontageLib/WWT/Makefile.LINUX           |  6 +++---
 MontageLib/test/Makefile                |  2 +-
 MontageLib/util/Makefile                |  4 ++--
 ancillary/Makefile                      |  4 ++--
 grid/Globus/ExecTG/Makefile.LINUX       |  6 +++---
 grid/Globus/NotifyTG/Makefile.LINUX     |  6 +++---
 grid/Pegasus/Makefile.LINUX             |  6 +++---
 lib/src/boundaries/Makefile             |  2 +-
 lib/src/cmd/Makefile                    |  2 +-
 lib/src/coord/Makefile                  |  2 +-
 lib/src/json/Makefile                   |  2 +-
 lib/src/lodepng_20140823/Makefile       |  2 +-
 lib/src/mtbl/Makefile                   |  5 +++--
 lib/src/pixbounds/Makefile              |  2 +-
 lib/src/svc/Makefile                    |  2 +-
 lib/src/two_plane_v1.1/Makefile         |  2 +-
 util/Archive/ArchiveExec/Makefile       |  8 ++++----
 util/Archive/ArchiveGet/Makefile.LINUX  |  6 +++---
 util/Archive/ArchiveList/Makefile.LINUX |  6 +++---
 util/BestImage/Makefile                 |  6 +++---
 util/CatMap/Makefile.LINUX              |  6 +++---
 util/Examine/Makefile.LINUX             |  6 +++---
 util/Exec/Makefile.LINUX                |  6 +++---
 util/FixNaN/Makefile.LINUX              |  6 +++---
 util/Hdr/Makefile.LINUX                 |  6 +++---
 util/JPEG/Makefile.LINUX                |  6 +++---
 util/Pad/Makefile.LINUX                 |  6 +++---
 util/Pix2Coord/Makefile.LINUX           |  8 ++++----
 util/Rotate/Makefile.LINUX              |  6 +++---
 util/Search/Makefile.LINUX              |  6 +++---
 util/Search/rtree/Makefile              |  5 ++---
 util/ShrinkHdr/Makefile.LINUX           |  6 +++---
 util/TblExec/Makefile                   |  6 +++---
 util/Transpose/Makefile.LINUX           |  6 +++---
 util/Viewer/Makefile.LINUX              |  6 +++---
 69 files changed, 189 insertions(+), 189 deletions(-)

diff --git a/Montage/Makefile.LINUX b/Montage/Makefile.LINUX
index 7588213..385cede 100644
--- a/Montage/Makefile.LINUX
+++ b/Montage/Makefile.LINUX
@@ -48,8 +48,8 @@
 
 CC     =	gcc
 MPICC  =
-CFLAGS =	-g -I. -I../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99
-LIBS   =	-L../lib -lwcstools -lcfitsio -lcoord -lmtbl -lsvc \
+CFLAGS +=	-I. -I../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99
+LIBS   =	$(LDFLAGS) -L../lib -lwcstools -lcfitsio -lcoord -lmtbl -lsvc \
 		-lwww -lboundaries -lpixbounds -ltwoplane -lm
 
 SBINS  =  mConvert mFlattenExec mHdrCheck mHdrtbl mTblSort mTileHdr mTileImage
@@ -64,7 +64,7 @@ BINS   = 	$(SBINS)
 
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 all:		$(BINS)
 
@@ -81,7 +81,7 @@ mAddMPI:	mAddMPI.o filePath.o debugCheck.o checkHdr.o checkWCS.o
 		checkHdr.o checkWCS.o $(LIBS)
 
 mAddMPI.o:	mAdd.c
-		$(MPICC) -o mAddMPI.o -DMPI $(CFLAGS) -c mAdd.c
+		$(MPICC) -o mAddMPI.o -DMPI $(CFLAGS) $(CPPFLAGS) -c mAdd.c
 
 mAddExec:	mAddExec.o debugCheck.o checkHdr.o checkWCS.o
 		$(CC) -o mAddExec mAddExec.o debugCheck.o checkHdr.o \
@@ -92,7 +92,7 @@ mAddExecMPI:	mAddExecMPI.o debugCheck.o checkHdr.o checkWCS.o
 		checkWCS.o $(LIBS)
 
 mAddExecMPI.o:	mAddExec.c
-		$(MPICC) -o mAddExecMPI.o -DMPI $(CFLAGS) -c mAddExec.c
+		$(MPICC) -o mAddExecMPI.o -DMPI $(CFLAGS) $(CPPFLAGS) -c mAddExec.c
 
 mBackground:	mBackground.o debugCheck.o checkHdr.o checkWCS.o
 		$(CC) -o mBackground mBackground.o debugCheck.o checkHdr.o \
@@ -105,7 +105,7 @@ mBgExecMPI:	mBgExecMPI.o filePath.o
 		$(MPICC) -o mBgExecMPI mBgExecMPI.o filePath.o $(LIBS)
 
 mBgExecMPI.o:	mBgExec.c
-		$(MPICC) -o mBgExecMPI.o -DMPI $(CFLAGS) -c mBgExec.c
+		$(MPICC) -o mBgExecMPI.o -DMPI $(CFLAGS) $(CPPFLAGS) -c mBgExec.c
 
 mBgModel:	mBgModel.o debugCheck.o 
 		$(CC) -o mBgModel mBgModel.o debugCheck.o $(LIBS)
@@ -132,7 +132,7 @@ mDiffExecMPI:	mDiffExecMPI.o filePath.o checkHdr.o checkWCS.o
 		checkWCS.o $(LIBS)
 
 mDiffExecMPI.o:	mDiffExec.c
-		$(MPICC) -o mDiffExecMPI.o -DMPI $(CFLAGS) -c mDiffExec.c
+		$(MPICC) -o mDiffExecMPI.o -DMPI $(CFLAGS) $(CPPFLAGS) -c mDiffExec.c
 
 mDiffFitExec:	mDiffFitExec.o filePath.o checkHdr.o checkWCS.o
 		$(CC) -o mDiffFitExec mDiffFitExec.o filePath.o checkHdr.o \
@@ -146,7 +146,7 @@ mFitExecMPI:	mFitExecMPI.o filePath.o checkFile.o
 		checkFile.o $(LIBS)
 
 mFitExecMPI.o:	mFitExec.c
-		$(MPICC) -o mFitExecMPI.o -DMPI $(CFLAGS) -c mFitExec.c
+		$(MPICC) -o mFitExecMPI.o -DMPI $(CFLAGS) $(CPPFLAGS) -c mFitExec.c
 
 mFitplane:	mFitplane.o debugCheck.o
 		$(CC) -o mFitplane mFitplane.o debugCheck.o $(LIBS)
@@ -190,7 +190,7 @@ mProjExecMPI:	mProjExecMPI.o filePath.o checkHdr.o checkWCS.o checkFile.o
 		checkWCS.o checkFile.o $(LIBS)
 
 mProjExecMPI.o:	mProjExec.c
-		$(MPICC) -o mProjExecMPI.o -DMPI $(CFLAGS) -c mProjExec.c
+		$(MPICC) -o mProjExecMPI.o -DMPI $(CFLAGS) $(CPPFLAGS) -c mProjExec.c
 
 mProject:	mProject.o overlapArea.o debugCheck.o checkHdr.o checkWCS.o
 		$(CC) -o mProject mProject.o overlapArea.o debugCheck.o \
diff --git a/MontageLib/Add/Makefile.LINUX b/MontageLib/Add/Makefile.LINUX
index 9f8c7b9..ef5cba4 100644
--- a/MontageLib/Add/Makefile.LINUX
+++ b/MontageLib/Add/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lnsl -lm
+CFLAGS +=-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lwcstools -lmtbl -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mAdd:		mAdd.o montageAdd.o
 		$(CC) -o mAdd mAdd.o montageAdd.o ../util/filePath.o ../util/debugCheck.o ../util/checkHdr.o \
diff --git a/MontageLib/AddCube/Makefile.LINUX b/MontageLib/AddCube/Makefile.LINUX
index d9d798a..e48b046 100644
--- a/MontageLib/AddCube/Makefile.LINUX
+++ b/MontageLib/AddCube/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lnsl -lm
+CFLAGS +=-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lwcstools -lmtbl -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c  $*.c
 
 mAddCube:		mAddCube.o montageAddCube.o
 					$(CC) -o mAddCube mAddCube.o montageAddCube.o ../util/filePath.o ../util/debugCheck.o ../util/checkHdr.o \
diff --git a/MontageLib/ArchiveExec/Makefile b/MontageLib/ArchiveExec/Makefile
index ec0ff13..688f369 100644
--- a/MontageLib/ArchiveExec/Makefile
+++ b/MontageLib/ArchiveExec/Makefile
@@ -9,7 +9,7 @@
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS +=	-I/usr/include/wcstools  -I. -I.. -I../../lib/include -fPIC
-LIBS   =	-L../../lib -lwcstools -lmtbl -lbz2
+LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lmtbl -lbz2
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/MontageLib/ArchiveGet/Makefile b/MontageLib/ArchiveGet/Makefile
index 9258c9a..506d89d 100644
--- a/MontageLib/ArchiveGet/Makefile
+++ b/MontageLib/ArchiveGet/Makefile
@@ -6,7 +6,7 @@ CFLAGS +=	-I/usr/include/wcstools -I. -I.. -I../../lib/include -fPIC
 LIBS   =	$(LDFLAGS) -L../../lib -lbz2
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c  $*.c
 
 mArchiveGet:	mArchiveGet.o montageArchiveGet.o
 		$(CC) -o mArchiveGet mArchiveGet.o montageArchiveGet.o $(LIBS)
diff --git a/MontageLib/ArchiveList/Makefile.LINUX b/MontageLib/ArchiveList/Makefile.LINUX
index 4062500..28d14cf 100644
--- a/MontageLib/ArchiveList/Makefile.LINUX
+++ b/MontageLib/ArchiveList/Makefile.LINUX
@@ -13,7 +13,7 @@ LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lcfitsio -lcoord -lmtbl -lsvc \
 		-lboundaries -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c  $*.c
 
 mArchiveList:	mArchiveList.o montageArchiveList.o
 		$(CC) -o mArchiveList mArchiveList.o montageArchiveList.o $(LIBS)
diff --git a/MontageLib/Background/Makefile.LINUX b/MontageLib/Background/Makefile.LINUX
index b78a451..1144fbd 100644
--- a/MontageLib/Background/Makefile.LINUX
+++ b/MontageLib/Background/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lmtbl -lwcs -lcfitsio -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lmtbl -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mBackground:	mBackground.o montageBackground.o
 			$(CC) -o mBackground mBackground.o montageBackground.o ../util/debugCheck.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/BestImage/Makefile b/MontageLib/BestImage/Makefile
index 6dc3433..d954210 100644
--- a/MontageLib/BestImage/Makefile
+++ b/MontageLib/BestImage/Makefile
@@ -9,10 +9,10 @@
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS =	-g -I. -I.. -I../../lib/include -std=c99 -fPIC -Wall
-LIBS   =	-L../../lib -lwcs -lmtbl -lm
+LIBS   =	-L../../lib -lwcstools -lmtbl -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mBestImage:	mBestImage.o montageBestImage.o \
 		../util/checkWCS.o \
diff --git a/MontageLib/BgModel/Makefile b/MontageLib/BgModel/Makefile
index 860bbf2..d5bdbb5 100644
--- a/MontageLib/BgModel/Makefile
+++ b/MontageLib/BgModel/Makefile
@@ -2,11 +2,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc
-CFLAGS =	-g -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC -Wall
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
 LIBS   =	-L../../lib -lmtbl -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mBgModel:	mBgModel.o montageBgModel.o
 				$(CC) -o mBgModel mBgModel.o montageBgModel.o ../util/debugCheck.o $(LIBS)
diff --git a/MontageLib/CoverageCheck/Makefile.LINUX b/MontageLib/CoverageCheck/Makefile.LINUX
index 5259317..03095a2 100644
--- a/MontageLib/CoverageCheck/Makefile.LINUX
+++ b/MontageLib/CoverageCheck/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lboundaries -lmtbl -lcoord -lwcs -lcfitsio -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lboundaries -lmtbl -lcoord -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mCoverageCheck:	mCoverageCheck.o montageCoverageCheck.o
 						$(CC) -o mCoverageCheck mCoverageCheck.o montageCoverageCheck.o ../util/debugCheck.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/Diff/Makefile.LINUX b/MontageLib/Diff/Makefile.LINUX
index e537af4..c948098 100644
--- a/MontageLib/Diff/Makefile.LINUX
+++ b/MontageLib/Diff/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lcfitsio -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mDiff:	mDiff.o montageDiff.o
 			$(CC) -o mDiff mDiff.o montageDiff.o ../util/debugCheck.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/Examine/Makefile.LINUX b/MontageLib/Examine/Makefile.LINUX
index 8757d58..fceff26 100644
--- a/MontageLib/Examine/Makefile.LINUX
+++ b/MontageLib/Examine/Makefile.LINUX
@@ -2,11 +2,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -std=c99 -fPIC -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99
-CFLAGS =	-g -I. -I.. -I../../lib/include -Wall
-LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include
+LIBS   =	-L../../lib -lwcstools -lcfitsio -lcoord -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mExamine:	mExamine.o montageExamine.o
 		$(CC) -o mExamine mExamine.o montageExamine.o \
diff --git a/MontageLib/Fitplane/Makefile b/MontageLib/Fitplane/Makefile
index 6c3f81c..ac8e540 100644
--- a/MontageLib/Fitplane/Makefile
+++ b/MontageLib/Fitplane/Makefile
@@ -2,11 +2,11 @@
 .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 -lpixbounds -lwcs -lmtbl -lcfitsio -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lpixbounds -lwcstools -lmtbl -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mFitplane:		mFitplane.o montageFitplane.o
 		$(CC) -o mFitplane mFitplane.o montageFitplane.o ../util/debugCheck.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/FixNaN/Makefile.LINUX b/MontageLib/FixNaN/Makefile.LINUX
index 13ef71f..5e16eea 100644
--- a/MontageLib/FixNaN/Makefile.LINUX
+++ b/MontageLib/FixNaN/Makefile.LINUX
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -std=c99 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I.. -I../../lib/include -std=c99 -fPIC -Wall
-LIBS   =	-L../../lib -lwcs -lcfitsio -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -std=c99 -fPIC
+LIBS   =	-L../../lib -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mFixNaN:	mFixNaN.o montageFixNaN.o
 		$(CC) -o mFixNaN mFixNaN.o montageFixNaN.o \
diff --git a/MontageLib/GetHdr/Makefile b/MontageLib/GetHdr/Makefile
index 4910571..4afc226 100644
--- a/MontageLib/GetHdr/Makefile
+++ b/MontageLib/GetHdr/Makefile
@@ -2,11 +2,11 @@
 .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 -lwww -lwcs -lcfitsio -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lwww -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mGetHdr:		mGetHdr.o montageGetHdr.o
 		$(CC) -o mGetHdr mGetHdr.o montageGetHdr.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/Hdr/Makefile.LINUX b/MontageLib/Hdr/Makefile.LINUX
index 07e5fef..14933d7 100644
--- a/MontageLib/Hdr/Makefile.LINUX
+++ b/MontageLib/Hdr/Makefile.LINUX
@@ -2,12 +2,12 @@
 .SUFFIXES: .c .o
 
 CC     =	cc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
-CFLAGS =	-g -I. -I.. -I../../lib/include -Wall
-LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lmtbl \
-		-lboundaries -lnsl -lm
+CFLAGS +=	-I. -I.. -I../../lib/include
+LIBS   =	-L../../lib -lwcstools -lcfitsio -lcoord -lmtbl \
+		-lboundaries -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mHdr:	mHdr.o montageHdr.o
 		$(CC) -o mHdr mHdr.o montageHdr.o $(LIBS)
diff --git a/MontageLib/Histogram/Makefile b/MontageLib/Histogram/Makefile
index b7916ef..8838d86 100644
--- a/MontageLib/Histogram/Makefile
+++ b/MontageLib/Histogram/Makefile
@@ -2,11 +2,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc
-CFLAGS =	-g -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC -Wall
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
 LIBS   =	-L../../lib -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mHistogram:		mHistogram.o montageHistogram.o
 		$(CC) -o mHistogram mHistogram.o montageHistogram.o $(LIBS)
diff --git a/MontageLib/Imgtbl/Makefile.LINUX b/MontageLib/Imgtbl/Makefile.LINUX
index 2f826f0..ae36a5f 100644
--- a/MontageLib/Imgtbl/Makefile.LINUX
+++ b/MontageLib/Imgtbl/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lcoord -lmtbl -lcfitsio -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lwcstools -lcoord -lmtbl -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mImgtbl:		mImgtbl.o montageImgtbl.o
 		$(CC) -o mImgtbl mImgtbl.o montageImgtbl.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/MakeHdr/Makefile.LINUX b/MontageLib/MakeHdr/Makefile.LINUX
index c7cab41..e63d1e0 100644
--- a/MontageLib/MakeHdr/Makefile.LINUX
+++ b/MontageLib/MakeHdr/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lboundaries -lmtbl -lcoord -lcfitsio -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lwcstools -lboundaries -lmtbl -lcoord -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mMakeHdr:	mMakeHdr.o montageMakeHdr.o
 				$(CC) -o mMakeHdr mMakeHdr.o montageMakeHdr.o ../util/debugCheck.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/MakeImg/Makefile.LINUX b/MontageLib/MakeImg/Makefile.LINUX
index 3734057..a717b3a 100644
--- a/MontageLib/MakeImg/Makefile.LINUX
+++ b/MontageLib/MakeImg/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lcmd -lmtbl -ljson -lcoord -lwcs -lcfitsio -lnsl -lm
+CFLAGS +=	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lcmd -lmtbl -ljson -lcoord -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mMakeImg:	mMakeImg.o montageMakeImg.o
 			$(CC) -o mMakeImg mMakeImg.o montageMakeImg.o $(LIBS)
diff --git a/MontageLib/Makefile b/MontageLib/Makefile
index 478b39b..809d4b4 100644
--- a/MontageLib/Makefile
+++ b/MontageLib/Makefile
@@ -93,7 +93,7 @@ lib:
 			FitExec/montageFitExec.o \
 			DiffFitExec/montageDiffFitExec.o \
 			ProjExec/montageProjExec.o 
-		-gcc -shared $(SO_FLAG) -o libmontage.so \
+		-$(CC) -shared $(SO_FLAG) -o libmontage.so \
 			util/checkFile.o util/checkHdr.o util/checkWCS.o \
 			util/debugCheck.o util/filePath.o \
 			Add/montageAdd.o \
diff --git a/MontageLib/Overlaps/Makefile.LINUX b/MontageLib/Overlaps/Makefile.LINUX
index 7fdcd7d..b88c25c 100644
--- a/MontageLib/Overlaps/Makefile.LINUX
+++ b/MontageLib/Overlaps/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lcoord -lwcs -lmtbl -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lcoord -lwcstools -lmtbl -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mOverlaps:	mOverlaps.o montageOverlaps.o
 				$(CC) -o mOverlaps mOverlaps.o montageOverlaps.o ../util/debugCheck.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/Project/Makefile.LINUX b/MontageLib/Project/Makefile.LINUX
index 41d36db..861f4c3 100644
--- a/MontageLib/Project/Makefile.LINUX
+++ b/MontageLib/Project/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lcoord -lwcs -lcfitsio -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lcoord -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mProject:	mProject.o montageProject.o
 				$(CC) -o mProject mProject.o montageProject.o ../util/debugCheck.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/ProjectCube/Makefile.LINUX b/MontageLib/ProjectCube/Makefile.LINUX
index 66c5fb7..9eb4b76 100644
--- a/MontageLib/ProjectCube/Makefile.LINUX
+++ b/MontageLib/ProjectCube/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lcoord -lwcs -lcfitsio -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lcoord -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mProjectCube:	mProjectCube.o montageProjectCube.o
 					$(CC) -o mProjectCube mProjectCube.o montageProjectCube.o ../util/debugCheck.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/ProjectPP/Makefile.LINUX b/MontageLib/ProjectPP/Makefile.LINUX
index fe17433..d0e7d2f 100644
--- a/MontageLib/ProjectPP/Makefile.LINUX
+++ b/MontageLib/ProjectPP/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -ltwoplane -lcoord -lwcs -lcfitsio -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -ltwoplane -lcoord -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mProjectPP:	mProjectPP.o montageProjectPP.o
 				$(CC) -o mProjectPP mProjectPP.o montageProjectPP.o ../util/debugCheck.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/ProjectQL/Makefile.LINUX b/MontageLib/ProjectQL/Makefile.LINUX
index 08a1014..54c685a 100644
--- a/MontageLib/ProjectQL/Makefile.LINUX
+++ b/MontageLib/ProjectQL/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lcoord -lwcs -lcfitsio -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lcoord -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mProjectQL:	mProjectQL.o montageProjectQL.o
 				$(CC) -o mProjectQL mProjectQL.o montageProjectQL.o ../util/debugCheck.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/PutHdr/Makefile b/MontageLib/PutHdr/Makefile
index 83c0858..3240c0d 100644
--- a/MontageLib/PutHdr/Makefile
+++ b/MontageLib/PutHdr/Makefile
@@ -2,11 +2,11 @@
 .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 -lcfitsio -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mPutHdr:		mPutHdr.o montagePutHdr.o
 		$(CC) -o mPutHdr mPutHdr.o montagePutHdr.o ../util/debugCheck.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/Shrink/Makefile b/MontageLib/Shrink/Makefile
index 61bfebc..e2d1ef2 100644
--- a/MontageLib/Shrink/Makefile
+++ b/MontageLib/Shrink/Makefile
@@ -2,11 +2,11 @@
 .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 -lcfitsio -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mShrink:	mShrink.o montageShrink.o
 			$(CC) -o mShrink mShrink.o montageShrink.o ../util/debugCheck.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/ShrinkCube/Makefile b/MontageLib/ShrinkCube/Makefile
index 03f2c04..798edea 100644
--- a/MontageLib/ShrinkCube/Makefile
+++ b/MontageLib/ShrinkCube/Makefile
@@ -2,11 +2,11 @@
 .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 -lcfitsio -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mShrinkCube:	mShrinkCube.o montageShrinkCube.o
 					$(CC) -o mShrinkCube mShrinkCube.o montageShrinkCube.o ../util/debugCheck.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/SubCube/Makefile.LINUX b/MontageLib/SubCube/Makefile.LINUX
index 856b0c5..c9971c1 100644
--- a/MontageLib/SubCube/Makefile.LINUX
+++ b/MontageLib/SubCube/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lcoord -lwcs -lcfitsio -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lcoord -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mSubCube:	mSubCube.o montageSubCube.o
 				$(CC) -o mSubCube mSubCube.o montageSubCube.o ../util/debugCheck.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/Subimage/Makefile.LINUX b/MontageLib/Subimage/Makefile.LINUX
index 9395849..801e666 100644
--- a/MontageLib/Subimage/Makefile.LINUX
+++ b/MontageLib/Subimage/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lcoord -lwcs -lcfitsio -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lcoord -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mSubimage:	mSubimage.o montageSubimage.o
 			$(CC) -o mSubimage mSubimage.o montageSubimage.o ../util/debugCheck.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/Subset/Makefile.LINUX b/MontageLib/Subset/Makefile.LINUX
index eed94b3..0731aa1 100644
--- a/MontageLib/Subset/Makefile.LINUX
+++ b/MontageLib/Subset/Makefile.LINUX
@@ -2,11 +2,11 @@
 .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 -lcoord -lmtbl -lwcs -lcfitsio -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
+LIBS   =	-L../../lib -lcoord -lmtbl -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mSubset:	mSubset.o montageSubset.o
 			$(CC) -o mSubset mSubset.o montageSubset.o ../util/debugCheck.o ../util/checkFile.o ../util/checkHdr.o ../util/checkWCS.o $(LIBS)
diff --git a/MontageLib/Transpose/Makefile.LINUX b/MontageLib/Transpose/Makefile.LINUX
index 69f21a9..551c113 100644
--- a/MontageLib/Transpose/Makefile.LINUX
+++ b/MontageLib/Transpose/Makefile.LINUX
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I.. -I../../lib/include -std=c99 -fPIC -Wall
-LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include -std=c99 -fPIC
+LIBS   =	-L../../lib -lwcstools -lcfitsio -lcoord -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mTranspose:	mTranspose.o montageTranspose.o
 		$(CC) -o mTranspose mTranspose.o montageTranspose.o \
diff --git a/MontageLib/Viewer/Makefile.LINUX b/MontageLib/Viewer/Makefile.LINUX
index e13fa06..89c244a 100644
--- a/MontageLib/Viewer/Makefile.LINUX
+++ b/MontageLib/Viewer/Makefile.LINUX
@@ -9,18 +9,18 @@
 
 DATA_DIR = $(shell cd ../../data; pwd)
 
-CC     =        gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC \
-                -DFONT_DIR='"$(DATA_DIR)/fonts/"'
-CFLAGS =	-g -I. -I.. -I../../lib/include -I../../lib/freetype/include \
-		-I../../lib/freetype/include/freetype2 -I../../Montage -Wall
-LIBS   =        -L../../lib -lwcs -lcoord -lcfitsio -ljpeg -llodepng -lmtbl -ljson -lcmd \
-                -L../../lib/freetype/lib -lfreetype -lnsl -lm
+CFLAGS +=       -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC \
+                -DFONT_DIR='"$(DATA_DIR)/fonts/"' \
+		-I. -I.. -I../../lib/include -I../../lib/freetype/include \
+		-I../../lib/freetype/include/freetype2 -I../../Montage
+LIBS   =        -L../../lib -lwcstools -lcoord -lcfitsio -ljpeg -llodepng -lmtbl -ljson -lcmd \
+                -L../../lib/freetype/lib -lfreetype -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mViewer:	mViewer.o montageViewer.o mViewer_graphics.o mViewer_grid.o
-		$(CC) -o mViewer mViewer.o montageViewer.o mViewer_graphics.o mViewer_grid.o \
+		$(CC) $(CFLAGS) -o mViewer mViewer.o montageViewer.o mViewer_graphics.o mViewer_grid.o \
 		../util/checkHdr.o   \
 		../util/checkWCS.o   \
 		$(LIBS)
diff --git a/MontageLib/WWT/Makefile.LINUX b/MontageLib/WWT/Makefile.LINUX
index a3b0acf..eb412e4 100644
--- a/MontageLib/WWT/Makefile.LINUX
+++ b/MontageLib/WWT/Makefile.LINUX
@@ -2,11 +2,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
-CFLAGS =	-g -I. -I.. -I../../lib/include -Wall
-LIBS   =	-L../../lib -lsvc -lnsl -lm
+CFLAGS += 	-I. -I.. -I../../lib/include
+LIBS   =	-L../../lib -lsvc -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 all: mHdrWWT mHdrWWTExec mProjWWTExec mPNGWWTExec
 
diff --git a/MontageLib/test/Makefile b/MontageLib/test/Makefile
index 2a22280..3583e18 100644
--- a/MontageLib/test/Makefile
+++ b/MontageLib/test/Makefile
@@ -2,7 +2,7 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc
-CFLAGS =	-g -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC -Wall
+CFLAGS +=	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
 LIBS   =	-L../../lib -lcmd -lsvc -lm
 
 .c.o:
diff --git a/MontageLib/util/Makefile b/MontageLib/util/Makefile
index 4e53fa9..40ab6a3 100644
--- a/MontageLib/util/Makefile
+++ b/MontageLib/util/Makefile
@@ -3,10 +3,10 @@
 
 CC     =	gcc
 MPICC  =
-CFLAGS =	-g -I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC -Wall
+CFLAGS +=	-I. -I.. -I../../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c  $*.c
 
 all:		filePath.o debugCheck.o checkFile.o checkHdr.o checkWCS.o version.o
 
diff --git a/ancillary/Makefile b/ancillary/Makefile
index 7eaa394..52d5fbc 100644
--- a/ancillary/Makefile
+++ b/ancillary/Makefile
@@ -1,8 +1,8 @@
 HPXcvt:		HPXcvt.o
-				gcc -std=gnu99 -o HPXcvt HPXcvt.o -L../lib -lcfitsio -lm
+				$(CC) -std=gnu99 -o HPXcvt HPXcvt.o -L../lib -lcfitsio -lm
 
 HPXcvt.o:	HPXcvt.c
-				gcc -std=gnu99 -g -O2 -I../lib/include -c -o HPXcvt.o HPXcvt.c
+				$(CC) -std=gnu99 -g -O2 -I../lib/include -c -o HPXcvt.o HPXcvt.c
 
 install:
 				cp HPXcvt ../bin
diff --git a/grid/Globus/ExecTG/Makefile.LINUX b/grid/Globus/ExecTG/Makefile.LINUX
index 33a846b..b159874 100644
--- a/grid/Globus/ExecTG/Makefile.LINUX
+++ b/grid/Globus/ExecTG/Makefile.LINUX
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I../../../lib/include -I../../../Montage
-LIBS   =	-L../../../lib -lsvc -lmtbl -lwcstools -lcfitsio -lcoord -lm
+CFLAGS += -I. -I../../../lib/include -I../../../Montage
+LIBS   = $(LDFLAGS)	-L../../../lib -lsvc -lmtbl -lwcstools -lcfitsio -lcoord -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mExecTG:	mExecTG.o
 		$(CC) -o mExecTG mExecTG.o \
diff --git a/grid/Globus/NotifyTG/Makefile.LINUX b/grid/Globus/NotifyTG/Makefile.LINUX
index d70f4dd..67e153c 100644
--- a/grid/Globus/NotifyTG/Makefile.LINUX
+++ b/grid/Globus/NotifyTG/Makefile.LINUX
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I../../../lib/include -I../../../Montage
-LIBS   =	-L../../../lib -lsvc -lmtbl -lwcstools -lcfitsio -lcoord -lm
+CFLAGS += -I. -I../../../lib/include -I../../../Montage
+LIBS   = $(LDFLAGS)	-L../../../lib -lsvc -lmtbl -lwcstools -lcfitsio -lcoord -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mNotifyTG:	mNotifyTG.o
 		$(CC) -o mNotifyTG mNotifyTG.o \
diff --git a/grid/Pegasus/Makefile.LINUX b/grid/Pegasus/Makefile.LINUX
index fbcdc3e..6337c79 100644
--- a/grid/Pegasus/Makefile.LINUX
+++ b/grid/Pegasus/Makefile.LINUX
@@ -15,12 +15,12 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I../../Montage -I../../lib/include
-LIBS   =	-L../../lib -lwcstools -lcfitsio -lcoord -lmtbl -lsvc \
+CFLAGS += -I. -I../../Montage -I../../lib/include
+LIBS   = $(LDFLAGS)	-L../../lib -lwcstools -lcfitsio -lcoord -lmtbl -lsvc \
 		-lboundaries -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 all:		mConcatFit mDAG mDAGFiles mDAGGalacticPlane mDAGTbls \
 		mDiffFit mGridExec mNotify mPresentation
diff --git a/lib/src/boundaries/Makefile b/lib/src/boundaries/Makefile
index abc614d..7f0ccc8 100644
--- a/lib/src/boundaries/Makefile
+++ b/lib/src/boundaries/Makefile
@@ -1,5 +1,5 @@
 CC      =		gcc
-CFLAGS  =		-c -g -fPIC -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS  +=		-fPIC -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 LIBNAME =		libboundaries.a
 
 SRCS    =		boundaries.c
diff --git a/lib/src/cmd/Makefile b/lib/src/cmd/Makefile
index 25202b3..be346b6 100644
--- a/lib/src/cmd/Makefile
+++ b/lib/src/cmd/Makefile
@@ -1,5 +1,5 @@
 CC      =		gcc
-CFLAGS  =		-c -g -fPIC -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS  +=		-fPIC -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 LIBNAME =		libcmd.a
 
 SRCS    =		cmd.c
diff --git a/lib/src/coord/Makefile b/lib/src/coord/Makefile
index 91bfa16..a9c3bb4 100644
--- a/lib/src/coord/Makefile
+++ b/lib/src/coord/Makefile
@@ -1,5 +1,5 @@
 CC      =	gcc
-CFLAGS  =	-g -c -fPIC -D_LARGEFILE_SOURCE \
+CFLAGS  +=	-fPIC -D_LARGEFILE_SOURCE \
 		-D_FILE_OFFSET_BITS=64 -I. -I../../include
 LIBNAME =	libcoord.a
 
diff --git a/lib/src/json/Makefile b/lib/src/json/Makefile
index 964bd2d..3866f1a 100644
--- a/lib/src/json/Makefile
+++ b/lib/src/json/Makefile
@@ -1,4 +1,4 @@
-CC =		 gcc -g -fPIC -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS =	-g -fPIC -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
 libjson.a:	jsonlib.o
 		ar rv libjson.a jsonlib.o
diff --git a/lib/src/lodepng_20140823/Makefile b/lib/src/lodepng_20140823/Makefile
index 6cf4954..d8eba08 100644
--- a/lib/src/lodepng_20140823/Makefile
+++ b/lib/src/lodepng_20140823/Makefile
@@ -1,5 +1,5 @@
 CC      =   gcc
-CFLAGS  =   -c -ansi -Wall -fPIC -g -I. -I../../include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS  +=   -fPIC -ansi -I. -I../../include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
 liblodepng.a:	lodepng.o 
 				ar rv liblodepng.a lodepng.o 
diff --git a/lib/src/mtbl/Makefile b/lib/src/mtbl/Makefile
index bf4aa48..369a524 100644
--- a/lib/src/mtbl/Makefile
+++ b/lib/src/mtbl/Makefile
@@ -1,7 +1,8 @@
-CC = gcc -g -fPIC -I . -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CC = gcc
+CFLAGS += -fPIC -I . -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
 libmtbl.a:	mtbl.c
-		$(CC) -c mtbl.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c mtbl.c
 		ar rv libmtbl.a mtbl.o
 
 install:
diff --git a/lib/src/pixbounds/Makefile b/lib/src/pixbounds/Makefile
index 97530b3..b350597 100644
--- a/lib/src/pixbounds/Makefile
+++ b/lib/src/pixbounds/Makefile
@@ -1,5 +1,5 @@
 CC      =               gcc 
-CFLAGS  =               -c -g -fPIC -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS  +=              -fPIC -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 LIBNAME =               libpixbounds.a
 
 SRCS    =               pixbounds.c
diff --git a/lib/src/svc/Makefile b/lib/src/svc/Makefile
index 4944722..2dfd962 100644
--- a/lib/src/svc/Makefile
+++ b/lib/src/svc/Makefile
@@ -1,4 +1,4 @@
-CC =		 gcc -g -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS =	-g -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
 libsvc.a:	svclib.o structlib.o
 		ar rv libsvc.a svclib.o structlib.o
diff --git a/lib/src/two_plane_v1.1/Makefile b/lib/src/two_plane_v1.1/Makefile
index 511c032..c4179e6 100644
--- a/lib/src/two_plane_v1.1/Makefile
+++ b/lib/src/two_plane_v1.1/Makefile
@@ -1,5 +1,5 @@
 CC      =       gcc
-CFLAGS  =       -c -ansi -Wall -fPIC -g -I. -I../../include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS  +=      -fPIC -ansi -I. -I../../include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
 libtwoplane.a:	two_plane.o distort.o initdistdata.o \
 		undistort.o redefine_pointing.o
diff --git a/util/Archive/ArchiveExec/Makefile b/util/Archive/ArchiveExec/Makefile
index a8389f2..7c5f7e4 100644
--- a/util/Archive/ArchiveExec/Makefile
+++ b/util/Archive/ArchiveExec/Makefile
@@ -8,14 +8,14 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I../../../lib/include
-LIBS   =	-L../../../lib -lwcstools -lmtbl -lsvc
+CFLAGS += -I. -I../../../lib/include
+LIBS   = $(LDFLAGS)	-L../../../lib -lwcstools -lmtbl -lsvc
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c  $*.c
 
 mArchiveExec:	mArchiveExec.o
-		$(CC) -o mArchiveExec mArchiveExec.o $(LIBS)
+		$(CC) $(LDFLAGS) -o mArchiveExec mArchiveExec.o $(LIBS)
 
 install:
 		cp mArchiveExec ../../../bin
diff --git a/util/Archive/ArchiveGet/Makefile.LINUX b/util/Archive/ArchiveGet/Makefile.LINUX
index 402e8c1..1b0e61b 100644
--- a/util/Archive/ArchiveGet/Makefile.LINUX
+++ b/util/Archive/ArchiveGet/Makefile.LINUX
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc
-CFLAGS =	-g -I../../../Montage -I../../../lib/include
-LIBS   =	 -L../../../lib -lwcstools -lcfitsio -lmcurl -lcurl -lnsl -lidn -lssl -lcrypto -ldl -llber -lldap -lz -lrt -L/usr/kerberos/lib64 -lm
+CFLAGS += -I../../../Montage -I../../../lib/include
+LIBS   =	 $(LDFLAGS) -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
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mArchiveGet:	mArchiveGet.o
 		$(CC) -o mArchiveGet mArchiveGet.o  \
diff --git a/util/Archive/ArchiveList/Makefile.LINUX b/util/Archive/ArchiveList/Makefile.LINUX
index ffaf89f..51236af 100644
--- a/util/Archive/ArchiveList/Makefile.LINUX
+++ b/util/Archive/ArchiveList/Makefile.LINUX
@@ -8,12 +8,12 @@
 .SUFFIXES: .c .o
 
 CC     =	cc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I../../../lib/include
-LIBS   =	-L../../../lib -lwcstools -lcfitsio -lcoord -lmtbl -lsvc \
+CFLAGS += -I. -I../../../lib/include
+LIBS   = $(LDFLAGS)	-L../../../lib -lwcstools -lcfitsio -lcoord -lmtbl -lsvc \
 		-lboundaries -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mArchiveList:	mArchiveList.o
 		$(CC) -o mArchiveList mArchiveList.o $(LIBS)
diff --git a/util/BestImage/Makefile b/util/BestImage/Makefile
index 6e3785f..3d3e7be 100644
--- a/util/BestImage/Makefile
+++ b/util/BestImage/Makefile
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I../../lib/include
-LIBS   =	-L../../lib -lwcstools -lmtbl -lsvc -lm
+CFLAGS += -I. -I../../lib/include
+LIBS   = $(LDFLAGS)	-L../../lib -lwcstools -lmtbl -lsvc -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c  $*.c
 
 mBestImage:	mBestImage.o \
 		../../Montage/checkWCS.o \
diff --git a/util/CatMap/Makefile.LINUX b/util/CatMap/Makefile.LINUX
index b8c61a4..e1bb679 100644
--- a/util/CatMap/Makefile.LINUX
+++ b/util/CatMap/Makefile.LINUX
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lmtbl -lcoord -lwcstools -lcfitsio -lm
+CFLAGS += -I. -I../../lib/include -I../../Montage
+LIBS   = $(LDFLAGS)	-L../../lib -lmtbl -lcoord -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mCatMap:	mCatMap.o
 		$(CC) -o mCatMap mCatMap.o \
diff --git a/util/Examine/Makefile.LINUX b/util/Examine/Makefile.LINUX
index a633504..cd950d6 100644
--- a/util/Examine/Makefile.LINUX
+++ b/util/Examine/Makefile.LINUX
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 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 -lwcstools -lcfitsio -lcoord -lm
+CFLAGS +=	-I. -I../../lib/include -I../../Montage
+LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lcfitsio -lcoord -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c  $*.c
 
 mExamine:	mExamine.o
 		$(CC) -o mExamine mExamine.o \
diff --git a/util/Exec/Makefile.LINUX b/util/Exec/Makefile.LINUX
index 8ed05d6..7d51644 100644
--- a/util/Exec/Makefile.LINUX
+++ b/util/Exec/Makefile.LINUX
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lsvc -lmtbl -lwcstools -lcfitsio -lcoord -lm
+CFLAGS += -I. -I../../lib/include -I../../Montage
+LIBS   = $(LDFLAGS)	-L../../lib -lsvc -lmtbl -lwcstools -lcfitsio -lcoord -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mExec:		mExec.o
 		$(CC) -o mExec mExec.o \
diff --git a/util/FixNaN/Makefile.LINUX b/util/FixNaN/Makefile.LINUX
index f88d931..147565d 100644
--- a/util/FixNaN/Makefile.LINUX
+++ b/util/FixNaN/Makefile.LINUX
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -std=c99 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lwcstools -lcfitsio -lm
+CFLAGS +=	-I. -I../../lib/include -I../../Montage
+LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c  $*.c
 
 mFixNaN:	mFixNaN.o
 		$(CC) -o mFixNaN mFixNaN.o \
diff --git a/util/Hdr/Makefile.LINUX b/util/Hdr/Makefile.LINUX
index 9c7ea35..9941551 100644
--- a/util/Hdr/Makefile.LINUX
+++ b/util/Hdr/Makefile.LINUX
@@ -8,12 +8,12 @@
 .SUFFIXES: .c .o
 
 CC     =	cc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I../../lib/include
-LIBS   =	-L../../lib -lwcstools -lcfitsio -lcoord -lmtbl -lsvc \
+CFLAGS += -I. -I../../lib/include
+LIBS   = $(LDFLAGS)	-L../../lib -lwcstools -lcfitsio -lcoord -lmtbl -lsvc \
 		-lboundaries -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mHdr:	mHdr.o
 		$(CC) -o mHdr mHdr.o $(LIBS)
diff --git a/util/JPEG/Makefile.LINUX b/util/JPEG/Makefile.LINUX
index 2a57f00..e6b79dc 100644
--- a/util/JPEG/Makefile.LINUX
+++ b/util/JPEG/Makefile.LINUX
@@ -9,11 +9,11 @@
 .SUFFIXES: .c .o
 
 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 -lwcstools -lcoord -lcfitsio -ljpeg -lm
+CFLAGS +=	-I. -I../../lib/include -I../../Montage
+LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lcoord -lcfitsio -ljpeg -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c  $*.c
 
 mJPEG:		mJPEG.o
 		$(CC) -o mJPEG mJPEG.o \
diff --git a/util/Pad/Makefile.LINUX b/util/Pad/Makefile.LINUX
index da1df54..1728608 100644
--- a/util/Pad/Makefile.LINUX
+++ b/util/Pad/Makefile.LINUX
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 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 -lm
+CFLAGS +=	-I. -I../../lib/include -I../../Montage
+LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c  $*.c
 
 mPad:		mPad.o
 		$(CC) -o mPad mPad.o \
diff --git a/util/Pix2Coord/Makefile.LINUX b/util/Pix2Coord/Makefile.LINUX
index 72c2a00..e55864f 100644
--- a/util/Pix2Coord/Makefile.LINUX
+++ b/util/Pix2Coord/Makefile.LINUX
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lwcstools -lcoord -lcfitsio -ljpeg -lm
+CFLAGS += -I. -I../../lib/include -I../../Montage
+LIBS   = $(LDFLAGS)	-L../../lib -lwcstools -lcoord -lcfitsio -ljpeg -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 all:		mPix2Coord mFixHdr
 
@@ -23,7 +23,7 @@ mPix2Coord:	mPix2Coord.o
 		$(LIBS)
 
 mFixHdr:	mFixHdr.o
-		$(CC) -o mFixHdr mFixHdr.o
+		$(CC) $(LDFLAGS) -o mFixHdr mFixHdr.o
 
 install:
 		cp mPix2Coord mFixHdr ../../bin
diff --git a/util/Rotate/Makefile.LINUX b/util/Rotate/Makefile.LINUX
index 31300ca..9c691ac 100644
--- a/util/Rotate/Makefile.LINUX
+++ b/util/Rotate/Makefile.LINUX
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 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 -lwcstools -lcfitsio -lcoord -lm
+CFLAGS +=	-I. -I../../lib/include -I../../Montage
+LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lcfitsio -lcoord -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c  $*.c
 
 mRotate:	mRotate.o
 		$(CC) -o mRotate mRotate.o \
diff --git a/util/Search/Makefile.LINUX b/util/Search/Makefile.LINUX
index c8c15a4..83dbc37 100644
--- a/util/Search/Makefile.LINUX
+++ b/util/Search/Makefile.LINUX
@@ -8,12 +8,12 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I./rtree -I../../lib/include -I../../Montage
-LIBS   =	-Lrtree -lrtree \
+CFLAGS += -I. -I./rtree -I../../lib/include -I../../Montage
+LIBS   = $(LDFLAGS)	-Lrtree -lrtree \
 		-L../../lib -lcmd -lwcstools -lcoord -lmtbl -lcfitsio -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mSearch:	mSearch.o
 		(cd rtree; make)
diff --git a/util/Search/rtree/Makefile b/util/Search/rtree/Makefile
index 4de074e..4b0a400 100644
--- a/util/Search/rtree/Makefile
+++ b/util/Search/rtree/Makefile
@@ -1,5 +1,4 @@
 CC = gcc
-CFLAGS = 
 
 OBJECTS = card.o \
 	index.o \
@@ -15,10 +14,10 @@ librtree.a: $(OBJECTS)
 	ranlib librtree.a
 
 test: test.c librtree.a
-	$(CC) $(LDFLAGS) -o $@ test.c librtree.a -lm
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ test.c librtree.a -lm
 
 .c.o:
-	$(CC) $(CFLAGS) -Wall -c $<
+	$(CC) $(CFLAGS) $(CPPFLAGS) -Wall -c $<
 
 clean:
 	rm -rf ./*.o ./*.a
diff --git a/util/ShrinkHdr/Makefile.LINUX b/util/ShrinkHdr/Makefile.LINUX
index 3f2058c..8c12fd4 100644
--- a/util/ShrinkHdr/Makefile.LINUX
+++ b/util/ShrinkHdr/Makefile.LINUX
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lwcstools -lcoord -lcfitsio -ljpeg -lm
+CFLAGS += -I. -I../../lib/include -I../../Montage
+LIBS   = $(LDFLAGS)	-L../../lib -lwcstools -lcoord -lcfitsio -ljpeg -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS)  -c  $*.c
 
 mShrinkHdr:	mShrinkHdr.o
 		$(CC) -o mShrinkHdr mShrinkHdr.o \
diff --git a/util/TblExec/Makefile b/util/TblExec/Makefile
index 58eb224..8eab94d 100644
--- a/util/TblExec/Makefile
+++ b/util/TblExec/Makefile
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lsvc -lmtbl -lm
+CFLAGS += -I. -I../../lib/include -I../../Montage
+LIBS   = $(LDFLAGS)	-L../../lib -lsvc -lmtbl -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c  $*.c
 
 mTblExec:	mTblExec.o
 		$(CC) -o mTblExec mTblExec.o $(LIBS)
diff --git a/util/Transpose/Makefile.LINUX b/util/Transpose/Makefile.LINUX
index bdb0157..26c7cfc 100644
--- a/util/Transpose/Makefile.LINUX
+++ b/util/Transpose/Makefile.LINUX
@@ -8,11 +8,11 @@
 .SUFFIXES: .c .o
 
 CC     =	gcc -std=c99 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS =	-g -I. -I../../lib/include -I../../Montage
-LIBS   =	-L../../lib -lwcstools -lcfitsio -lcoord -lm
+CFLAGS +=	-I. -I../../lib/include -I../../Montage
+LIBS   =	$(LDFLAGS) -L../../lib -lwcstools -lcfitsio -lcoord -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c  $*.c
 
 mTranspose:	mTranspose.o
 		$(CC) -o mTranspose mTranspose.o \
diff --git a/util/Viewer/Makefile.LINUX b/util/Viewer/Makefile.LINUX
index ee56db8..9170f35 100644
--- a/util/Viewer/Makefile.LINUX
+++ b/util/Viewer/Makefile.LINUX
@@ -11,13 +11,13 @@ DATA_DIR = $(shell cd ../../data; pwd)
 
 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 \
+CFLAGS +=	-I. -I../../lib/include -I../../lib/freetype/include \
 		-I../../lib/freetype/include/freetype2 -I../../Montage
-LIBS   =        -L../../lib -lwcstools -lcoord -lcfitsio -ljpeg -llodepng -lmtbl -lcmd \
+LIBS   =        $(LDFLAGS) -L../../lib -lwcstools -lcoord -lcfitsio -ljpeg -llodepng -lmtbl -lcmd \
                 -L../../lib/freetype/lib -lfreetype -lm
 
 .c.o:
-		$(CC) $(CFLAGS)  -c  $*.c
+		$(CC) $(CFLAGS) $(CPPFLAGS) -c  $*.c
 
 all: mViewer mHistogram