Build with local qfits

src/Makefile

@@ -2,6 +2,7 @@
 CFLAGS = #-O3 -Wno-unused-result
 
 # Linking flags
+#LFLAGS = -lm -lcpgplot -lpgplot -lX11 -lwcs -lgsl -lgslcblas -lpng -lgiza -L../qfits/lib
 LFLAGS = -lm -lcpgplot -lpgplot -lX11 -lwcs -lgsl -lgslcblas -lpng -lgiza
 
 # Compilers
@@ -64,10 +65,10 @@ propagate: propagate.o sgdp4.o satutl.o deep.o ferror.o
 	$(CC) -o propagate propagate.o sgdp4.o satutl.o deep.o ferror.o -lm
 
 detect: detect.o forward.o reverse.o
-	$(F77) -o detect detect.o forward.o reverse.o -lm $(LFLAGS) -lqfits
+	$(F77) -o detect detect.o forward.o reverse.o -lm $(LFLAGS) -lqfits -L../qfits/lib
 
 confirm: confirm.o forward.o reverse.o
-	$(F77) -o confirm confirm.o forward.o reverse.o -lm $(LFLAGS) -lqfits
+	$(F77) -o confirm confirm.o forward.o reverse.o -lm $(LFLAGS) -lqfits -L../qfits/lib
 
 autodetect: autodetect.o
 	$(F77) -o autodetect autodetect.o -lm $(LFLAGS)
@@ -82,7 +83,7 @@ waitfor: waitfor.o
 	$(CC) -o waitfor waitfor.o -lm
 
 deproject: deproject.o forward.o reverse.o
-	$(F77) -o deproject deproject.o forward.o reverse.o $(LFLAGS) -ljpeg -lqfits
+	$(F77) -o deproject deproject.o forward.o reverse.o $(LFLAGS) -ljpeg -lqfits -L../qfits/lib
 
 jpgstack: jpgstack.o
 	$(CC) -o jpgstack jpgstack.o -ljpeg
@@ -97,22 +98,22 @@ s2dec: s2dec.o
 	$(CC) -o s2dec s2dec.c -lm
 
 calibrate: calibrate.o forward.o
-	$(F77) -o calibrate calibrate.o forward.o $(LFLAGS) -lqfits
+	$(F77) -o calibrate calibrate.o forward.o $(LFLAGS) -lqfits -L../qfits/lib
 
 measure: measure.o reverse.o
-	$(F77) -o measure measure.o reverse.o $(LFLAGS) -lqfits
+	$(F77) -o measure measure.o reverse.o $(LFLAGS) -lqfits -L../qfits/lib
 
 jpg2fits: jpg2fits.o
-	$(CC) -o jpg2fits jpg2fits.o -lm -lqfits -ljpeg
+	$(CC) -o jpg2fits jpg2fits.o -lm -lqfits -ljpeg -L../qfits/lib
 
 pstrack: pstrack.o sgdp4.o satutl.o deep.o ferror.o forward.o reverse.o
-	$(F77) -o pstrack pstrack.o sgdp4.o satutl.o deep.o ferror.o forward.o reverse.o $(LFLAGS) -lqfits
+	$(F77) -o pstrack pstrack.o sgdp4.o satutl.o deep.o ferror.o forward.o reverse.o $(LFLAGS) -lqfits -L../qfits/lib
 
 faketle: faketle.o sgdp4.o satutl.o deep.o ferror.o
 	$(CC) -o faketle faketle.o sgdp4.o satutl.o deep.o ferror.o -lm
 
 imgstat: imgstat.o
-	$(CC) -o imgstat imgstat.o -lm -lqfits
+	$(CC) -o imgstat imgstat.o -lm -lqfits -L../qfits/lib
 
 satfit: satfit.o sgdp4.o satutl.o deep.o ferror.o versafit.o dsmin.o simplex.o
 	$(F77) -o satfit satfit.o sgdp4.o satutl.o deep.o ferror.o versafit.o dsmin.o simplex.o $(LFLAGS)
@@ -124,7 +125,7 @@ rde2iod: rde2iod.o
 	$(CC) -o rde2iod rde2iod.o -lm
 
 stviewer: stviewer.o
-	$(CC) -o stviewer stviewer.o -lm -lqfits
+	$(CC) -o stviewer stviewer.o -lm -lqfits -L../qfits/lib
 
 residuals: residuals.o sgdp4.o satutl.o deep.o ferror.o
 	$(CC) -o residuals residuals.o sgdp4.o satutl.o deep.o ferror.o -lm -lwcs
