Montage_6.0_ubuntu22.04_gcc11

Montage_ubuntu22.04_gcc11.patch

diff -ra Montage.orig/grid/Globus/ExecTG/Makefile.LINUX Montage/grid/Globus/ExecTG/Makefile.LINUX
12c12
< LIBS   =	-L../../../lib -lsvc -lmtbl -lwcs -lcfitsio -lcoord -lnsl -lm
---
> LIBS   =	-L../../../lib -lsvc -lmtbl -lwcs -lcfitsio -lcoord  -lm
diff -ra Montage.orig/grid/Globus/NotifyTG/Makefile.LINUX Montage/grid/Globus/NotifyTG/Makefile.LINUX
12c12
< LIBS   =	-L../../../lib -lsvc -lmtbl -lwcs -lcfitsio -lcoord -lnsl -lm
---
> LIBS   =	-L../../../lib -lsvc -lmtbl -lwcs -lcfitsio -lcoord  -lm
diff -ra Montage.orig/grid/Pegasus/Makefile.LINUX Montage/grid/Pegasus/Makefile.LINUX
20c20
< 		-lboundaries -lnsl -lm
---
> 		-lboundaries  -lm
diff -ra Montage.orig/lib/src/coord/convertCoordinates.c Montage/lib/src/coord/convertCoordinates.c
4a5
> int coord_debug;
diff -ra Montage.orig/lib/src/coord/coord.h Montage/lib/src/coord/coord.h
4c4
< int coord_debug;
---
> extern int coord_debug;
diff -ra Montage.orig/lib/src/Makefile Montage/lib/src/Makefile
3c3
< 	(cd cfitsio-3.25; ./configure; make; cp libcfitsio.a ../..; cp *.h ../../include)
---
> 	(cd cfitsio-3.25; ./configure; make CFLAGS=-Dunix; cp libcfitsio.a ../..; cp *.h ../../include)
diff -ra Montage.orig/Montage/Makefile.LINUX Montage/Montage/Makefile.LINUX
51c51
< CFLAGS =	-g -I. -I../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99
---
> CFLAGS =	-g -I. -I../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fcommon	
53c53
< 		   -lwww -lboundaries -lpixbounds -ltwoplane -lnsl -lm
---
> 		   -lwww -lboundaries -lpixbounds -ltwoplane -lm
diff -ra Montage.orig/MontageLib/Add/Makefile Montage/MontageLib/Add/Makefile
6c6
< LIBS   =	-L../../lib -lwcs -lmtbl -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lmtbl -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/Add/Makefile.LINUX Montage/MontageLib/Add/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lwcs -lmtbl -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lmtbl -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/AddCube/Makefile Montage/MontageLib/AddCube/Makefile
6c6
< LIBS   =	-L../../lib -lwcs -lmtbl -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lmtbl -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/AddCube/Makefile.LINUX Montage/MontageLib/AddCube/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lwcs -lmtbl -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lmtbl -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/ArchiveList/Makefile.LINUX Montage/MontageLib/ArchiveList/Makefile.LINUX
13c13
< 		-lboundaries -lnsl -lm
---
> 		-lboundaries  -lm
diff -ra Montage.orig/MontageLib/Background/Makefile Montage/MontageLib/Background/Makefile
6c6
< LIBS   =	-L../../lib -lmtbl -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lmtbl -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/Background/Makefile.LINUX Montage/MontageLib/Background/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lmtbl -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lmtbl -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/CoverageCheck/Makefile Montage/MontageLib/CoverageCheck/Makefile
6c6
< LIBS   =	-L../../lib -lboundaries -lmtbl -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lboundaries -lmtbl -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/CoverageCheck/Makefile.LINUX Montage/MontageLib/CoverageCheck/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lboundaries -lmtbl -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lboundaries -lmtbl -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/Diff/Makefile Montage/MontageLib/Diff/Makefile
6c6
< LIBS   =	-L../../lib -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/Diff/Makefile.LINUX Montage/MontageLib/Diff/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/Examine/Makefile Montage/MontageLib/Examine/Makefile
6c6
< LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord  -lm
diff -ra Montage.orig/MontageLib/Examine/Makefile.LINUX Montage/MontageLib/Examine/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord  -lm
diff -ra Montage.orig/MontageLib/FixNaN/Makefile.LINUX Montage/MontageLib/FixNaN/Makefile.LINUX
12c12
< LIBS   =	-L../../lib -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/Hdr/Makefile Montage/MontageLib/Hdr/Makefile
7c7
< 		-lboundaries -lnsl -lm
---
> 		-lboundaries  -lm
diff -ra Montage.orig/MontageLib/Hdr/Makefile.LINUX Montage/MontageLib/Hdr/Makefile.LINUX
7c7
< 		-lboundaries -lnsl -lm
---
> 		-lboundaries  -lm
diff -ra Montage.orig/MontageLib/Imgtbl/Makefile Montage/MontageLib/Imgtbl/Makefile
6c6
< LIBS   =	-L../../lib -lwcs -lcoord -lmtbl -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcoord -lmtbl -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/Imgtbl/Makefile.LINUX Montage/MontageLib/Imgtbl/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lwcs -lcoord -lmtbl -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcoord -lmtbl -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/MakeHdr/Makefile Montage/MontageLib/MakeHdr/Makefile
6c6
< LIBS   =	-L../../lib -lwcs -lboundaries -lmtbl -lcoord -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lboundaries -lmtbl -lcoord -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/MakeHdr/Makefile.LINUX Montage/MontageLib/MakeHdr/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lwcs -lboundaries -lmtbl -lcoord -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lboundaries -lmtbl -lcoord -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/MakeHdr/montageMakeHdr.c Montage/MontageLib/MakeHdr/montageMakeHdr.c
93c93
<    input;
---
>    hdr_input;
122c122
< /*                         input images.  This forces template to be     */
---
> /*                         hdr_input images.  This forces template to be     */
572,573c572,573
<       input.sys   = EQUJ;
<       input.epoch = 2000.;
---
>       hdr_input.sys   = EQUJ;
>       hdr_input.epoch = 2000.;
658c658
<          input.epoch = atof(epochStr+1);
---
>          hdr_input.epoch = atof(epochStr+1);
664c664
<          input.epoch = atof(epochStr+1);
---
>          hdr_input.epoch = atof(epochStr+1);
669c669
<          input.epoch = atof(epochStr);
---
>          hdr_input.epoch = atof(epochStr);
671,672c671,672
<          if(input.epoch == 0.)
<             input.epoch = 2000.;
---
>          if(hdr_input.epoch == 0.)
>             hdr_input.epoch = 2000.;
680,683c680,683
<       if(strncmp(csysStr, "eq", 2) == 0 && refsys == 'j') input.sys = EQUJ;
<       if(strncmp(csysStr, "ec", 2) == 0 && refsys == 'j') input.sys = ECLJ;
<       if(strncmp(csysStr, "eq", 2) == 0 && refsys == 'b') input.sys = EQUB;
<       if(strncmp(csysStr, "ec", 2) == 0 && refsys == 'b') input.sys = ECLB;
---
>       if(strncmp(csysStr, "eq", 2) == 0 && refsys == 'j') hdr_input.sys = EQUJ;
>       if(strncmp(csysStr, "ec", 2) == 0 && refsys == 'j') hdr_input.sys = ECLJ;
>       if(strncmp(csysStr, "eq", 2) == 0 && refsys == 'b') hdr_input.sys = EQUB;
>       if(strncmp(csysStr, "ec", 2) == 0 && refsys == 'b') hdr_input.sys = ECLB;
685,687c685,687
<       if(strncmp(csysStr, "ga", 2) == 0) input.sys = GAL;
<       if(strncmp(csysStr, "sg", 2) == 0) input.sys = SGAL;
<       if(strncmp(csysStr, "su", 2) == 0) input.sys = SGAL;
---
>       if(strncmp(csysStr, "ga", 2) == 0) hdr_input.sys = GAL;
>       if(strncmp(csysStr, "sg", 2) == 0) hdr_input.sys = SGAL;
>       if(strncmp(csysStr, "su", 2) == 0) hdr_input.sys = SGAL;
842c842
<             convertCoordinates(input.sys, input.epoch, xpos, ypos,
---
>             convertCoordinates(hdr_input.sys, hdr_input.epoch, xpos, ypos,
871c871
<             convertCoordinates(input.sys, input.epoch, xpos, ypos,
---
>             convertCoordinates(hdr_input.sys, hdr_input.epoch, xpos, ypos,
882c882
<             convertCoordinates(input.sys, input.epoch, xpos, ypos,
---
>             convertCoordinates(hdr_input.sys, hdr_input.epoch, xpos, ypos,
893c893
<             convertCoordinates(input.sys, input.epoch, xpos, ypos,
---
>             convertCoordinates(hdr_input.sys, hdr_input.epoch, xpos, ypos,
904c904
<             convertCoordinates(input.sys, input.epoch, xpos, ypos,
---
>             convertCoordinates(hdr_input.sys, hdr_input.epoch, xpos, ypos,
930,931c930,931
<             strcpy(input.ctype1, tval(ictype1));
<             strcpy(input.ctype2, tval(ictype2));
---
>             strcpy(hdr_input.ctype1, tval(ictype1));
>             strcpy(hdr_input.ctype2, tval(ictype2));
933,942c933,942
<             input.naxis1    = atoi(tval(ins));
<             input.naxis2    = atoi(tval(inl));
<             input.crpix1    = atof(tval(icrpix1));
<             input.crpix2    = atof(tval(icrpix2));
<             input.crval1    = atof(tval(icrval1));
<             input.crval2    = atof(tval(icrval2));
<             input.cdelt1    = atof(tval(icdelt1));
<             input.cdelt2    = atof(tval(icdelt2));
<             input.crota2    = atof(tval(icrota2));
<             input.equinox   = 2000;
---
>             hdr_input.naxis1    = atoi(tval(ins));
>             hdr_input.naxis2    = atoi(tval(inl));
>             hdr_input.crpix1    = atof(tval(icrpix1));
>             hdr_input.crpix2    = atof(tval(icrpix2));
>             hdr_input.crval1    = atof(tval(icrval1));
>             hdr_input.crval2    = atof(tval(icrval2));
>             hdr_input.cdelt1    = atof(tval(icdelt1));
>             hdr_input.cdelt2    = atof(tval(icdelt2));
>             hdr_input.crota2    = atof(tval(icrota2));
>             hdr_input.equinox   = 2000;
945c945
<                input.equinox = atoi(tval(iequinox));
---
>                hdr_input.equinox = atoi(tval(iequinox));
947,948c947,948
<             if(fabs(input.cdelt1) < minCdelt) minCdelt = fabs(input.cdelt1);
<             if(fabs(input.cdelt2) < minCdelt) minCdelt = fabs(input.cdelt2);
---
>             if(fabs(hdr_input.cdelt1) < minCdelt) minCdelt = fabs(hdr_input.cdelt1);
>             if(fabs(hdr_input.cdelt2) < minCdelt) minCdelt = fabs(hdr_input.cdelt2);
954,965c954,965
<             sprintf(temp, "NAXIS1  = %d",     input.naxis1 ); mMakeHdr_stradd(header, temp);
<             sprintf(temp, "NAXIS2  = %d",     input.naxis2 ); mMakeHdr_stradd(header, temp);
<             sprintf(temp, "CTYPE1  = '%s'",   input.ctype1 ); mMakeHdr_stradd(header, temp);
<             sprintf(temp, "CTYPE2  = '%s'",   input.ctype2 ); mMakeHdr_stradd(header, temp);
<             sprintf(temp, "CRVAL1  = %14.9f", input.crval1 ); mMakeHdr_stradd(header, temp);
<             sprintf(temp, "CRVAL2  = %14.9f", input.crval2 ); mMakeHdr_stradd(header, temp);
<             sprintf(temp, "CRPIX1  = %14.9f", input.crpix1 ); mMakeHdr_stradd(header, temp);
<             sprintf(temp, "CRPIX2  = %14.9f", input.crpix2 ); mMakeHdr_stradd(header, temp);
<             sprintf(temp, "CDELT1  = %14.9f", input.cdelt1 ); mMakeHdr_stradd(header, temp);
<             sprintf(temp, "CDELT2  = %14.9f", input.cdelt2 ); mMakeHdr_stradd(header, temp);
<             sprintf(temp, "CROTA2  = %14.9f", input.crota2 ); mMakeHdr_stradd(header, temp);
<             sprintf(temp, "EQUINOX = %d",     input.equinox); mMakeHdr_stradd(header, temp);
---
>             sprintf(temp, "NAXIS1  = %d",     hdr_input.naxis1 ); mMakeHdr_stradd(header, temp);
>             sprintf(temp, "NAXIS2  = %d",     hdr_input.naxis2 ); mMakeHdr_stradd(header, temp);
>             sprintf(temp, "CTYPE1  = '%s'",   hdr_input.ctype1 ); mMakeHdr_stradd(header, temp);
>             sprintf(temp, "CTYPE2  = '%s'",   hdr_input.ctype2 ); mMakeHdr_stradd(header, temp);
>             sprintf(temp, "CRVAL1  = %14.9f", hdr_input.crval1 ); mMakeHdr_stradd(header, temp);
>             sprintf(temp, "CRVAL2  = %14.9f", hdr_input.crval2 ); mMakeHdr_stradd(header, temp);
>             sprintf(temp, "CRPIX1  = %14.9f", hdr_input.crpix1 ); mMakeHdr_stradd(header, temp);
>             sprintf(temp, "CRPIX2  = %14.9f", hdr_input.crpix2 ); mMakeHdr_stradd(header, temp);
>             sprintf(temp, "CDELT1  = %14.9f", hdr_input.cdelt1 ); mMakeHdr_stradd(header, temp);
>             sprintf(temp, "CDELT2  = %14.9f", hdr_input.cdelt2 ); mMakeHdr_stradd(header, temp);
>             sprintf(temp, "CROTA2  = %14.9f", hdr_input.crota2 ); mMakeHdr_stradd(header, temp);
>             sprintf(temp, "EQUINOX = %d",     hdr_input.equinox); mMakeHdr_stradd(header, temp);
968c968
<             input.wcs = wcsinit(header);
---
>             hdr_input.wcs = wcsinit(header);
970c970
<             if(input.wcs == (struct WorldCoor *)NULL)
---
>             if(hdr_input.wcs == (struct WorldCoor *)NULL)
981c981
<             checkWCS = montage_checkWCS(input.wcs);
---
>             checkWCS = montage_checkWCS(hdr_input.wcs);
998c998
<             if(input.wcs->syswcs == WCS_J2000)
---
>             if(hdr_input.wcs->syswcs == WCS_J2000)
1000,1001c1000,1001
<                input.sys   = EQUJ;
<                input.epoch = 2000.;
---
>                hdr_input.sys   = EQUJ;
>                hdr_input.epoch = 2000.;
1003,1004c1003,1004
<                if(input.wcs->equinox == 1950)
<                   input.epoch = 1950.;
---
>                if(hdr_input.wcs->equinox == 1950)
>                   hdr_input.epoch = 1950.;
1006c1006
<             else if(input.wcs->syswcs == WCS_B1950)
---
>             else if(hdr_input.wcs->syswcs == WCS_B1950)
1008,1009c1008,1009
<                input.sys   = EQUB;
<                input.epoch = 1950.;
---
>                hdr_input.sys   = EQUB;
>                hdr_input.epoch = 1950.;
1011,1012c1011,1012
<                if(input.wcs->equinox == 2000)
<                   input.epoch = 2000;
---
>                if(hdr_input.wcs->equinox == 2000)
>                   hdr_input.epoch = 2000;
1014c1014
<             else if(input.wcs->syswcs == WCS_GALACTIC)
---
>             else if(hdr_input.wcs->syswcs == WCS_GALACTIC)
1016,1017c1016,1017
<                input.sys   = GAL;
<                input.epoch = 2000.;
---
>                hdr_input.sys   = GAL;
>                hdr_input.epoch = 2000.;
1019c1019
<             else if(input.wcs->syswcs == WCS_ECLIPTIC)
---
>             else if(hdr_input.wcs->syswcs == WCS_ECLIPTIC)
1021,1022c1021,1022
<                input.sys   = ECLJ;
<                input.epoch = 2000.;
---
>                hdr_input.sys   = ECLJ;
>                hdr_input.epoch = 2000.;
1024c1024
<                if(input.wcs->equinox == 1950)
---
>                if(hdr_input.wcs->equinox == 1950)
1026,1027c1026,1027
<                   input.sys   = ECLB;
<                   input.epoch = 1950.;
---
>                   hdr_input.sys   = ECLB;
>                   hdr_input.epoch = 1950.;
1032,1033c1032,1033
<                input.sys   = EQUJ;
<                input.epoch = 2000.;
---
>                hdr_input.sys   = EQUJ;
>                hdr_input.epoch = 2000.;
1040c1040
<             pix2wcs(input.wcs, 0.5, 0.5, &xpos, &ypos);
---
>             pix2wcs(hdr_input.wcs, 0.5, 0.5, &xpos, &ypos);
1042c1042
<             convertCoordinates(input.sys, input.epoch, xpos, ypos,
---
>             convertCoordinates(hdr_input.sys, hdr_input.epoch, xpos, ypos,
1051c1051
<             pix2wcs(input.wcs, input.naxis1+0.5, 0.5, &xpos, &ypos);
---
>             pix2wcs(hdr_input.wcs, hdr_input.naxis1+0.5, 0.5, &xpos, &ypos);
1053c1053
<             convertCoordinates(input.sys, input.epoch, xpos, ypos,
---
>             convertCoordinates(hdr_input.sys, hdr_input.epoch, xpos, ypos,
1062c1062
<             pix2wcs(input.wcs, input.naxis1+0.5, input.naxis2+0.5,
---
>             pix2wcs(hdr_input.wcs, hdr_input.naxis1+0.5, hdr_input.naxis2+0.5,
1065c1065
<             convertCoordinates(input.sys, input.epoch, xpos, ypos,
---
>             convertCoordinates(hdr_input.sys, hdr_input.epoch, xpos, ypos,
1074c1074
<             pix2wcs(input.wcs, 0.5, input.naxis2+0.5, &xpos, &ypos);
---
>             pix2wcs(hdr_input.wcs, 0.5, hdr_input.naxis2+0.5, &xpos, &ypos);
1076c1076
<             convertCoordinates(input.sys, input.epoch, xpos, ypos,
---
>             convertCoordinates(hdr_input.sys, hdr_input.epoch, xpos, ypos,
diff -ra Montage.orig/MontageLib/MakeImg/Makefile.LINUX Montage/MontageLib/MakeImg/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lcmd -lmtbl -ljson -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lcmd -lmtbl -ljson -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/Overlaps/Makefile Montage/MontageLib/Overlaps/Makefile
6c6
< LIBS   =	-L../../lib -lcoord -lwcs -lmtbl -lnsl -lm
---
> LIBS   =	-L../../lib -lcoord -lwcs -lmtbl  -lm
diff -ra Montage.orig/MontageLib/Overlaps/Makefile.LINUX Montage/MontageLib/Overlaps/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lcoord -lwcs -lmtbl -lnsl -lm
---
> LIBS   =	-L../../lib -lcoord -lwcs -lmtbl  -lm
diff -ra Montage.orig/MontageLib/Project/Makefile Montage/MontageLib/Project/Makefile
6c6
< LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/Project/Makefile.LINUX Montage/MontageLib/Project/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/ProjectCube/Makefile Montage/MontageLib/ProjectCube/Makefile
6c6
< LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/ProjectCube/Makefile.LINUX Montage/MontageLib/ProjectCube/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/ProjectPP/Makefile Montage/MontageLib/ProjectPP/Makefile
6c6
< LIBS   =	-L../../lib -ltwoplane -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -ltwoplane -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/ProjectPP/Makefile.LINUX Montage/MontageLib/ProjectPP/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -ltwoplane -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -ltwoplane -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/ProjectQL/Makefile Montage/MontageLib/ProjectQL/Makefile
6c6
< LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/ProjectQL/Makefile.LINUX Montage/MontageLib/ProjectQL/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/SubCube/Makefile Montage/MontageLib/SubCube/Makefile
6c6
< LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/SubCube/Makefile.LINUX Montage/MontageLib/SubCube/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/Subimage/Makefile Montage/MontageLib/Subimage/Makefile
6c6
< LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/Subimage/Makefile.LINUX Montage/MontageLib/Subimage/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/Subimage/montageSubimage.c Montage/MontageLib/Subimage/montageSubimage.c
93c93
< int haveBlank;
---
> /* int haveBlank; */
166a167,168
> 
>    int      haveBlank;
diff -ra Montage.orig/MontageLib/Subset/Makefile.LINUX Montage/MontageLib/Subset/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lcoord -lmtbl -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lcoord -lmtbl -lwcs -lcfitsio  -lm
diff -ra Montage.orig/MontageLib/TANHdr/montageTANHdr.c Montage/MontageLib/TANHdr/montageTANHdr.c
109c109
< char  epoch  [80];
---
> char  char_epoch [80];
1250c1250
<    strcpy(epoch,   "");
---
>    strcpy(char_epoch,"");
1347c1347
<          strcpy(epoch, value);
---
>          strcpy(char_epoch, value);
1370c1370
<       if(haveEpoch)   printf("epoch   = [%s]\n", epoch);
---
>       if(haveEpoch)   printf("epoch   = [%s]\n", char_epoch);
1678c1678
<       sprintf(temp, "EPOCH   = %s",  epoch        ); 
---
>       sprintf(temp, "EPOCH   = %s",  char_epoch   ); 
diff -ra Montage.orig/MontageLib/Transpose/Makefile.LINUX Montage/MontageLib/Transpose/Makefile.LINUX
12c12
< LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord  -lm
diff -ra Montage.orig/MontageLib/Viewer/Makefile.LINUX Montage/MontageLib/Viewer/Makefile.LINUX
17c17
<                 -L../../lib/freetype/lib -lfreetype -lnsl -lm
---
>                 -L../../lib/freetype/lib -lfreetype  -lm
diff -ra Montage.orig/MontageLib/WWT/Makefile.LINUX Montage/MontageLib/WWT/Makefile.LINUX
6c6
< LIBS   =	-L../../lib -lsvc -lnsl -lm
---
> LIBS   =	-L../../lib -lsvc  -lm
diff -ra Montage.orig/util/Archive/ArchiveGet/Makefile.LINUX Montage/util/Archive/ArchiveGet/Makefile.LINUX
12c12
< LIBS   =	 -L../../../lib -lwcs -lcfitsio -lmcurl -lcurl -lnsl -lidn -lssl -lcrypto -ldl -llber -lldap -lz -lrt -L/usr/kerberos/lib64 -lm
---
> LIBS   =	 -L../../../lib -lwcs -lcfitsio -lmcurl -lcurl  -lidn -lssl -lcrypto -ldl -llber -lldap -lz -lrt -L/usr/kerberos/lib64 -lm
diff -ra Montage.orig/util/Archive/ArchiveList/Makefile.LINUX Montage/util/Archive/ArchiveList/Makefile.LINUX
13c13
< 		-lboundaries -lnsl -lm
---
> 		-lboundaries  -lm
diff -ra Montage.orig/util/CatMap/Makefile.LINUX Montage/util/CatMap/Makefile.LINUX
12c12
< LIBS   =	-L../../lib -lmtbl -lcoord -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lmtbl -lcoord -lwcs -lcfitsio  -lm
diff -ra Montage.orig/util/Examine/Makefile.LINUX Montage/util/Examine/Makefile.LINUX
12c12
< LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord  -lm
diff -ra Montage.orig/util/Exec/Makefile.LINUX Montage/util/Exec/Makefile.LINUX
12c12
< LIBS   =	-L../../lib -lsvc -lmtbl -lwcs -lcfitsio -lcoord -lnsl -lm
---
> LIBS   =	-L../../lib -lsvc -lmtbl -lwcs -lcfitsio -lcoord  -lm
diff -ra Montage.orig/util/FixNaN/Makefile.LINUX Montage/util/FixNaN/Makefile.LINUX
12c12
< LIBS   =	-L../../lib -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcfitsio  -lm
diff -ra Montage.orig/util/Hdr/Makefile.LINUX Montage/util/Hdr/Makefile.LINUX
13c13
< 		-lboundaries -lnsl -lm
---
> 		-lboundaries  -lm
diff -ra Montage.orig/util/JPEG/Makefile.LINUX Montage/util/JPEG/Makefile.LINUX
13c13
< LIBS   =	-L../../lib -lwcs -lcoord -lcfitsio -ljpeg -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcoord -lcfitsio -ljpeg  -lm
diff -ra Montage.orig/util/MovingTarget/Makefile.LINUX Montage/util/MovingTarget/Makefile.LINUX
13c13
< 		-L../../lib -lcmd -lwcs -lcoord -lmtbl -lcfitsio -lnsl -lm
---
> 		-L../../lib -lcmd -lwcs -lcoord -lmtbl -lcfitsio  -lm
diff -ra Montage.orig/util/MovingTarget/mMovingTarget.c Montage/util/MovingTarget/mMovingTarget.c
89c89
< long nodeCount;
---
> extern long nodeCount;
diff -ra Montage.orig/util/Pad/Makefile.LINUX Montage/util/Pad/Makefile.LINUX
12c12
< LIBS   =	-L../../lib -lwcs -lcfitsio -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcfitsio  -lm
diff -ra Montage.orig/util/Pix2Coord/Makefile.LINUX Montage/util/Pix2Coord/Makefile.LINUX
12c12
< LIBS   =	-L../../lib -lwcs -lcoord -lcfitsio -ljpeg -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcoord -lcfitsio -ljpeg  -lm
diff -ra Montage.orig/util/Rotate/Makefile.LINUX Montage/util/Rotate/Makefile.LINUX
12c12
< LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord  -lm
diff -ra Montage.orig/util/Search/Makefile.LINUX Montage/util/Search/Makefile.LINUX
13c13
< 		-L../../lib -lcmd -lwcs -lcoord -lmtbl -lcfitsio -lnsl -lm
---
> 		-L../../lib -lcmd -lwcs -lcoord -lmtbl -lcfitsio  -lm
diff -ra Montage.orig/util/Search/mSearch.c Montage/util/Search/mSearch.c
75c75
< long nodeCount;
---
> /* long nodeCount; */
diff -ra Montage.orig/util/ShrinkHdr/Makefile.LINUX Montage/util/ShrinkHdr/Makefile.LINUX
12c12
< LIBS   =	-L../../lib -lwcs -lcoord -lcfitsio -ljpeg -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcoord -lcfitsio -ljpeg  -lm
diff -ra Montage.orig/util/Transpose/Makefile.LINUX Montage/util/Transpose/Makefile.LINUX
12c12
< LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord -lnsl -lm
---
> LIBS   =	-L../../lib -lwcs -lcfitsio -lcoord  -lm
diff -ra Montage.orig/util/Viewer/Makefile.LINUX Montage/util/Viewer/Makefile.LINUX
17c17
<                 -L../../lib/freetype/lib -lfreetype -lnsl -lm
---
>                 -L../../lib/freetype/lib -lfreetype  -lm