@@ -142,13 +143,13 @@ runsched: runsched.o
 	$(CC) -o runsched runsched.o -lm
 
 fitskey: fitskey.o
-	$(CC) -o fitskey fitskey.o -lqfits
+	$(CC) -o fitskey fitskey.o -lqfits -L../qfits/lib
 
 fitsheader: fitsheader.o
-	$(CC) -o fitsheader fitsheader.o -lqfits
+	$(CC) -o fitsheader fitsheader.o -lqfits -L../qfits/lib
 
 satid: satid.o sgdp4.o satutl.o deep.o ferror.o forward.o reverse.o
-	$(F77) -o satid satid.o sgdp4.o satutl.o deep.o ferror.o forward.o reverse.o $(LFLAGS) -lqfits
+	$(F77) -o satid satid.o sgdp4.o satutl.o deep.o ferror.o forward.o reverse.o $(LFLAGS) -lqfits -L../qfits/lib
 
 skymap: skymap.o sgdp4.o satutl.o deep.o ferror.o
 	$(F77) -o skymap skymap.o sgdp4.o satutl.o deep.o ferror.o $(LFLAGS)
@@ -157,22 +158,22 @@ pass: pass.o sgdp4.o satutl.o deep.o ferror.o
 	$(CC) -o pass pass.o sgdp4.o satutl.o deep.o ferror.o -lm
 
 reduce: reduce.o forward.o reverse.o
-	$(F77) -o reduce reduce.o forward.o reverse.o $(LFLAGS) -lqfits
+	$(F77) -o reduce reduce.o forward.o reverse.o $(LFLAGS) -lqfits -L../qfits/lib
 
 addwcs: addwcs.o forward.o reverse.o
-	$(F77) -o addwcs addwcs.o forward.o reverse.o $(LFLAGS) -lqfits
+	$(F77) -o addwcs addwcs.o forward.o reverse.o $(LFLAGS) -lqfits -L../qfits/lib
 
 wcsfit: wcsfit.o forward.o reverse.o
-	$(F77) -o wcsfit wcsfit.o forward.o reverse.o $(LFLAGS) -lqfits
+	$(F77) -o wcsfit wcsfit.o forward.o reverse.o $(LFLAGS) -lqfits -L../qfits/lib
 
 plotfits: plotfits.o forward.o reverse.o
-	$(F77) -o plotfits plotfits.o forward.o reverse.o $(LFLAGS) -lqfits
+	$(F77) -o plotfits plotfits.o forward.o reverse.o $(LFLAGS) -lqfits -L../qfits/lib
 
 pgm2fits: pgm2fits.o
-	$(F77) -o pgm2fits pgm2fits.o $(LFLAGS) -lqfits
+	$(F77) -o pgm2fits pgm2fits.o $(LFLAGS) -lqfits -L../qfits/lib
 
 clean:
 	rm -f *.o
 	rm -f *~
-	rm -f addwcs angular calibrate dec2s faketle fitsheader fitskey imgstat jpg2fits jpgstack measure pgm2fits plotfits pstrack rde2iod reduce residuals runsched satfit satid satmap satorbit s2dec skymap tle2ole tleinfo uk2iod stviewer wcsfit deproject slewto waitfor pass detect launchtle propagate fakeiod csv2tle normal posmatch posvel xyz2tle mvtle confirm allnight
-	rm -f ../addwcs ../angular ../calibrate ../dec2s ../faketle ../fitsheader ../fitskey ../imgstat ../jpg2fits ../jpgstack ../measure ../pgm2fits ../plotfits ../pstrack ../rde2iod ../reduce ../residuals ../runsched ../satfit ../satid ../satmap ../satorbit ../s2dec ../skymap ../tle2ole ../tleinfo ../uk2iod ../stviewer ../wcsfit ../deproject ../slewto ../waitfor ../pass ../detect ../launchtle ../propagate ../fakeiod ../csv2tle ../normal ../posmatch ../posvel ../xyz2tle ../mvtle ../confirm ../allnight
+	rm -fr ../bin
+

src/jpg2fits.c

@@ -2,7 +2,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-#include <qfits.h>
+#include "qfits.h"
 #include <jpeglib.h>
 #include <libexif/exif-data.h>
 #include <getopt.h>

src/pgm2fits.c

@@ -2,7 +2,7 @@
 #include <string.h>
 #include <math.h>
 #include <stdlib.h>
-#include <qfits.h>
+#include "qfits.h"
 #include <getopt.h>
 
 

src/qfits.h

@@ -0,0 +1 @@
+../qfits/include/qfits.h

src/xmemory.h

@@ -0,0 +1 @@
+../qfits/include/xmemory.h