Purge reference makefiles

33 files changed, 0 insertions, 3072 deletions

diff --git a/src/Makefile.Linux.orig b/src/Makefile.Linux.orig
deleted file mode 100644
index 1351804..0000000
--- a/src/Makefile.Linux.orig
+++ /dev/null
@@ -1,138 +0,0 @@
-
-CALFUSEDIR=	${PWD}/..
-PLATFORM=	ix86_Linux
-SHARED=		-shared
-FITSVER=	2.470
-
-# Symbols for make
-MAKE=		make
-
-#Symbols used for compiling
-CC=		cc
-OPT=		-Wall -g -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} -I${CALFUSEDIR}/include
-LIBS=		-lc -lm -lnsl -ldl -lgfortran
-
-all:		lib bin fes jitter
-
-lib:		libcfitsio libsla libfuse
-
-install:	libinstall bininstall analinstall jitinstall # fesinstall
-
-libinstall:	libcfitsioinstall libslainstall libfuseinstall
-
-clean:		binclean fesclean analclean libclean jitclean
-
-distclean:	bindistclean fesdistclean analdistclean libdistclean jitdistclean
-
-libclean:	libcfitsioclean libslaclean libfuseclean
-
-libdistclean:	libcfitsiodistclean libsladistclean libfusedistclean
-
-cfitsio/Makefile:
-		cd cfitsio; CC="${CC}"; export CC; ./configure;
-
-libcfitsio.so:
-		cd cfitsio; /bin/rm -f libcfitsio-${FITSVER}.so
-
-libcfitsio:	cfitsio/Makefile
-		cd cfitsio; ${MAKE} CFLAGS="${OPT}"; \
-		${CC} ${SHARED} -o libcfitsio-${FITSVER}.so *.o ${LIBS}
-
-libsla:		
-		SYSTEM="${PLATFORM}"; export SYSTEM; \
-		FFLAGS="${OPT}"; export FFLAGS; \
-		cd slalib; ./mk build; ${CC} ${SHARED} -o libsla.so *.o ${LIBS}
-
-libfuse:
-		cd libcf; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-bin:
-		cd fuv; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-fes:
-		cd fes; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-analysis:
-		cd analysis; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-jitter:
-		cd cal/jitter; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-libcfitsioinstall: libcfitsio
-		cd cfitsio; cp libcfitsio-${FITSVER}.so ${CALFUSEDIR}/lib
-
-libslainstall:	libsla
-		cd slalib; cp libsla.so ${CALFUSEDIR}/lib
-
-libfuseinstall:	libfuse
-		cd libcf; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-bininstall:	bin
-		cd fuv; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-fesinstall:	fes
-		cd fes; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-analinstall:	analysis
-		cd analysis; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-jitinstall:	jitter
-		cd cal/jitter; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-libcfitsioclean:
-	-	cd cfitsio; ${MAKE} clean; /bin/rm -f libcfitsio-${FITSVER}.so
-
-libcfitsiodistclean:
-	-	cd cfitsio; ${MAKE} distclean; /bin/rm -f libcfitsio-${FITSVER}.so
-		cd ../lib; /bin/rm -f libcfitsio-${FITSVER}.so
-
-libslaclean:
-	-	SYSTEM="${PLATFORM}"; export SYSTEM; \
-		cd slalib; ./mk clean; /bin/rm -f libsla.a libsla.so
-
-libsladistclean:
-	-	SYSTEM="${PLATFORM}"; export SYSTEM; \
-		cd slalib; ./mk unbuild
-		cd ../lib; /bin/rm -f libsla.so
-
-libfuseclean:
-		cd libcf; ${MAKE} clean
-
-libfusedistclean:
-		cd libcf; ${MAKE} distclean
-
-binclean:
-		cd fuv; ${MAKE} clean
-
-bindistclean:
-		cd fuv; ${MAKE} distclean
-
-fesclean:
-		cd fes; ${MAKE} clean
-
-fesdistclean:
-		cd fes; ${MAKE} distclean
-
-analclean:
-		cd analysis; ${MAKE} clean
-
-analdistclean:
-		cd analysis; ${MAKE} distclean
-
-jitclean:
-		cd cal/jitter; ${MAKE} clean
-
-jitdistclean:
-		cd cal/jitter; ${MAKE} distclean
-
diff --git a/src/Makefile.Linux64.orig b/src/Makefile.Linux64.orig
deleted file mode 100644
index 6c498d9..0000000
--- a/src/Makefile.Linux64.orig
+++ /dev/null
@@ -1,113 +0,0 @@
-
-CALFUSEDIR=	${PWD}/..
-PLATFORM=	x86_64
-SHARED=		-shared -fPIC
-
-# Symbols for make
-MAKE=		make
-
-#Symbols used for compiling
-CC=		gcc
-OPT=		-Wall -g -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} -I${CALFUSEDIR}/include
-LIBS=		-lc -lm -lnsl -ldl -lgfortran -lcfitsio
-
-install:	libinstall bininstall analinstall jitinstall # fesinstall
-
-libinstall:	libslainstall libfuseinstall
-
-clean:		binclean fesclean analclean libclean jitclean
-
-distclean:	bindistclean fesdistclean analdistclean libdistclean jitdistclean
-
-libclean:	libslaclean libfuseclean
-
-libdistclean:	libsladistclean libfusedistclean
-
-libsla:		
-		SYSTEM="${PLATFORM}"; export SYSTEM; \
-		FFLAGS="${OPT}"; export FFLAGS; \
-		cd slalib; ./mk build; ${CC} ${SHARED} -o libsla.so *.o ${LIBS}
-
-libfuse:
-		cd libcf; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT} ${SHARED}" all
-
-bin:
-		cd fuv; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" all
-
-fes:
-		cd fes; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" all
-
-analysis:
-		cd analysis; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" all
-
-jitter:
-		cd cal/jitter; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" all
-
-libslainstall:	libsla
-		cd slalib; cp libsla.so ${CALFUSEDIR}/lib
-
-libfuseinstall:	libfuse
-		cd libcf; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-bininstall:	bin
-		cd fuv; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-fesinstall:	fes
-		cd fes; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-analinstall:	analysis
-		cd analysis; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-jitinstall:	jitter
-		cd cal/jitter; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-libslaclean:
-	-	SYSTEM="${PLATFORM}"; export SYSTEM; \
-		cd slalib; ./mk clean; /bin/rm -f libsla.a libsla.so
-
-libsladistclean:
-	-	SYSTEM="${PLATFORM}"; export SYSTEM; \
-		cd slalib; ./mk unbuild
-		cd ../lib; /bin/rm -f libsla.so
-
-libfuseclean:
-		cd libcf; ${MAKE} clean
-
-libfusedistclean:
-		cd libcf; ${MAKE} distclean
-
-binclean:
-		cd fuv; ${MAKE} clean
-
-bindistclean:
-		cd fuv; ${MAKE} distclean
-
-fesclean:
-		cd fes; ${MAKE} clean
-
-fesdistclean:
-		cd fes; ${MAKE} distclean
-
-analclean:
-		cd analysis; ${MAKE} clean
-
-analdistclean:
-		cd analysis; ${MAKE} distclean
-
-jitclean:
-		cd cal/jitter; ${MAKE} clean
-
-jitdistclean:
-		cd cal/jitter; ${MAKE} distclean
-
diff --git a/src/Makefile.MacOSX.orig b/src/Makefile.MacOSX.orig
deleted file mode 100644
index 6bfae3e..0000000
--- a/src/Makefile.MacOSX.orig
+++ /dev/null
@@ -1,143 +0,0 @@
-
-# Master Makefile for Mac OS X Version 10.2 or higher
-# Slalib installation requires the command "make -e install"
-# Leave PLATFORM = ix86_Linux; required by slalib.
-# FITSVER is not used; library is always called libcfitsio.dylib.
-
-CALFUSEDIR=	${PWD}/..
-PLATFORM=       ix86_Linux
-SHARED=         -dynamiclib
-FITSVER=	2.470
-MACOSX_DEPLOYMENT_TARGET=	10.2
-
-# Symbols for make
-MAKE=		make
-
-#Symbols used for compiling
-CC=		cc
-OPT=		-O3 -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} -I${CALFUSEDIR}/include
-LIBS=		-L/sw/lib/ -lgfortran
-
-all:		lib bin fes jitter
-
-lib:		libcfitsio libsla libfuse
-
-install:	libinstall bininstall analinstall jitinstall # fesinstall
-
-libinstall:	libcfitsioinstall libslainstall libfuseinstall
-
-clean:		binclean fesclean analclean libclean jitclean
-
-distclean:	bindistclean fesdistclean analdistclean libdistclean jitdistclean
-
-libclean:	libcfitsioclean libslaclean libfuseclean
-
-libdistclean:	libcfitsiodistclean libsladistclean libfusedistclean
-
-cfitsio/Makefile:
-		cd cfitsio; CC="${CC}"; export CC; ./configure;
-
-libcfitsio:	cfitsio/Makefile
-		cd cfitsio; ${MAKE} shared
-
-libsla:		
-	-	SYSTEM="${PLATFORM}"; export SYSTEM; \
-		cd slalib; ./mk build; \
-		${CC} ${SHARED} -o libsla.dylib *.o ${LIBS}
-
-libfuse:
-		cd libcf; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-bin:
-		MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}"; \
-		export MACOSX_DEPLOYMENT_TARGET; \
-		cd fuv; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-fes:
-		cd fes; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-analysis:
-		cd analysis; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-jitter:
-		cd cal/jitter; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-libcfitsioinstall: libcfitsio
-		cd cfitsio; cp libcfitsio.dylib ${CALFUSEDIR}/lib
-
-libslainstall:	libsla
-		cd slalib; cp libsla.dylib ${CALFUSEDIR}/lib
-
-libfuseinstall:	libfuse
-		cd libcf; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-bininstall:	bin
-		cd fuv; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-fesinstall:	fes
-		cd fes; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-analinstall:	analysis
-		cd analysis; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-jitinstall:	jitter
-		cd cal/jitter; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-libcfitsioclean:
-	-	cd cfitsio; ${MAKE} clean; /bin/rm -f libcfitsio.dylib
-
-libcfitsiodistclean:
-	-	cd cfitsio; ${MAKE} distclean; /bin/rm -f libcfitsio.dylib
-		/bin/rm -f ../lib/libcfitsio.dylib
-		# cd ../lib; /bin/rm libcfitsio-${FITSVER}.dylib
-
-libslaclean:
-	-	SYSTEM="${PLATFORM}"; export SYSTEM; \
-		cd slalib; ./mk clean; /bin/rm -f libsla.a libsla.dylib
-
-libsladistclean:
-	-	SYSTEM="${PLATFORM}"; export SYSTEM; \
-		cd slalib; ./mk unbuild
-		cd ../lib; /bin/rm -f libsla.dylib
-
-libfuseclean:
-		cd libcf; ${MAKE} clean
-
-libfusedistclean:
-		cd libcf; ${MAKE} distclean
-
-binclean:
-		cd fuv; ${MAKE} clean
-
-bindistclean:
-		cd fuv; ${MAKE} distclean
-
-fesclean:
-		cd fes; ${MAKE} clean
-
-fesdistclean:
-		cd fes; ${MAKE} distclean
-
-analclean:
-		cd analysis; ${MAKE} clean
-
-analdistclean:
-		cd analysis; ${MAKE} distclean
-
-jitclean:
-		cd cal/jitter; ${MAKE} clean
-
-jitdistclean:
-		cd cal/jitter; ${MAKE} distclean
-
diff --git a/src/Makefile.Solaris.orig b/src/Makefile.Solaris.orig
deleted file mode 100644
index 6661a7d..0000000
--- a/src/Makefile.Solaris.orig
+++ /dev/null
@@ -1,137 +0,0 @@
-
-CALFUSEDIR=	${PWD}/..
-PLATFORM=	sun4_Solaris
-SHARED=		-G
-FITSVER=	2.470
-
-# Symbols for make
-MAKE=		make
-
-#Symbols used for compiling
-CC=		cc
-OPT=		-O -DCFORTRAN -KPIC -DSOLARIS
-CFLAGS=		${OPT} -I${CALFUSEDIR}/include
-LIBS=		-lc -lm -lnsl -ldl -lsocket -lsunmath -lM77 -lF77
-
-all:		lib bin fes jitter
-
-lib:		libcfitsio libsla libfuse
-
-install:	libinstall bininstall analinstall jitinstall # fesinstall
-
-libinstall:	libcfitsioinstall libslainstall libfuseinstall
-
-clean:		binclean fesclean analclean libclean jitclean
-
-distclean:	bindistclean fesdistclean analdistclean libdistclean jitdistclean
-
-libclean:	libcfitsioclean libslaclean libfuseclean
-
-libdistclean:	libcfitsiodistclean libsladistclean libfusedistclean
-
-cfitsio/Makefile:
-		cd cfitsio; CC="${CC}"; export CC; ./configure;
-
-libcfitsio.so:
-		cd cfitsio; /bin/rm -f libcfitsio-${FITSVER}.so
-
-libcfitsio:	cfitsio/Makefile
-		cd cfitsio; ${MAKE} CFLAGS="${OPT}"; \
-		${CC} ${SHARED} -o libcfitsio-${FITSVER}.so *.o ${LIBS}
-
-libsla:		
-		SYSTEM="${PLATFORM}"; export SYSTEM; \
-		FFLAGS="${OPT}"; export FFLAGS; \
-		cd slalib; ./mk build; ${CC} ${SHARED} -o libsla.so *.o ${LIBS}
-
-libfuse:
-		cd libcf; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-bin:
-		cd fuv; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-fes:
-		cd fes; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-analysis:
-		cd analysis; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-jitter:
-		cd cal/jitter; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-libcfitsioinstall: libcfitsio
-		cd cfitsio; cp libcfitsio-${FITSVER}.so ${CALFUSEDIR}/lib
-
-libslainstall:	libsla
-		cd slalib; cp libsla.so ${CALFUSEDIR}/lib
-
-libfuseinstall:	libfuse
-		cd libcf; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-bininstall:	bin
-		cd fuv; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-fesinstall:	fes
-		cd fes; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-analinstall:	analysis
-		cd analysis; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-jitinstall:	jitter
-		cd cal/jitter; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-libcfitsioclean:
-	-	cd cfitsio; ${MAKE} clean; /bin/rm -f libcfitsio-${FITSVER}.so
-
-libcfitsiodistclean:
-	-	cd cfitsio; ${MAKE} distclean; /bin/rm -f libcfitsio-${FITSVER}.so
-		cd ../lib; /bin/rm -f libcfitsio-${FITSVER}.so
-
-libslaclean:
-	-	SYSTEM="${PLATFORM}"; export SYSTEM; \
-		cd slalib; ./mk clean; /bin/rm -f libsla.a libsla.so
-
-libsladistclean:
-	-	SYSTEM="${PLATFORM}"; export SYSTEM; \
-		cd slalib; ./mk unbuild
-		cd ../lib; /bin/rm -f libsla.so
-
-libfuseclean:
-		cd libcf; ${MAKE} clean
-
-libfusedistclean:
-		cd libcf; ${MAKE} distclean
-
-binclean:
-		cd fuv; ${MAKE} clean
-
-bindistclean:
-		cd fuv; ${MAKE} distclean
-
-fesclean:
-		cd fes; ${MAKE} clean
-
-fesdistclean:
-		cd fes; ${MAKE} distclean
-
-analclean:
-		cd analysis; ${MAKE} clean
-
-analdistclean:
-		cd analysis; ${MAKE} distclean
-
-jitclean:
-		cd cal/jitter; ${MAKE} clean
-
-jitdistclean:
-		cd cal/jitter; ${MAKE} distclean
diff --git a/src/Makefile.orig.orig b/src/Makefile.orig.orig
deleted file mode 100644
index 6661a7d..0000000
--- a/src/Makefile.orig.orig
+++ /dev/null
@@ -1,137 +0,0 @@
-
-CALFUSEDIR=	${PWD}/..
-PLATFORM=	sun4_Solaris
-SHARED=		-G
-FITSVER=	2.470
-
-# Symbols for make
-MAKE=		make
-
-#Symbols used for compiling
-CC=		cc
-OPT=		-O -DCFORTRAN -KPIC -DSOLARIS
-CFLAGS=		${OPT} -I${CALFUSEDIR}/include
-LIBS=		-lc -lm -lnsl -ldl -lsocket -lsunmath -lM77 -lF77
-
-all:		lib bin fes jitter
-
-lib:		libcfitsio libsla libfuse
-
-install:	libinstall bininstall analinstall jitinstall # fesinstall
-
-libinstall:	libcfitsioinstall libslainstall libfuseinstall
-
-clean:		binclean fesclean analclean libclean jitclean
-
-distclean:	bindistclean fesdistclean analdistclean libdistclean jitdistclean
-
-libclean:	libcfitsioclean libslaclean libfuseclean
-
-libdistclean:	libcfitsiodistclean libsladistclean libfusedistclean
-
-cfitsio/Makefile:
-		cd cfitsio; CC="${CC}"; export CC; ./configure;
-
-libcfitsio.so:
-		cd cfitsio; /bin/rm -f libcfitsio-${FITSVER}.so
-
-libcfitsio:	cfitsio/Makefile
-		cd cfitsio; ${MAKE} CFLAGS="${OPT}"; \
-		${CC} ${SHARED} -o libcfitsio-${FITSVER}.so *.o ${LIBS}
-
-libsla:		
-		SYSTEM="${PLATFORM}"; export SYSTEM; \
-		FFLAGS="${OPT}"; export FFLAGS; \
-		cd slalib; ./mk build; ${CC} ${SHARED} -o libsla.so *.o ${LIBS}
-
-libfuse:
-		cd libcf; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-bin:
-		cd fuv; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-fes:
-		cd fes; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-analysis:
-		cd analysis; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-jitter:
-		cd cal/jitter; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" FITSVER=${FITSVER} all
-
-libcfitsioinstall: libcfitsio
-		cd cfitsio; cp libcfitsio-${FITSVER}.so ${CALFUSEDIR}/lib
-
-libslainstall:	libsla
-		cd slalib; cp libsla.so ${CALFUSEDIR}/lib
-
-libfuseinstall:	libfuse
-		cd libcf; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-bininstall:	bin
-		cd fuv; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-fesinstall:	fes
-		cd fes; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-analinstall:	analysis
-		cd analysis; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-jitinstall:	jitter
-		cd cal/jitter; ${MAKE} CALFUSEDIR="${CALFUSEDIR}" \
-		CC="${CC}" OPT="${OPT}" install
-
-libcfitsioclean:
-	-	cd cfitsio; ${MAKE} clean; /bin/rm -f libcfitsio-${FITSVER}.so
-
-libcfitsiodistclean:
-	-	cd cfitsio; ${MAKE} distclean; /bin/rm -f libcfitsio-${FITSVER}.so
-		cd ../lib; /bin/rm -f libcfitsio-${FITSVER}.so
-
-libslaclean:
-	-	SYSTEM="${PLATFORM}"; export SYSTEM; \
-		cd slalib; ./mk clean; /bin/rm -f libsla.a libsla.so
-
-libsladistclean:
-	-	SYSTEM="${PLATFORM}"; export SYSTEM; \
-		cd slalib; ./mk unbuild
-		cd ../lib; /bin/rm -f libsla.so
-
-libfuseclean:
-		cd libcf; ${MAKE} clean
-
-libfusedistclean:
-		cd libcf; ${MAKE} distclean
-
-binclean:
-		cd fuv; ${MAKE} clean
-
-bindistclean:
-		cd fuv; ${MAKE} distclean
-
-fesclean:
-		cd fes; ${MAKE} clean
-
-fesdistclean:
-		cd fes; ${MAKE} distclean
-
-analclean:
-		cd analysis; ${MAKE} clean
-
-analdistclean:
-		cd analysis; ${MAKE} distclean
-
-jitclean:
-		cd cal/jitter; ${MAKE} clean
-
-jitdistclean:
-		cd cal/jitter; ${MAKE} distclean
diff --git a/src/analysis/Makefile.Linux.orig b/src/analysis/Makefile.Linux.orig
deleted file mode 100644
index b1786ef..0000000
--- a/src/analysis/Makefile.Linux.orig
+++ /dev/null
@@ -1,142 +0,0 @@
-
-FITSVER=	2.470
-CALFUSEDIR=	${PWD}/../..
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-OPT=		-g -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-LIBDIR=		-L/opt/SUNWspro/lib
-FUSELIBS=	-lsla -lcfitsio-${FITSVER} -lcf
-LIBS=		-lc -lm -lnsl -ldl -lgfortran
-LDFLAGS=	-Wl,-R${CALFUSEDIR}/lib
-
-# Binaries to be made
-
-BINS=		cf_ttag_to_hist get_shift mjd2hjd cf_reflux \
-		idf_screen extract_jitter modhead \
-		cf_arith cf_combine cf_nvo cf_pack cf_xcorr \
-		idf_combine bpm_combine ttag_combine \
-		cf_coadd cf_make_all_exp \
-                remove_target_orbital_motion idf_cut \
-		ttag_lightcurve \
-		ttag_lightcurve_channel_sum \
-		ttag_lightcurve_mjd2hmjd \
-		ttag_lightcurve_combine \
-		ttag_lightcurve_periodogram 
-
-all:		${BINS}
-		chmod g+rw ${BINS}
-
-install:	all
-		/bin/cp ${BINS} cf_make_all_obs.csh cf_make_900_obs.csh ${FUSEBINDIR}
-
-clean:
-		/bin/rm -f *.o ${BINS}
-
-distclean:
-		/bin/rm -f *.o ${BINS}
-		cd ../../bin; /bin/rm -f ${BINS}
-
-cf_arith: cf_arith.c cf_wrspec7.c cf_wrspec_cf2.c
-		${CC} ${CFLAGS} -o cf_arith cf_arith.c cf_wrspec7.c cf_wrspec_cf2.c\
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_coadd: cf_coadd.c
-		${CC} ${CFLAGS} -o cf_coadd cf_coadd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_combine: cf_combine.c cf_wrspec7.c
-		${CC} ${CFLAGS} -o cf_combine cf_combine.c cf_wrspec7.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_make_all_exp:
-		${CC} ${CFLAGS} -o cf_make_all_exp cf_make_all_exp.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_ttag_to_hist:
-		${CC} ${CFLAGS} -o cf_ttag_to_hist cf_ttag_to_hist.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_combine:
-		${CC} ${CFLAGS} -o ttag_combine ttag_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_combine:
-		${CC} ${CFLAGS} -o idf_combine idf_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-bpm_combine:
-		${CC} ${CFLAGS} -o bpm_combine bpm_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-get_shift:
-		${CC} ${CFLAGS} -o get_shift get_shift.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_pack:
-		${CC} ${CFLAGS} -o cf_pack cf_pack.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_nvo:
-		${CC} ${CFLAGS} -o cf_nvo cf_nvo.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_reflux:
-		${CC} ${CFLAGS} -o cf_reflux cf_reflux.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_xcorr:
-		${CC} ${CFLAGS} -o cf_xcorr cf_xcorr.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-modhead:
-		${CC} ${CFLAGS} -o modhead modhead.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve:
-		${CC} ${CFLAGS} -o ttag_lightcurve ttag_lightcurve.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_periodogram:
-		${CC} ${CFLAGS} -o ttag_lightcurve_periodogram ttag_lightcurve_periodogram.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-mjd2hjd: mjd2hjd.c gethmjd.c
-		${CC} ${CFLAGS} -o mjd2hjd mjd2hjd.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_channel_sum:
-		${CC} ${CFLAGS} -o ttag_lightcurve_channel_sum ttag_lightcurve_channel_sum.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_mjd2hmjd : ttag_lightcurve_mjd2hmjd.c gethmjd.c
-		${CC} ${CFLAGS} -o ttag_lightcurve_mjd2hmjd ttag_lightcurve_mjd2hmjd.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_combine:
-		${CC} ${CFLAGS} -o ttag_lightcurve_combine ttag_lightcurve_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_screen:
-		${CC} ${CFLAGS} -o idf_screen idf_screen.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-remove_target_orbital_motion: remove_target_orbital_motion.c gethmjd.c
-		${CC} ${CFLAGS} -o remove_target_orbital_motion remove_target_orbital_motion.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_cut:
-		${CC} ${CFLAGS} -o idf_cut idf_cut.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-extract_jitter:
-		${CC} ${CFLAGS} -o extract_jitter extract_jitter.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
diff --git a/src/analysis/Makefile.Linux64.orig b/src/analysis/Makefile.Linux64.orig
deleted file mode 100644
index 2ef8094..0000000
--- a/src/analysis/Makefile.Linux64.orig
+++ /dev/null
@@ -1,141 +0,0 @@
-
-CALFUSEDIR=	${PWD}/../..
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-OPT=		-g -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-LIBDIR=		-L/opt/SUNWspro/lib
-FUSELIBS=	-lsla -lcf
-LIBS=		-lc -lm -lnsl -ldl -lgfortran -lcfitsio
-LDFLAGS=	-Wl,-R${CALFUSEDIR}/lib
-
-# Binaries to be made
-
-BINS=		cf_ttag_to_hist get_shift mjd2hjd cf_reflux \
-		idf_screen extract_jitter modhead \
-		cf_arith cf_combine cf_nvo cf_pack cf_xcorr \
-		idf_combine bpm_combine ttag_combine \
-		cf_coadd cf_make_all_exp \
-                remove_target_orbital_motion idf_cut \
-		ttag_lightcurve \
-		ttag_lightcurve_channel_sum \
-		ttag_lightcurve_mjd2hmjd \
-		ttag_lightcurve_combine \
-		ttag_lightcurve_periodogram 
-
-all:		${BINS}
-		chmod g+rw ${BINS}
-
-install:	all
-		/bin/cp ${BINS} cf_make_all_obs.csh cf_make_900_obs.csh ${FUSEBINDIR}
-
-clean:
-		/bin/rm -f *.o ${BINS}
-
-distclean:
-		/bin/rm -f *.o ${BINS}
-		cd ../../bin; /bin/rm -f ${BINS}
-
-cf_arith: cf_arith.c cf_wrspec7.c cf_wrspec_cf2.c
-		${CC} ${CFLAGS} -o cf_arith cf_arith.c cf_wrspec7.c cf_wrspec_cf2.c\
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_coadd: cf_coadd.c
-		${CC} ${CFLAGS} -o cf_coadd cf_coadd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_combine: cf_combine.c cf_wrspec7.c
-		${CC} ${CFLAGS} -o cf_combine cf_combine.c cf_wrspec7.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_make_all_exp:
-		${CC} ${CFLAGS} -o cf_make_all_exp cf_make_all_exp.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_ttag_to_hist:
-		${CC} ${CFLAGS} -o cf_ttag_to_hist cf_ttag_to_hist.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_combine:
-		${CC} ${CFLAGS} -o ttag_combine ttag_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_combine:
-		${CC} ${CFLAGS} -o idf_combine idf_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-bpm_combine:
-		${CC} ${CFLAGS} -o bpm_combine bpm_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-get_shift:
-		${CC} ${CFLAGS} -o get_shift get_shift.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_pack:
-		${CC} ${CFLAGS} -o cf_pack cf_pack.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_nvo:
-		${CC} ${CFLAGS} -o cf_nvo cf_nvo.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_reflux:
-		${CC} ${CFLAGS} -o cf_reflux cf_reflux.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_xcorr:
-		${CC} ${CFLAGS} -o cf_xcorr cf_xcorr.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-modhead:
-		${CC} ${CFLAGS} -o modhead modhead.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve:
-		${CC} ${CFLAGS} -o ttag_lightcurve ttag_lightcurve.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_periodogram:
-		${CC} ${CFLAGS} -o ttag_lightcurve_periodogram ttag_lightcurve_periodogram.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-mjd2hjd: mjd2hjd.c gethmjd.c
-		${CC} ${CFLAGS} -o mjd2hjd mjd2hjd.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_channel_sum:
-		${CC} ${CFLAGS} -o ttag_lightcurve_channel_sum ttag_lightcurve_channel_sum.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_mjd2hmjd : ttag_lightcurve_mjd2hmjd.c gethmjd.c
-		${CC} ${CFLAGS} -o ttag_lightcurve_mjd2hmjd ttag_lightcurve_mjd2hmjd.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_combine:
-		${CC} ${CFLAGS} -o ttag_lightcurve_combine ttag_lightcurve_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_screen:
-		${CC} ${CFLAGS} -o idf_screen idf_screen.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-remove_target_orbital_motion: remove_target_orbital_motion.c gethmjd.c
-		${CC} ${CFLAGS} -o remove_target_orbital_motion remove_target_orbital_motion.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_cut:
-		${CC} ${CFLAGS} -o idf_cut idf_cut.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-extract_jitter:
-		${CC} ${CFLAGS} -o extract_jitter extract_jitter.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
diff --git a/src/analysis/Makefile.MacOSX.orig b/src/analysis/Makefile.MacOSX.orig
deleted file mode 100644
index 5e40b35..0000000
--- a/src/analysis/Makefile.MacOSX.orig
+++ /dev/null
@@ -1,145 +0,0 @@
-
-FITSVER=	2.470
-CALFUSEDIR=	${PWD}/../..
-MACOSX_DEPLOYMENT_TARGET=	10.2
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-OPT=		-O3 -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-# FUSELIBS=	-lsla -lcfitsio-${FITSVER} -lcf
-FUSELIBS=	-lsla -lcfitsio -lcf
-LIBS=		-lc -lm -ldl -L/sw/lib/ -lgfortran
-
-# Binaries to be made
-
-BINS=		cf_ttag_to_hist get_shift mjd2hjd cf_reflux \
-		idf_screen extract_jitter modhead \
-		cf_arith cf_combine cf_nvo cf_pack cf_xcorr \
-		idf_combine bpm_combine ttag_combine \
-		cf_coadd cf_make_all_exp \
-                remove_target_orbital_motion idf_cut \
-		ttag_lightcurve \
-		ttag_lightcurve_channel_sum \
-		ttag_lightcurve_mjd2hmjd \
-		ttag_lightcurve_combine \
-		ttag_lightcurve_periodogram 
-
-all:		${BINS}
-		chmod g+rw ${BINS}
-
-install:
-		MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}"; \
-		export MACOSX_DEPLOYMENT_TARGET; \
-		make all
-		/bin/cp ${BINS} cf_make_all_obs.csh cf_make_900_obs.csh ${FUSEBINDIR}
-
-clean:
-		/bin/rm -f *.o ${BINS}
-
-distclean:
-		/bin/rm -f *.o ${BINS}
-		cd ../../bin; /bin/rm -f ${BINS}
-
-cf_arith: cf_arith.c cf_wrspec7.c cf_wrspec_cf2.c
-		${CC} ${CFLAGS} -o cf_arith cf_arith.c cf_wrspec7.c cf_wrspec_cf2.c\
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_coadd: cf_coadd.c
-		${CC} ${CFLAGS} -o cf_coadd cf_coadd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_combine: cf_combine.c cf_wrspec7.c
-		${CC} ${CFLAGS} -o cf_combine cf_combine.c cf_wrspec7.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_make_all_exp:
-		${CC} ${CFLAGS} -o cf_make_all_exp cf_make_all_exp.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_ttag_to_hist:
-		${CC} ${CFLAGS} -o cf_ttag_to_hist cf_ttag_to_hist.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_combine:
-		${CC} ${CFLAGS} -o ttag_combine ttag_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_combine:
-		${CC} ${CFLAGS} -o idf_combine idf_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-bpm_combine:
-		${CC} ${CFLAGS} -o bpm_combine bpm_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-get_shift:
-		${CC} ${CFLAGS} -o get_shift get_shift.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_pack:
-		${CC} ${CFLAGS} -o cf_pack cf_pack.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_nvo:
-		${CC} ${CFLAGS} -o cf_nvo cf_nvo.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_reflux:
-		${CC} ${CFLAGS} -o cf_reflux cf_reflux.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_xcorr:
-		${CC} ${CFLAGS} -o cf_xcorr cf_xcorr.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-modhead:
-		${CC} ${CFLAGS} -o modhead modhead.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve:
-		${CC} ${CFLAGS} -o ttag_lightcurve ttag_lightcurve.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_periodogram:
-		${CC} ${CFLAGS} -o ttag_lightcurve_periodogram ttag_lightcurve_periodogram.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-mjd2hjd: mjd2hjd.c gethmjd.c
-		${CC} ${CFLAGS} -o mjd2hjd mjd2hjd.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_channel_sum:
-		${CC} ${CFLAGS} -o ttag_lightcurve_channel_sum ttag_lightcurve_channel_sum.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_mjd2hmjd : ttag_lightcurve_mjd2hmjd.c gethmjd.c
-		${CC} ${CFLAGS} -o ttag_lightcurve_mjd2hmjd ttag_lightcurve_mjd2hmjd.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_combine:
-		${CC} ${CFLAGS} -o ttag_lightcurve_combine ttag_lightcurve_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_screen:
-		${CC} ${CFLAGS} -o idf_screen idf_screen.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-remove_target_orbital_motion: remove_target_orbital_motion.c gethmjd.c
-		${CC} ${CFLAGS} -o remove_target_orbital_motion remove_target_orbital_motion.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_cut:
-		${CC} ${CFLAGS} -o idf_cut idf_cut.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-extract_jitter:
-		${CC} ${CFLAGS} -o extract_jitter extract_jitter.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
diff --git a/src/analysis/Makefile.Solaris.orig b/src/analysis/Makefile.Solaris.orig
deleted file mode 100644
index 52fb31b..0000000
--- a/src/analysis/Makefile.Solaris.orig
+++ /dev/null
@@ -1,147 +0,0 @@
-
-FITSVER=	2.470
-CALFUSEDIR=	${PWD}/../..
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-#  Romelfanger's optimizations
-# OPT=		-fast -xO5 -xtarget=ultra2 -xarch=v8plusa
-#
-#  SunWorld's optimizations
-# OPT=		-p -v -xO2 -xdepend -xchip=ultra -xarch=generic
-OPT=		-O -DCFORTRAN -KPIC -DSOLARIS
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-LIBDIR=		-L/opt/SUNWspro/lib
-FUSELIBS=	-lsla -lcfitsio-${FITSVER} -lcf
-LIBS=		-lc -lm -lnsl -ldl -lsocket -lsunmath -lM77 -lF77
-LDFLAGS=	-Wl,-R${CALFUSEDIR}/lib
-
-# Binaries to be made
-
-BINS=		cf_ttag_to_hist get_shift mjd2hjd cf_reflux \
-		idf_screen extract_jitter modhead \
-		cf_arith cf_combine cf_nvo cf_pack cf_xcorr \
-		idf_combine bpm_combine ttag_combine \
-		cf_coadd cf_make_all_exp \
-                remove_target_orbital_motion idf_cut \
-		ttag_lightcurve \
-		ttag_lightcurve_channel_sum \
-		ttag_lightcurve_mjd2hmjd \
-		ttag_lightcurve_combine \
-		ttag_lightcurve_periodogram 
-
-all:		${BINS}
-		chmod g+rw ${BINS}
-
-install:	all
-		/bin/cp ${BINS} cf_make_all_obs.csh cf_make_900_obs.csh ${FUSEBINDIR}
-
-clean:
-		/bin/rm -f *.o ${BINS}
-
-distclean:
-		/bin/rm -f *.o ${BINS}
-		cd ../../bin; /bin/rm -f ${BINS}
-
-cf_arith: cf_arith.c cf_wrspec7.c cf_wrspec_cf2.c
-		${CC} ${CFLAGS} -o cf_arith cf_arith.c cf_wrspec7.c cf_wrspec_cf2.c\
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_coadd: cf_coadd.c
-		${CC} ${CFLAGS} -o cf_coadd cf_coadd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_combine: cf_combine.c cf_wrspec7.c
-		${CC} ${CFLAGS} -o cf_combine cf_combine.c cf_wrspec7.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_make_all_exp:
-		${CC} ${CFLAGS} -o cf_make_all_exp cf_make_all_exp.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_ttag_to_hist:
-		${CC} ${CFLAGS} -o cf_ttag_to_hist cf_ttag_to_hist.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_combine:
-		${CC} ${CFLAGS} -o ttag_combine ttag_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_combine:
-		${CC} ${CFLAGS} -o idf_combine idf_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-bpm_combine:
-		${CC} ${CFLAGS} -o bpm_combine bpm_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-get_shift:
-		${CC} ${CFLAGS} -o get_shift get_shift.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_pack:
-		${CC} ${CFLAGS} -o cf_pack cf_pack.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_nvo:
-		${CC} ${CFLAGS} -o cf_nvo cf_nvo.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_reflux:
-		${CC} ${CFLAGS} -o cf_reflux cf_reflux.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_xcorr:
-		${CC} ${CFLAGS} -o cf_xcorr cf_xcorr.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-modhead:
-		${CC} ${CFLAGS} -o modhead modhead.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve:
-		${CC} ${CFLAGS} -o ttag_lightcurve ttag_lightcurve.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_periodogram:
-		${CC} ${CFLAGS} -o ttag_lightcurve_periodogram ttag_lightcurve_periodogram.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-mjd2hjd: mjd2hjd.c gethmjd.c
-		${CC} ${CFLAGS} -o mjd2hjd mjd2hjd.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_channel_sum:
-		${CC} ${CFLAGS} -o ttag_lightcurve_channel_sum ttag_lightcurve_channel_sum.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_mjd2hmjd : ttag_lightcurve_mjd2hmjd.c gethmjd.c
-		${CC} ${CFLAGS} -o ttag_lightcurve_mjd2hmjd ttag_lightcurve_mjd2hmjd.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_combine:
-		${CC} ${CFLAGS} -o ttag_lightcurve_combine ttag_lightcurve_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_screen:
-		${CC} ${CFLAGS} -o idf_screen idf_screen.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-remove_target_orbital_motion: remove_target_orbital_motion.c gethmjd.c
-		${CC} ${CFLAGS} -o remove_target_orbital_motion remove_target_orbital_motion.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_cut:
-		${CC} ${CFLAGS} -o idf_cut idf_cut.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-extract_jitter:
-		${CC} ${CFLAGS} -o extract_jitter extract_jitter.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
diff --git a/src/analysis/Makefile.orig.orig b/src/analysis/Makefile.orig.orig
deleted file mode 100644
index 52fb31b..0000000
--- a/src/analysis/Makefile.orig.orig
+++ /dev/null
@@ -1,147 +0,0 @@
-
-FITSVER=	2.470
-CALFUSEDIR=	${PWD}/../..
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-#  Romelfanger's optimizations
-# OPT=		-fast -xO5 -xtarget=ultra2 -xarch=v8plusa
-#
-#  SunWorld's optimizations
-# OPT=		-p -v -xO2 -xdepend -xchip=ultra -xarch=generic
-OPT=		-O -DCFORTRAN -KPIC -DSOLARIS
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-LIBDIR=		-L/opt/SUNWspro/lib
-FUSELIBS=	-lsla -lcfitsio-${FITSVER} -lcf
-LIBS=		-lc -lm -lnsl -ldl -lsocket -lsunmath -lM77 -lF77
-LDFLAGS=	-Wl,-R${CALFUSEDIR}/lib
-
-# Binaries to be made
-
-BINS=		cf_ttag_to_hist get_shift mjd2hjd cf_reflux \
-		idf_screen extract_jitter modhead \
-		cf_arith cf_combine cf_nvo cf_pack cf_xcorr \
-		idf_combine bpm_combine ttag_combine \
-		cf_coadd cf_make_all_exp \
-                remove_target_orbital_motion idf_cut \
-		ttag_lightcurve \
-		ttag_lightcurve_channel_sum \
-		ttag_lightcurve_mjd2hmjd \
-		ttag_lightcurve_combine \
-		ttag_lightcurve_periodogram 
-
-all:		${BINS}
-		chmod g+rw ${BINS}
-
-install:	all
-		/bin/cp ${BINS} cf_make_all_obs.csh cf_make_900_obs.csh ${FUSEBINDIR}
-
-clean:
-		/bin/rm -f *.o ${BINS}
-
-distclean:
-		/bin/rm -f *.o ${BINS}
-		cd ../../bin; /bin/rm -f ${BINS}
-
-cf_arith: cf_arith.c cf_wrspec7.c cf_wrspec_cf2.c
-		${CC} ${CFLAGS} -o cf_arith cf_arith.c cf_wrspec7.c cf_wrspec_cf2.c\
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_coadd: cf_coadd.c
-		${CC} ${CFLAGS} -o cf_coadd cf_coadd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_combine: cf_combine.c cf_wrspec7.c
-		${CC} ${CFLAGS} -o cf_combine cf_combine.c cf_wrspec7.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_make_all_exp:
-		${CC} ${CFLAGS} -o cf_make_all_exp cf_make_all_exp.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_ttag_to_hist:
-		${CC} ${CFLAGS} -o cf_ttag_to_hist cf_ttag_to_hist.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_combine:
-		${CC} ${CFLAGS} -o ttag_combine ttag_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_combine:
-		${CC} ${CFLAGS} -o idf_combine idf_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-bpm_combine:
-		${CC} ${CFLAGS} -o bpm_combine bpm_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-get_shift:
-		${CC} ${CFLAGS} -o get_shift get_shift.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_pack:
-		${CC} ${CFLAGS} -o cf_pack cf_pack.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_nvo:
-		${CC} ${CFLAGS} -o cf_nvo cf_nvo.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_reflux:
-		${CC} ${CFLAGS} -o cf_reflux cf_reflux.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_xcorr:
-		${CC} ${CFLAGS} -o cf_xcorr cf_xcorr.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-modhead:
-		${CC} ${CFLAGS} -o modhead modhead.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve:
-		${CC} ${CFLAGS} -o ttag_lightcurve ttag_lightcurve.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_periodogram:
-		${CC} ${CFLAGS} -o ttag_lightcurve_periodogram ttag_lightcurve_periodogram.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-mjd2hjd: mjd2hjd.c gethmjd.c
-		${CC} ${CFLAGS} -o mjd2hjd mjd2hjd.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_channel_sum:
-		${CC} ${CFLAGS} -o ttag_lightcurve_channel_sum ttag_lightcurve_channel_sum.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_mjd2hmjd : ttag_lightcurve_mjd2hmjd.c gethmjd.c
-		${CC} ${CFLAGS} -o ttag_lightcurve_mjd2hmjd ttag_lightcurve_mjd2hmjd.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-ttag_lightcurve_combine:
-		${CC} ${CFLAGS} -o ttag_lightcurve_combine ttag_lightcurve_combine.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_screen:
-		${CC} ${CFLAGS} -o idf_screen idf_screen.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-remove_target_orbital_motion: remove_target_orbital_motion.c gethmjd.c
-		${CC} ${CFLAGS} -o remove_target_orbital_motion remove_target_orbital_motion.c gethmjd.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-idf_cut:
-		${CC} ${CFLAGS} -o idf_cut idf_cut.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-extract_jitter:
-		${CC} ${CFLAGS} -o extract_jitter extract_jitter.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
diff --git a/src/cal/geom/Makefile.orig.orig b/src/cal/geom/Makefile.orig.orig
deleted file mode 100644
index 5b23afd..0000000
--- a/src/cal/geom/Makefile.orig.orig
+++ /dev/null
@@ -1,43 +0,0 @@
-VERSION=	v1.8
-
-CALFUSEDIR=	${PWD}/../../..
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-#  Romelfanger's optimizations
-# OPT=		-fast -xO5 -xtarget=ultra2 -xarch=v8plusa
-#
-#  SunWorld's optimizations
-# OPT=		-p -v -xO2 -xdepend -xchip=ultra -xarch=generic
-OPT=		-g
-#OPT=		-O -DCFORTRAN -KPIC -DSOLARIS
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-LIBDIR=		-L/opt/SUNWspro/lib
-FUSELIBS=	-lsla -lcfitsio -lcf
-LIBS=		-lc -lm -lnsl -ldl -lsocket -lsunmath -lM77 -lF77
-LDFLAGS=	
-
-# binaries to be made
-
-BINS=		make_geom_file
-
-all:		${BINS}
-		chmod g+rw ${BINS}
-
-install:	all
-		/bin/cp ${BINS} ${FUSEBINDIR}
-
-clean:		
-		/bin/rm -f ${BINS}
-
-make_geom_file:
-		${CC} ${CFLAGS} -o make_geom_file make_geom_file.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
diff --git a/src/cal/jitter/Makefile.Linux.orig b/src/cal/jitter/Makefile.Linux.orig
deleted file mode 100644
index aafa61d..0000000
--- a/src/cal/jitter/Makefile.Linux.orig
+++ /dev/null
@@ -1,43 +0,0 @@
-
-FITSVER=	2.470
-CALFUSEDIR=	${PWD}/../../..
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-OPT=		-g -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-FUSELIBS=	-lsla -lcfitsio-${FITSVER} -lcf
-LIBS=		-lc -lm -lnsl -ldl -lgfortran
-LDFLAGS=	-Wl,-R${CALFUSEDIR}/lib
-
-# binaries to be made
-
-BINS=		cf_jitter_diag cf_jitter
-
-all:		${BINS}
-		chmod g+rw ${BINS}
-
-install:	all
-		/bin/cp ${BINS} ${FUSEBINDIR}
-
-clean:
-		/bin/rm -f *.o ${BINS}
-
-distclean:
-		/bin/rm -f *.o ${BINS}
-		cd ../../../bin; /bin/rm -f ${BINS}
-
-cf_jitter_diag:	cf_jitter_diag.c
-		${CC} ${CFLAGS} -o cf_jitter_diag cf_jitter_diag.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_jitter:	cf_jitter.c
-		${CC} ${CFLAGS} -o cf_jitter cf_jitter.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
diff --git a/src/cal/jitter/Makefile.Linux64.orig b/src/cal/jitter/Makefile.Linux64.orig
deleted file mode 100644
index f6cf992..0000000
--- a/src/cal/jitter/Makefile.Linux64.orig
+++ /dev/null
@@ -1,42 +0,0 @@
-
-CALFUSEDIR=	${PWD}/../../..
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-OPT=		-g -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-FUSELIBS=	-lsla -lcf
-LIBS=		-lc -lm -lnsl -ldl -lgfortran -lcfitsio
-LDFLAGS=	-Wl,-R${CALFUSEDIR}/lib
-
-# binaries to be made
-
-BINS=		cf_jitter_diag cf_jitter
-
-all:		${BINS}
-		chmod g+rw ${BINS}
-
-install:	all
-		/bin/cp ${BINS} ${FUSEBINDIR}
-
-clean:
-		/bin/rm -f *.o ${BINS}
-
-distclean:
-		/bin/rm -f *.o ${BINS}
-		cd ../../../bin; /bin/rm -f ${BINS}
-
-cf_jitter_diag:	cf_jitter_diag.c
-		${CC} ${CFLAGS} -o cf_jitter_diag cf_jitter_diag.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_jitter:	cf_jitter.c
-		${CC} ${CFLAGS} -o cf_jitter cf_jitter.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
diff --git a/src/cal/jitter/Makefile.MacOSX.orig b/src/cal/jitter/Makefile.MacOSX.orig
deleted file mode 100644
index fc408c9..0000000
--- a/src/cal/jitter/Makefile.MacOSX.orig
+++ /dev/null
@@ -1,46 +0,0 @@
-
-FITSVER=	2.470
-CALFUSEDIR=	${PWD}/../../..
-MACOSX_DEPLOYMENT_TARGET=       10.2
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-OPT=            -O3 -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-FUSELIBS=	-lsla -lcfitsio -lcf
-LIBS=           -lc -lm -ldl -L/sw/lib/ -lgfortran
-
-# Binaries to be made
-
-BINS=		cf_jitter_diag cf_jitter
-
-all:		${BINS}
-		chmod g+rw ${BINS}
-
-install:
-		MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}"; \
-		export MACOSX_DEPLOYMENT_TARGET; \
-		make all
-		/bin/cp ${BINS} ${FUSEBINDIR}
-
-clean:
-		/bin/rm -f *.o ${BINS}
-
-distclean:
-		/bin/rm -f *.o ${BINS}
-		cd ../../../bin; /bin/rm -f ${BINS}
-
-cf_jitter_diag:	cf_jitter_diag.c
-		${CC} ${CFLAGS} -o cf_jitter_diag cf_jitter_diag.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_jitter:	cf_jitter.c
-		${CC} ${CFLAGS} -o cf_jitter cf_jitter.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
diff --git a/src/cal/jitter/Makefile.Solaris.orig b/src/cal/jitter/Makefile.Solaris.orig
deleted file mode 100644
index f182b16..0000000
--- a/src/cal/jitter/Makefile.Solaris.orig
+++ /dev/null
@@ -1,50 +0,0 @@
-
-FITSVER=	2.470
-CALFUSEDIR=	${PWD}/../../..
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-#  Romelfanger's optimizations
-# OPT=		-fast -xO5 -xtarget=ultra2 -xarch=v8plusa
-#
-#  SunWorld's optimizations
-# OPT=		-p -v -xO2 -xdepend -xchip=ultra -xarch=generic
-OPT=		-O -DCFORTRAN -KPIC -DSOLARIS
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-LIBDIR=		-L/opt/SUNWspro/lib
-FUSELIBS=	-lsla -lcfitsio-${FITSVER} -lcf
-LIBS=		-lc -lm -lnsl -ldl -lsocket -lsunmath -lM77 -lF77
-LDFLAGS=	-Wl,-R${CALFUSEDIR}/lib
-
-# binaries to be made
-
-BINS=		cf_jitter_diag cf_jitter
-
-all:		${BINS}
-		chmod g+rw ${BINS}
-
-install:	all
-		/bin/cp ${BINS} ${FUSEBINDIR}
-
-clean:
-		/bin/rm -f *.o ${BINS}
-
-distclean:
-		/bin/rm -f *.o ${BINS}
-		cd ../../../bin; /bin/rm -f ${BINS}
-
-cf_jitter_diag:	cf_jitter_diag.c
-		${CC} ${CFLAGS} -o cf_jitter_diag cf_jitter_diag.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_jitter:	cf_jitter.c
-		${CC} ${CFLAGS} -o cf_jitter cf_jitter.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
diff --git a/src/cal/jitter/Makefile.orig.orig b/src/cal/jitter/Makefile.orig.orig
deleted file mode 100644
index f182b16..0000000
--- a/src/cal/jitter/Makefile.orig.orig
+++ /dev/null
@@ -1,50 +0,0 @@
-
-FITSVER=	2.470
-CALFUSEDIR=	${PWD}/../../..
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-#  Romelfanger's optimizations
-# OPT=		-fast -xO5 -xtarget=ultra2 -xarch=v8plusa
-#
-#  SunWorld's optimizations
-# OPT=		-p -v -xO2 -xdepend -xchip=ultra -xarch=generic
-OPT=		-O -DCFORTRAN -KPIC -DSOLARIS
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-LIBDIR=		-L/opt/SUNWspro/lib
-FUSELIBS=	-lsla -lcfitsio-${FITSVER} -lcf
-LIBS=		-lc -lm -lnsl -ldl -lsocket -lsunmath -lM77 -lF77
-LDFLAGS=	-Wl,-R${CALFUSEDIR}/lib
-
-# binaries to be made
-
-BINS=		cf_jitter_diag cf_jitter
-
-all:		${BINS}
-		chmod g+rw ${BINS}
-
-install:	all
-		/bin/cp ${BINS} ${FUSEBINDIR}
-
-clean:
-		/bin/rm -f *.o ${BINS}
-
-distclean:
-		/bin/rm -f *.o ${BINS}
-		cd ../../../bin; /bin/rm -f ${BINS}
-
-cf_jitter_diag:	cf_jitter_diag.c
-		${CC} ${CFLAGS} -o cf_jitter_diag cf_jitter_diag.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_jitter:	cf_jitter.c
-		${CC} ${CFLAGS} -o cf_jitter cf_jitter.c \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
diff --git a/src/cal/parm/Makefile.orig.orig b/src/cal/parm/Makefile.orig.orig
deleted file mode 100644
index c0d69c1..0000000
--- a/src/cal/parm/Makefile.orig.orig
+++ /dev/null
@@ -1,52 +0,0 @@
-VERSION=	v1.8
-
-CALFUSEDIR=	$(PWD)/../../..
-
-# Symbols for include directories
-FUSEINCLDIR=	$(CALFUSEDIR)/include
-
-# Symbols used for creating shared libraries
-O=		.a
-LDSTATIC=	ld
-
-# Symbols used for creating shared libraries
-SO=		.so
-LDSHARED=	ld
-CCSHARED=	-G
-
-# Symbols used for compiling
-CC=		cc
-#  Romelfanger's optimizations
-# OPT=		-fast -xO5 -xtarget=ultra2 -xarch=v8plusa
-#
-#  SunWorld's optimizations
-# OPT=		-p -v -xO2 -xdepend -xchip=ultra -xarch=generic
-OPT=		-O -KPIC -DSOLARIS -DCFORTRAN
-CFLAGS=		$(OPT) -I$(FUSEINCLDIR)
-
-# Symbols used for creating shared binaries
-FUSELIBDIR=	$(CALFUSEDIR)/lib
-FUSEBINDIR=	$(CALFUSEDIR)/bin
-LIBDIR=		/opt/SUNWspro/lib
-#FUSELIBS=	-lcf -lsla -lcalfits -lcfitsio
-FUSELIBS=	-lsla -lcfitsio -lcf
-LIBS=		-lsocket -lnsl -ldl -lsunmath -lm -lc -lM77 -lF77
-LDFLAGS=	
-
-# binaries to be made
-
-BINS=		make_parm_file
-
-all:		$(BINS)
-		chmod g+rw $(BINS)
-
-install:	all
-		/bin/cp $(BINS) $(FUSEBINDIR)
-
-clean:		
-		/bin/rm -f $(BINS)
-
-make_parm_file:
-		$(CC) $(CFLAGS) -o make_parm_file make_parm_file.c \
-		-L$(FUSELIBDIR) -L$(LIBDIR) $(FUSELIBS) $(LIBS) $(LDFLAGS)
-
diff --git a/src/cal/saa/Makefile.orig.orig b/src/cal/saa/Makefile.orig.orig
deleted file mode 100644
index 09b0736..0000000
--- a/src/cal/saa/Makefile.orig.orig
+++ /dev/null
@@ -1,19 +0,0 @@
-CFDIR = /usr/local/fusesw/calfuse/v1.2
-BIN = ${CFDIR}/bin
-CC = cc
-CFLAGS = -v -xO2 -I${CFDIR}/include -I/usr/local/include 
-LIBS = -L${CFDIR}/lib -lcf -L/usr/local/lib -lcfitsio -lm -lsocket -lnsl
-
-#       -  <<-- ignore error code
-
-all: make_saa_file
-
-make_saa_file:   make_saa_file.o
-	${CC} $(CFLAGS) -o make_saa_file make_saa_file.o \
-	$(LIBS)
-
-clean:
-	-	/bin/rm -f *.o make_saa_file
-
-install:	all
-	-	/bin/cp make_saa_file 	${BIN}/make_saa_file
diff --git a/src/cal/screen/Makefile.orig.orig b/src/cal/screen/Makefile.orig.orig
deleted file mode 100644
index 7579595..0000000
--- a/src/cal/screen/Makefile.orig.orig
+++ /dev/null
@@ -1,28 +0,0 @@
-VERSION=	v1.7
-
-CFDIR=		/usr/local/fusesw/calfuse/$(VERSION)
-BIN=		${CFDIR}/bin
-FITSINCLDIR=	/usr/local/include
-FUSEINCLDIR=	$(CFDIR)/include
-CC=		cc
-OPT=		-O -KPIC
-CFLAGS=		$(OPT) -I${FUSEINCLDIR} -I$(FITSINCLDIR)
-
-LDSHARED=	ld
-FUSELIBDIR=	$(CFDIR)/lib
-FUSELIBS=	-lcf -lsla -lcalfits -lcfitsio
-LIBS=		-lm -lsocket -lnsl -ldl
-
-#       -  <<-- ignore error code
-
-all:		make_screen_file
-
-make_screen_file:
-		${CC} $(CFLAGS) -o make_screen_file make_screen_file.c \
-		-L$(FUSELIBDIR) $(FUSELIBS) $(LIBS) $(LDFLAGS)
-
-clean:
-	-	/bin/rm -f *.o make_screen_file
-
-install:	all
-	-	/bin/cp make_screen_file 	${BIN}/make_screen_file
diff --git a/src/fes/Makefile.Linux.orig b/src/fes/Makefile.Linux.orig
deleted file mode 100644
index af548ac..0000000
--- a/src/fes/Makefile.Linux.orig
+++ /dev/null
@@ -1,44 +0,0 @@
-
-SHARED=		-shared
-FITSVER=	2.470
-CALFUSEDIR=	${PWD}/../..
-
-# Symbols for include directories
-FUSEINCLDIR=    -I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=             cc
-OPT=            -g -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS =	${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=     ${CALFUSEDIR}/bin
-FUSELIBDIR=     -L${CALFUSEDIR}/lib
-LIBDIR=         
-FUSELIBS=       -lsla -lcfitsio-${FITSVER} -lcf
-LIBS=           -lc -lm -lnsl -ldl -lgfortran
-LDFLAGS=        -Wl,-R${CALFUSEDIR}/lib
-
-OBJECTS=	cf_calfes.o cf_fes_init.o cf_fes_read.o cf_fes_write.o \
-		cf_fes_cal.o cf_fes_get_cal_image.o cf_limbang.o \
-		cf_fes_apply_bias.o cf_fes_apply_flat.o cf_fes_apply_mask.o 
-
-all:		cf_calfes
-
-cf_calfes:	${OBJECTS}
-		${CC} ${CFLAGS} -o cf_calfes ${OBJECTS} \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-		chmod g+rw cf_calfes
-
-install:	cf_calfes
-		/bin/cp cf_calfes ${FUSEBINDIR}
-
-clean:
-		/bin/rm -f ${OBJECTS} cf_calfes
-
-distclean:
-		/bin/rm -f ${OBJECTS} cf_calfes
-		cd ../../bin; /bin/rm -f cf_calfes
-
-lint:		${SOURCES}
-		lint ${SOURCES}
diff --git a/src/fes/Makefile.Linux64.orig b/src/fes/Makefile.Linux64.orig
deleted file mode 100644
index 87e47c2..0000000
--- a/src/fes/Makefile.Linux64.orig
+++ /dev/null
@@ -1,43 +0,0 @@
-
-SHARED=		-shared
-CALFUSEDIR=	${PWD}/../..
-
-# Symbols for include directories
-FUSEINCLDIR=    -I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=             cc
-OPT=            -g -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS =	${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=     ${CALFUSEDIR}/bin
-FUSELIBDIR=     -L${CALFUSEDIR}/lib
-LIBDIR=         
-FUSELIBS=       -lsla -lcf
-LIBS=           -lc -lm -lnsl -ldl -lgfortran -lcfitsio
-LDFLAGS=        -Wl,-R${CALFUSEDIR}/lib
-
-OBJECTS=	cf_calfes.o cf_fes_init.o cf_fes_read.o cf_fes_write.o \
-		cf_fes_cal.o cf_fes_get_cal_image.o cf_limbang.o \
-		cf_fes_apply_bias.o cf_fes_apply_flat.o cf_fes_apply_mask.o 
-
-all:		cf_calfes
-
-cf_calfes:	${OBJECTS}
-		${CC} ${CFLAGS} -o cf_calfes ${OBJECTS} \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-		chmod g+rw cf_calfes
-
-install:	cf_calfes
-		/bin/cp cf_calfes ${FUSEBINDIR}
-
-clean:
-		/bin/rm -f ${OBJECTS} cf_calfes
-
-distclean:
-		/bin/rm -f ${OBJECTS} cf_calfes
-		cd ../../bin; /bin/rm -f cf_calfes
-
-lint:		${SOURCES}
-		lint ${SOURCES}
diff --git a/src/fes/Makefile.Solaris.orig b/src/fes/Makefile.Solaris.orig
deleted file mode 100644
index 23f189b..0000000
--- a/src/fes/Makefile.Solaris.orig
+++ /dev/null
@@ -1,44 +0,0 @@
-
-SHARED=		-shared
-FITSVER=	2.470
-CALFUSEDIR=	${PWD}/../..
-
-# Symbols for include directories
-FUSEINCLDIR=    -I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=             cc
-OPT=            -O -DCFORTRAN -KPIC -DSOLARIS
-CFLAGS =	${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=     ${CALFUSEDIR}/bin
-FUSELIBDIR=     -L${CALFUSEDIR}/lib
-LIBDIR=         -L/opt/SUNWspro/lib
-FUSELIBS=       -lsla -lcfitsio-${FITSVER} -lcf
-LIBS=           -lc -lm -lnsl -ldl -lsocket -lsunmath -lM77 -lF77
-LDFLAGS=        -Wl,-R${CALFUSEDIR}/lib
-
-OBJECTS=	cf_calfes.o cf_fes_init.o cf_fes_read.o cf_fes_write.o \
-		cf_fes_cal.o cf_fes_get_cal_image.o cf_limbang.o \
-		cf_fes_apply_bias.o cf_fes_apply_flat.o cf_fes_apply_mask.o 
-
-all:		cf_calfes
-
-cf_calfes:	${OBJECTS}
-		${CC} ${CFLAGS} -o cf_calfes ${OBJECTS} \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-		chmod g+rw cf_calfes
-
-install:	cf_calfes
-		/bin/cp cf_calfes ${FUSEBINDIR}
-
-clean:
-		/bin/rm -f ${OBJECTS} cf_calfes
-
-distclean:
-		/bin/rm -f ${OBJECTS} cf_calfes
-		cd ../../bin; /bin/rm -f cf_calfes
-
-lint:		${SOURCES}
-		lint ${SOURCES}
diff --git a/src/fes/Makefile.orig.orig b/src/fes/Makefile.orig.orig
deleted file mode 100644
index 23f189b..0000000
--- a/src/fes/Makefile.orig.orig
+++ /dev/null
@@ -1,44 +0,0 @@
-
-SHARED=		-shared
-FITSVER=	2.470
-CALFUSEDIR=	${PWD}/../..
-
-# Symbols for include directories
-FUSEINCLDIR=    -I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=             cc
-OPT=            -O -DCFORTRAN -KPIC -DSOLARIS
-CFLAGS =	${OPT} ${FUSEINCLDIR}
-
-# Symbols used for creating shared binaries
-FUSEBINDIR=     ${CALFUSEDIR}/bin
-FUSELIBDIR=     -L${CALFUSEDIR}/lib
-LIBDIR=         -L/opt/SUNWspro/lib
-FUSELIBS=       -lsla -lcfitsio-${FITSVER} -lcf
-LIBS=           -lc -lm -lnsl -ldl -lsocket -lsunmath -lM77 -lF77
-LDFLAGS=        -Wl,-R${CALFUSEDIR}/lib
-
-OBJECTS=	cf_calfes.o cf_fes_init.o cf_fes_read.o cf_fes_write.o \
-		cf_fes_cal.o cf_fes_get_cal_image.o cf_limbang.o \
-		cf_fes_apply_bias.o cf_fes_apply_flat.o cf_fes_apply_mask.o 
-
-all:		cf_calfes
-
-cf_calfes:	${OBJECTS}
-		${CC} ${CFLAGS} -o cf_calfes ${OBJECTS} \
-		${FUSELIBDIR} ${LIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-		chmod g+rw cf_calfes
-
-install:	cf_calfes
-		/bin/cp cf_calfes ${FUSEBINDIR}
-
-clean:
-		/bin/rm -f ${OBJECTS} cf_calfes
-
-distclean:
-		/bin/rm -f ${OBJECTS} cf_calfes
-		cd ../../bin; /bin/rm -f cf_calfes
-
-lint:		${SOURCES}
-		lint ${SOURCES}
diff --git a/src/fuv/Makefile.Linux.orig b/src/fuv/Makefile.Linux.orig
deleted file mode 100644
index da60b24..0000000
--- a/src/fuv/Makefile.Linux.orig
+++ /dev/null
@@ -1,75 +0,0 @@
-
-CALFUSEDIR=	${PWD}/../..
-SHARED=		-shared
-FITSVER=	2.470
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-OPT=		-g -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib 
-FUSELIBS=	-lcfitsio-${FITSVER} -lsla -lcf
-LIBS=		-lc -lm -lnsl -ldl -lgfortran
-LDFLAGS=	-Wl,-R${CALFUSEDIR}/lib,-R${CALFUSEDIR}/src/libcf
-
-# Symbols used for creating shared libraries
-
-BINS=		cf_hist_init cf_ttag_init cf_convert_to_farf cf_remove_motions \
-                cf_assign_wavelength cf_screen_photons cf_flux_calibrate \
-		cf_extract_spectra cf_countmap cf_gainmap cf_bad_pixels
-
-all:		${BINS}
-		chmod g+w ${BINS}
-
-install:	all
-		/bin/cp -p ${BINS} ${FUSEBINDIR}
-
-clean: 
-	-	/bin/rm -f ${BINS}
-
-distclean: 
-	-	/bin/rm -f ${BINS}
-		cd ../../bin; /bin/rm -f ${BINS} calfuse
-
-cf_hist_init:
-		${CC} ${CFLAGS} -o cf_hist_init cf_hist_init.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_ttag_init:
-		${CC} ${CFLAGS} -o cf_ttag_init cf_ttag_init.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_convert_to_farf:
-		${CC} ${CFLAGS} -o cf_convert_to_farf cf_convert_to_farf.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_remove_motions:
-		${CC} ${CFLAGS} -o cf_remove_motions cf_remove_motions.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_assign_wavelength:
-		${CC} ${CFLAGS} -o cf_assign_wavelength \
-		cf_assign_wavelength.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_screen_photons:
-		${CC} ${CFLAGS} -o cf_screen_photons cf_screen_photons.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_flux_calibrate:
-		${CC} ${CFLAGS} -o cf_flux_calibrate cf_flux_calibrate.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_extract_spectra:
-		${CC} ${CFLAGS} -o cf_extract_spectra cf_extract_spectra.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_countmap:
-		${CC} ${CFLAGS} -o cf_countmap cf_countmap.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_gainmap:
-		${CC} ${CFLAGS} -o cf_gainmap cf_gainmap.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_bad_pixels:
-		${CC} ${CFLAGS} -o cf_bad_pixels cf_bad_pixels.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
diff --git a/src/fuv/Makefile.Linux64.orig b/src/fuv/Makefile.Linux64.orig
deleted file mode 100644
index 6fbead0..0000000
--- a/src/fuv/Makefile.Linux64.orig
+++ /dev/null
@@ -1,74 +0,0 @@
-
-CALFUSEDIR=	${PWD}/../..
-SHARED=		-shared
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-OPT=		-g -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib 
-FUSELIBS=	-lsla -lcf
-LIBS=		-lc -lm -lnsl -ldl -lgfortran -lcfitsio
-LDFLAGS=	-Wl,-R${CALFUSEDIR}/lib,-R${CALFUSEDIR}/src/libcf
-
-# Symbols used for creating shared libraries
-
-BINS=		cf_hist_init cf_ttag_init cf_convert_to_farf cf_remove_motions \
-                cf_assign_wavelength cf_screen_photons cf_flux_calibrate \
-		cf_extract_spectra cf_countmap cf_gainmap cf_bad_pixels
-
-all:		${BINS}
-		chmod g+w ${BINS}
-
-install:	all
-		/bin/cp -p ${BINS} ${FUSEBINDIR}
-
-clean: 
-	-	/bin/rm -f ${BINS}
-
-distclean: 
-	-	/bin/rm -f ${BINS}
-		cd ../../bin; /bin/rm -f ${BINS} calfuse
-
-cf_hist_init:
-		${CC} ${CFLAGS} -o cf_hist_init cf_hist_init.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_ttag_init:
-		${CC} ${CFLAGS} -o cf_ttag_init cf_ttag_init.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_convert_to_farf:
-		${CC} ${CFLAGS} -o cf_convert_to_farf cf_convert_to_farf.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_remove_motions:
-		${CC} ${CFLAGS} -o cf_remove_motions cf_remove_motions.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_assign_wavelength:
-		${CC} ${CFLAGS} -o cf_assign_wavelength \
-		cf_assign_wavelength.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_screen_photons:
-		${CC} ${CFLAGS} -o cf_screen_photons cf_screen_photons.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_flux_calibrate:
-		${CC} ${CFLAGS} -o cf_flux_calibrate cf_flux_calibrate.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_extract_spectra:
-		${CC} ${CFLAGS} -o cf_extract_spectra cf_extract_spectra.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_countmap:
-		${CC} ${CFLAGS} -o cf_countmap cf_countmap.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_gainmap:
-		${CC} ${CFLAGS} -o cf_gainmap cf_gainmap.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_bad_pixels:
-		${CC} ${CFLAGS} -o cf_bad_pixels cf_bad_pixels.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
diff --git a/src/fuv/Makefile.MacOSX.orig b/src/fuv/Makefile.MacOSX.orig
deleted file mode 100644
index acbfaf7..0000000
--- a/src/fuv/Makefile.MacOSX.orig
+++ /dev/null
@@ -1,76 +0,0 @@
-
-CALFUSEDIR=	${PWD}/../..
-FITSVER=	2.470
-MACOSX_DEPLOYMENT_TARGET=	10.2
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-OPT=		-O3 -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib 
-# FUSELIBS=	-lcfitsio-${FITSVER} -lsla -lcf
-FUSELIBS=	-lcfitsio -lsla -lcf
-LIBS=		-lc -lm -ldl -L/sw/lib/ -lgfortran
-
-BINS=		cf_hist_init cf_ttag_init cf_convert_to_farf cf_remove_motions \
-                cf_assign_wavelength cf_screen_photons cf_flux_calibrate \
-		cf_extract_spectra cf_countmap cf_gainmap cf_bad_pixels
-
-all:		${BINS}
-		chmod g+w ${BINS}
-
-install:	
-		MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}"; \
-		export MACOSX_DEPLOYMENT_TARGET; \
-		make all
-		/bin/cp -p ${BINS} ${FUSEBINDIR}
-
-clean: 
-	-	/bin/rm -f ${BINS}
-
-distclean: 
-	-	/bin/rm -f ${BINS}
-		cd ../../bin; /bin/rm -f ${BINS} calfuse
-
-cf_hist_init:
-		${CC} ${CFLAGS} -o cf_hist_init cf_hist_init.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS}
-cf_ttag_init:
-		${CC} ${CFLAGS} -o cf_ttag_init cf_ttag_init.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS}
-cf_convert_to_farf:
-		${CC} ${CFLAGS} -o cf_convert_to_farf cf_convert_to_farf.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS}
-cf_remove_motions:
-		${CC} ${CFLAGS} -o cf_remove_motions cf_remove_motions.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS}
-cf_assign_wavelength:
-		${CC} ${CFLAGS} -o cf_assign_wavelength \
-		cf_assign_wavelength.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS}
-cf_screen_photons:
-		${CC} ${CFLAGS} -o cf_screen_photons cf_screen_photons.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS}
-cf_flux_calibrate:
-		${CC} ${CFLAGS} -o cf_flux_calibrate cf_flux_calibrate.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS}
-cf_extract_spectra:
-		${CC} ${CFLAGS} -o cf_extract_spectra cf_extract_spectra.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS}
-cf_countmap:
-		${CC} ${CFLAGS} -o cf_countmap cf_countmap.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS}
-
-cf_gainmap:
-		${CC} ${CFLAGS} -o cf_gainmap cf_gainmap.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS}
-
-cf_bad_pixels:
-		${CC} ${CFLAGS} -o cf_bad_pixels cf_bad_pixels.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS}
-
diff --git a/src/fuv/Makefile.Solaris.orig b/src/fuv/Makefile.Solaris.orig
deleted file mode 100644
index 528e6bc..0000000
--- a/src/fuv/Makefile.Solaris.orig
+++ /dev/null
@@ -1,75 +0,0 @@
-
-CALFUSEDIR=	${PWD}/../..
-SHARED=		-G
-FITSVER=	2.470
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-OPT=		-O -DCFORTRAN -KPIC
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib 
-FUSELIBS=	-lcfitsio-${FITSVER} -lsla -lcf
-LIBS=		-lc -lm -lnsl -ldl -lsocket -lsunmath
-LDFLAGS=	-Wl,-R${CALFUSEDIR}/lib,-R${CALFUSEDIR}/src/libcf
-
-# Symbols used for creating shared libraries
-
-BINS=		cf_hist_init cf_ttag_init cf_convert_to_farf cf_remove_motions \
-                cf_assign_wavelength cf_screen_photons cf_flux_calibrate \
-		cf_extract_spectra cf_countmap cf_gainmap cf_bad_pixels
-
-all:		${BINS}
-		chmod g+w ${BINS}
-
-install:	all
-		/bin/cp -p ${BINS} ${FUSEBINDIR}
-
-clean: 
-	-	/bin/rm -f ${BINS}
-
-distclean: 
-	-	/bin/rm -f ${BINS}
-		cd ../../bin; /bin/rm -f ${BINS} calfuse
-
-cf_hist_init:
-		${CC} ${CFLAGS} -o cf_hist_init cf_hist_init.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_ttag_init:
-		${CC} ${CFLAGS} -o cf_ttag_init cf_ttag_init.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_convert_to_farf:
-		${CC} ${CFLAGS} -o cf_convert_to_farf cf_convert_to_farf.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_remove_motions:
-		${CC} ${CFLAGS} -o cf_remove_motions cf_remove_motions.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_assign_wavelength:
-		${CC} ${CFLAGS} -o cf_assign_wavelength \
-		cf_assign_wavelength.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_screen_photons:
-		${CC} ${CFLAGS} -o cf_screen_photons cf_screen_photons.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_flux_calibrate:
-		${CC} ${CFLAGS} -o cf_flux_calibrate cf_flux_calibrate.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_extract_spectra:
-		${CC} ${CFLAGS} -o cf_extract_spectra cf_extract_spectra.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_countmap:
-		${CC} ${CFLAGS} -o cf_countmap cf_countmap.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_gainmap:
-		${CC} ${CFLAGS} -o cf_gainmap cf_gainmap.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_bad_pixels:
-		${CC} ${CFLAGS} -o cf_bad_pixels cf_bad_pixels.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
diff --git a/src/fuv/Makefile.orig.orig b/src/fuv/Makefile.orig.orig
deleted file mode 100644
index 528e6bc..0000000
--- a/src/fuv/Makefile.orig.orig
+++ /dev/null
@@ -1,75 +0,0 @@
-
-CALFUSEDIR=	${PWD}/../..
-SHARED=		-G
-FITSVER=	2.470
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-OPT=		-O -DCFORTRAN -KPIC
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-FUSEBINDIR=	${CALFUSEDIR}/bin
-FUSELIBDIR=	-L${CALFUSEDIR}/lib 
-FUSELIBS=	-lcfitsio-${FITSVER} -lsla -lcf
-LIBS=		-lc -lm -lnsl -ldl -lsocket -lsunmath
-LDFLAGS=	-Wl,-R${CALFUSEDIR}/lib,-R${CALFUSEDIR}/src/libcf
-
-# Symbols used for creating shared libraries
-
-BINS=		cf_hist_init cf_ttag_init cf_convert_to_farf cf_remove_motions \
-                cf_assign_wavelength cf_screen_photons cf_flux_calibrate \
-		cf_extract_spectra cf_countmap cf_gainmap cf_bad_pixels
-
-all:		${BINS}
-		chmod g+w ${BINS}
-
-install:	all
-		/bin/cp -p ${BINS} ${FUSEBINDIR}
-
-clean: 
-	-	/bin/rm -f ${BINS}
-
-distclean: 
-	-	/bin/rm -f ${BINS}
-		cd ../../bin; /bin/rm -f ${BINS} calfuse
-
-cf_hist_init:
-		${CC} ${CFLAGS} -o cf_hist_init cf_hist_init.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_ttag_init:
-		${CC} ${CFLAGS} -o cf_ttag_init cf_ttag_init.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_convert_to_farf:
-		${CC} ${CFLAGS} -o cf_convert_to_farf cf_convert_to_farf.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_remove_motions:
-		${CC} ${CFLAGS} -o cf_remove_motions cf_remove_motions.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_assign_wavelength:
-		${CC} ${CFLAGS} -o cf_assign_wavelength \
-		cf_assign_wavelength.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_screen_photons:
-		${CC} ${CFLAGS} -o cf_screen_photons cf_screen_photons.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_flux_calibrate:
-		${CC} ${CFLAGS} -o cf_flux_calibrate cf_flux_calibrate.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_extract_spectra:
-		${CC} ${CFLAGS} -o cf_extract_spectra cf_extract_spectra.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-cf_countmap:
-		${CC} ${CFLAGS} -o cf_countmap cf_countmap.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_gainmap:
-		${CC} ${CFLAGS} -o cf_gainmap cf_gainmap.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-cf_bad_pixels:
-		${CC} ${CFLAGS} -o cf_bad_pixels cf_bad_pixels.c \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
diff --git a/src/libcf/Makefile.Linux.orig b/src/libcf/Makefile.Linux.orig
deleted file mode 100644
index 43b2e31..0000000
--- a/src/libcf/Makefile.Linux.orig
+++ /dev/null
@@ -1,152 +0,0 @@
-LIBRARY=	libcf
-
-CALFUSEDIR=	${PWD}/../..
-SHARED=		-shared
-FITSVER=	2.470
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-OPT=		-g -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-FUSELIBS=	-lcfitsio-${FITSVER} -lsla
-LIBS=		-lc -lm -lnsl -ldl -lgfortran
-LDFLAGS=	
-
-# Symbols used for creating shared libraries
-
-SO=		.so
-
-OBJS=		calfits.o sgp4.o eclipse.o saa.o \
-		state_limb.o state_geod.o space_vel.o helio_vel.o \
-		geod_mag.o pole_ang.o solar_ang.o lsrd_vel.o lsrk_vel.o \
-		month_day.o read_tle.o cf_velang.o \
-		set_orbit_parms.o cf_error_msg.o \
-		cf_cal_file.o cf_proc_check.o cf_proc_update.o \
-		cf_timestamp.o cf_fuv_init.o cf_header_io.o \
-		cf_check_digitizer.o cf_nint.o \
-		cf_idf_io.o cf_ids_dead_time.o cf_electronics_dead_time.o \
-		cf_fifo_dead_time.o cf_apply_dead_time.o \
-		cf_thermal_distort.o cf_count_rate_y_distort.o cf_time_xy_distort.o \
-		cf_geometric_distort.o cf_pha_x_distort.o \
-		cf_active_region.o cf_find_spectra.o cf_identify_channel.o \
-		cf_calculate_ycent_motion.o cf_source_aper.o\
-		cf_grating_motion.o cf_fpa_position.o cf_read_fpa_pos.o \
-		cf_make_mask.o cf_mirror_motion.o \
-		cf_satellite_jitter.o cf_calculate_y_centroid.o \
-		cf_target_count_rate.o \
-		cf_screen_jitter.o cf_screen_limb_angle.o cf_screen_saa.o \
-		cf_screen_high_voltage.o cf_screen_burst.o cf_screen_airglow.o \
-		cf_screen_bad_pixels.o cf_set_user_gtis.o \
-		cf_set_photon_flags.o cf_set_good_time_intervals.o \
-		cf_modify_hist_times.o cf_screen_pulse_height.o \
-		cf_convert_to_ergs.o cf_extraction_limits.o \
-		cf_astigmatism.o cf_dispersion.o cf_doppler_and_heliocentric.o \
-		cf_apply_filters.o cf_scale_bkgd.o \
-		cf_make_wave_array.o cf_rebin_background.o \
-		cf_rebin_probability_array.o cf_optimal_extraction.o \
-		cf_write_extracted_spectrum.o cf_standard_or_optimal_extraction.o \
-		cf_init_support.o cf_modify_hist_pha.o \
-		cf_fes_proc_check.o cf_fes_proc_update.o
-
-all:		${OBJS}
-		${CC} ${SHARED} -o ${LIBRARY}${SO} ${OBJS} \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-install:	all
-		chmod g+w ${OBJS} ${LIBRARY}${SO}
-		/bin/cp -p ${LIBRARY}${SO} ${CALFUSEDIR}/lib/${LIBRARY}${SO}
-
-clean: 
-	-	/bin/rm -f *.o ${LIBRARY}${SO} ${LIBRARY}${O}
-
-distclean: 
-	-	/bin/rm -f *.o ${LIBRARY}${SO} ${LIBRARY}${O}
-		cd ../../lib; /bin/rm -f ${LIBRARY}${SO}
-
-calfits.o: calfits.c
-sgp4.o: sgp4.c
-eclipse.o: eclipse.c
-set_orbit_parms.o: set_orbit_parms.c
-saa.o: saa.c
-state_limb.o: state_limb.c
-state_geod.o: state_geod.c
-space_vel.o: space_vel.c
-helio_vel.o: helio_vel.c
-geod_mag.o: geod_mag.c
-pole_ang.o: pole_ang.c
-solar_ang.o: solar_ang.c
-lsrd_vel.o: lsrd_vel.c
-lsrk_vel.o: lsrk_vel.c
-month_day.o: month_day.c
-read_tle.o: read_tle.c
-
-cf_error_msg.o: cf_error_msg.c
-cf_cal_file.o: cf_cal_file.c
-cf_fes_proc_check.o: cf_fes_proc_check.c
-cf_fes_proc_update.o: cf_fes_proc_update.c
-cf_proc_check.o: cf_proc_check.c
-cf_proc_update.o: cf_proc_update.c
-cf_fuv_init.o: cf_fuv_init.c
-cf_velang.o: cf_velang.c
-cf_timestamp.o: cf_timestamp.c
-
-cf_header_io.o: cf_header_io.c
-cf_check_digitizer.o: cf_check_digitizer.c
-cf_nint.o: cf_nint.c
-cf_idf_io.o: cf_idf_io.c
-cf_ids_dead_time.o: cf_ids_dead_time.c
-cf_electronics_dead_time.o: cf_electronics_dead_time.c
-cf_fifo_dead_time.o: cf_fifo_dead_time.c
-cf_apply_dead_time.o: cf_apply_dead_time.c
-cf_thermal_distort.o: cf_thermal_distort.c
-cf_count_rate_y_distort.o: cf_count_rate_y_distort.c
-cf_time_xy_distort.o : cf_time_xy_distort.c
-cf_geometric_distort: cf_geometric_distort.c
-cf_pha_x_distort.o: cf_pha_x_distort.c
-cf_active_region.o: cf_active_region.c
-cf_find_spectra.o: cf_find_spectra.c
-cf_identify_channel.o: cf_identify_channel.c
-cf_init_support.o: cf_init_support.c
-cf_target_count_rate.o: cf_target_count_rate.c
-cf_calculate_ycent_motion.o: cf_calculate_ycent_motion.c
-cf_source_aper.o: cf_source_aper.c
-cf_grating_motion.o: cf_grating_motion.c
-cf_fpa_position.o: cf_fpa_position.c
-cf_read_fpa_pos.o: cf_read_fpa_pos.c
-cf_make_mask.o: cf_make_mask.c
-cf_mirror_motion.o: cf_mirror_motion.c
-cf_satellite_jitter.o: cf_satellite_jitter.c
-cf_calculate_y_centroid.o: cf_calculate_y_centroid.c
-cf_screen_airglow.o: cf_screen_airglow.c
-cf_screen_bad_pixels.o: cf_screen_bad_pixels.c
-cf_screen_jitter.o: cf_screen_jitter.c
-cf_screen_limb_angle.o: cf_screen_limb_angle.c
-cf_screen_saa.o: cf_screen_saa.c
-cf_screen_high_voltage.o: cf_screen_high_voltage.c
-cf_screen_burst.o: cf_screen_burst.c
-cf_set_user_gtis.o: cf_set_user_gtis.c 
-cf_set_photon_flags.o: cf_set_photon_flags.c
-cf_set_good_time_intervals.o: cf_set_good_time_intervals.c
-cf_modify_hist_pha.o: cf_modify_hist_pha.c
-cf_modify_hist_times.o: cf_modify_hist_times.c
-cf_screen_pulse_height.o: cf_screen_pulse_height.c
-cf_convert_to_ergs.o: cf_convert_to_ergs.c
-cf_extraction_limits.o: cf_extraction_limits.c
-cf_astigmatism.o: cf_astigmatism.c
-cf_dispersion.o: cf_dispersion.c
-cf_doppler_and_heliocentric.o: cf_doppler_and_heliocentric.c
-cf_apply_filters.o: cf_apply_filters.c
-cf_scale_bkgd.o: cf_scale_bkgd.c
-cf_make_mask.o: cf_make_mask.c
-cf_make_wave_array.o: cf_make_wave_array.c
-cf_rebin_background.o: cf_rebin_background.c
-cf_rebin_probability_array.o: cf_rebin_probability_array.c
-cf_standard_or_optimal_extraction.o: cf_standard_or_optimal_extraction.c
-cf_optimal_extraction.o: cf_optimal_extraction.c
-cf_write_extracted_spectrum.o: cf_write_extracted_spectrum.c
-
diff --git a/src/libcf/Makefile.Linux64.orig b/src/libcf/Makefile.Linux64.orig
deleted file mode 100644
index 3b00b44..0000000
--- a/src/libcf/Makefile.Linux64.orig
+++ /dev/null
@@ -1,151 +0,0 @@
-LIBRARY=	libcf
-
-CALFUSEDIR=	${PWD}/../..
-SHARED=		-shared -fPIC
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-OPT=		-g -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-FUSELIBS=	-lsla
-LIBS=		-lc -lm -lnsl -ldl -lgfortran -lcfitsio
-LDFLAGS=	
-
-# Symbols used for creating shared libraries
-
-SO=		.so
-
-OBJS=		calfits.o sgp4.o eclipse.o saa.o \
-		state_limb.o state_geod.o space_vel.o helio_vel.o \
-		geod_mag.o pole_ang.o solar_ang.o lsrd_vel.o lsrk_vel.o \
-		month_day.o read_tle.o cf_velang.o \
-		set_orbit_parms.o cf_error_msg.o \
-		cf_cal_file.o cf_proc_check.o cf_proc_update.o \
-		cf_timestamp.o cf_fuv_init.o cf_header_io.o \
-		cf_check_digitizer.o cf_nint.o \
-		cf_idf_io.o cf_ids_dead_time.o cf_electronics_dead_time.o \
-		cf_fifo_dead_time.o cf_apply_dead_time.o \
-		cf_thermal_distort.o cf_count_rate_y_distort.o cf_time_xy_distort.o \
-		cf_geometric_distort.o cf_pha_x_distort.o \
-		cf_active_region.o cf_find_spectra.o cf_identify_channel.o \
-		cf_calculate_ycent_motion.o cf_source_aper.o\
-		cf_grating_motion.o cf_fpa_position.o cf_read_fpa_pos.o \
-		cf_make_mask.o cf_mirror_motion.o \
-		cf_satellite_jitter.o cf_calculate_y_centroid.o \
-		cf_target_count_rate.o \
-		cf_screen_jitter.o cf_screen_limb_angle.o cf_screen_saa.o \
-		cf_screen_high_voltage.o cf_screen_burst.o cf_screen_airglow.o \
-		cf_screen_bad_pixels.o cf_set_user_gtis.o \
-		cf_set_photon_flags.o cf_set_good_time_intervals.o \
-		cf_modify_hist_times.o cf_screen_pulse_height.o \
-		cf_convert_to_ergs.o cf_extraction_limits.o \
-		cf_astigmatism.o cf_dispersion.o cf_doppler_and_heliocentric.o \
-		cf_apply_filters.o cf_scale_bkgd.o \
-		cf_make_wave_array.o cf_rebin_background.o \
-		cf_rebin_probability_array.o cf_optimal_extraction.o \
-		cf_write_extracted_spectrum.o cf_standard_or_optimal_extraction.o \
-		cf_init_support.o cf_modify_hist_pha.o \
-		cf_fes_proc_check.o cf_fes_proc_update.o
-
-all:		${OBJS}
-		${CC} ${SHARED} -o ${LIBRARY}${SO} ${OBJS} \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-install:	all
-		chmod g+w ${OBJS} ${LIBRARY}${SO}
-		/bin/cp -p ${LIBRARY}${SO} ${CALFUSEDIR}/lib/${LIBRARY}${SO}
-
-clean: 
-	-	/bin/rm -f *.o ${LIBRARY}${SO} ${LIBRARY}${O}
-
-distclean: 
-	-	/bin/rm -f *.o ${LIBRARY}${SO} ${LIBRARY}${O}
-		cd ../../lib; /bin/rm -f ${LIBRARY}${SO}
-
-calfits.o: calfits.c
-sgp4.o: sgp4.c
-eclipse.o: eclipse.c
-set_orbit_parms.o: set_orbit_parms.c
-saa.o: saa.c
-state_limb.o: state_limb.c
-state_geod.o: state_geod.c
-space_vel.o: space_vel.c
-helio_vel.o: helio_vel.c
-geod_mag.o: geod_mag.c
-pole_ang.o: pole_ang.c
-solar_ang.o: solar_ang.c
-lsrd_vel.o: lsrd_vel.c
-lsrk_vel.o: lsrk_vel.c
-month_day.o: month_day.c
-read_tle.o: read_tle.c
-
-cf_error_msg.o: cf_error_msg.c
-cf_cal_file.o: cf_cal_file.c
-cf_fes_proc_check.o: cf_fes_proc_check.c
-cf_fes_proc_update.o: cf_fes_proc_update.c
-cf_proc_check.o: cf_proc_check.c
-cf_proc_update.o: cf_proc_update.c
-cf_fuv_init.o: cf_fuv_init.c
-cf_velang.o: cf_velang.c
-cf_timestamp.o: cf_timestamp.c
-
-cf_header_io.o: cf_header_io.c
-cf_check_digitizer.o: cf_check_digitizer.c
-cf_nint.o: cf_nint.c
-cf_idf_io.o: cf_idf_io.c
-cf_ids_dead_time.o: cf_ids_dead_time.c
-cf_electronics_dead_time.o: cf_electronics_dead_time.c
-cf_fifo_dead_time.o: cf_fifo_dead_time.c
-cf_apply_dead_time.o: cf_apply_dead_time.c
-cf_thermal_distort.o: cf_thermal_distort.c
-cf_count_rate_y_distort.o: cf_count_rate_y_distort.c
-cf_time_xy_distort.o : cf_time_xy_distort.c
-cf_geometric_distort: cf_geometric_distort.c
-cf_pha_x_distort.o: cf_pha_x_distort.c
-cf_active_region.o: cf_active_region.c
-cf_find_spectra.o: cf_find_spectra.c
-cf_identify_channel.o: cf_identify_channel.c
-cf_init_support.o: cf_init_support.c
-cf_target_count_rate.o: cf_target_count_rate.c
-cf_calculate_ycent_motion.o: cf_calculate_ycent_motion.c
-cf_source_aper.o: cf_source_aper.c
-cf_grating_motion.o: cf_grating_motion.c
-cf_fpa_position.o: cf_fpa_position.c
-cf_read_fpa_pos.o: cf_read_fpa_pos.c
-cf_make_mask.o: cf_make_mask.c
-cf_mirror_motion.o: cf_mirror_motion.c
-cf_satellite_jitter.o: cf_satellite_jitter.c
-cf_calculate_y_centroid.o: cf_calculate_y_centroid.c
-cf_screen_airglow.o: cf_screen_airglow.c
-cf_screen_bad_pixels.o: cf_screen_bad_pixels.c
-cf_screen_jitter.o: cf_screen_jitter.c
-cf_screen_limb_angle.o: cf_screen_limb_angle.c
-cf_screen_saa.o: cf_screen_saa.c
-cf_screen_high_voltage.o: cf_screen_high_voltage.c
-cf_screen_burst.o: cf_screen_burst.c
-cf_set_user_gtis.o: cf_set_user_gtis.c 
-cf_set_photon_flags.o: cf_set_photon_flags.c
-cf_set_good_time_intervals.o: cf_set_good_time_intervals.c
-cf_modify_hist_pha.o: cf_modify_hist_pha.c
-cf_modify_hist_times.o: cf_modify_hist_times.c
-cf_screen_pulse_height.o: cf_screen_pulse_height.c
-cf_convert_to_ergs.o: cf_convert_to_ergs.c
-cf_extraction_limits.o: cf_extraction_limits.c
-cf_astigmatism.o: cf_astigmatism.c
-cf_dispersion.o: cf_dispersion.c
-cf_doppler_and_heliocentric.o: cf_doppler_and_heliocentric.c
-cf_apply_filters.o: cf_apply_filters.c
-cf_scale_bkgd.o: cf_scale_bkgd.c
-cf_make_mask.o: cf_make_mask.c
-cf_make_wave_array.o: cf_make_wave_array.c
-cf_rebin_background.o: cf_rebin_background.c
-cf_rebin_probability_array.o: cf_rebin_probability_array.c
-cf_standard_or_optimal_extraction.o: cf_standard_or_optimal_extraction.c
-cf_optimal_extraction.o: cf_optimal_extraction.c
-cf_write_extracted_spectrum.o: cf_write_extracted_spectrum.c
-
diff --git a/src/libcf/Makefile.MacOSX.orig b/src/libcf/Makefile.MacOSX.orig
deleted file mode 100644
index eade1ea..0000000
--- a/src/libcf/Makefile.MacOSX.orig
+++ /dev/null
@@ -1,152 +0,0 @@
-LIBRARY=	libcf
-
-CALFUSEDIR=	${PWD}/../..
-SHARED=		-dynamiclib
-FITSVER=	2.470
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-OPT=		-O3 -Wall -DCFORTRAN -Dg77Fortran -Df2cFortran
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-# FUSELIBS=	-lcfitsio-${FITSVER} -lsla
-FUSELIBS=	-lcfitsio -lsla
-LIBS=		-lc -lm -ldl -L/sw/lib/ -lgfortran
-
-# Symbols used for creating shared libraries
-
-SO=		.dylib
-
-OBJS=		calfits.o sgp4.o eclipse.o saa.o \
-		state_limb.o state_geod.o space_vel.o helio_vel.o \
-		geod_mag.o pole_ang.o solar_ang.o lsrd_vel.o lsrk_vel.o \
-		month_day.o read_tle.o cf_velang.o \
-		set_orbit_parms.o cf_error_msg.o \
-		cf_cal_file.o cf_proc_check.o cf_proc_update.o \
-		cf_timestamp.o cf_fuv_init.o cf_header_io.o \
-		cf_check_digitizer.o cf_nint.o \
-		cf_idf_io.o cf_ids_dead_time.o cf_electronics_dead_time.o \
-		cf_fifo_dead_time.o cf_apply_dead_time.o \
-		cf_thermal_distort.o cf_count_rate_y_distort.o cf_time_xy_distort.o \
-		cf_geometric_distort.o cf_pha_x_distort.o \
-		cf_active_region.o cf_find_spectra.o cf_identify_channel.o \
-		cf_calculate_ycent_motion.o cf_source_aper.o\
-		cf_grating_motion.o cf_fpa_position.o cf_read_fpa_pos.o \
-		cf_make_mask.o cf_mirror_motion.o \
-		cf_satellite_jitter.o cf_calculate_y_centroid.o \
-		cf_target_count_rate.o \
-		cf_screen_jitter.o cf_screen_limb_angle.o cf_screen_saa.o \
-		cf_screen_high_voltage.o cf_screen_burst.o cf_screen_airglow.o \
-		cf_screen_bad_pixels.o cf_set_user_gtis.o \
-		cf_set_photon_flags.o cf_set_good_time_intervals.o \
-		cf_modify_hist_times.o cf_screen_pulse_height.o \
-		cf_convert_to_ergs.o cf_extraction_limits.o \
-		cf_astigmatism.o cf_dispersion.o cf_doppler_and_heliocentric.o \
-		cf_apply_filters.o cf_scale_bkgd.o \
-		cf_make_wave_array.o cf_rebin_background.o \
-		cf_rebin_probability_array.o cf_optimal_extraction.o \
-		cf_write_extracted_spectrum.o cf_standard_or_optimal_extraction.o \
-		cf_init_support.o cf_modify_hist_pha.o \
-		cf_fes_proc_check.o cf_fes_proc_update.o
-
-all:		${OBJS}
-		${CC} ${SHARED} -o ${LIBRARY}${SO} ${OBJS} \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS}
-
-install:	all
-		chmod g+w ${OBJS} ${LIBRARY}${SO}
-		/bin/cp -p ${LIBRARY}${SO} ${CALFUSEDIR}/lib/${LIBRARY}${SO}
-
-clean: 
-	-	/bin/rm -f *.o ${LIBRARY}${SO} ${LIBRARY}${O}
-
-distclean: 
-	-	/bin/rm -f *.o ${LIBRARY}${SO} ${LIBRARY}${O}
-		cd ../../lib; /bin/rm -f ${LIBRARY}${SO}
-
-calfits.o: calfits.c
-sgp4.o: sgp4.c
-eclipse.o: eclipse.c
-set_orbit_parms.o: set_orbit_parms.c
-saa.o: saa.c
-state_limb.o: state_limb.c
-state_geod.o: state_geod.c
-space_vel.o: space_vel.c
-helio_vel.o: helio_vel.c
-geod_mag.o: geod_mag.c
-pole_ang.o: pole_ang.c
-solar_ang.o: solar_ang.c
-lsrd_vel.o: lsrd_vel.c
-lsrk_vel.o: lsrk_vel.c
-month_day.o: month_day.c
-read_tle.o: read_tle.c
-
-cf_error_msg.o: cf_error_msg.c
-cf_cal_file.o: cf_cal_file.c
-cf_fes_proc_check.o: cf_fes_proc_check.c
-cf_fes_proc_update.o: cf_fes_proc_update.c
-cf_proc_check.o: cf_proc_check.c
-cf_proc_update.o: cf_proc_update.c
-cf_fuv_init.o: cf_fuv_init.c
-cf_velang.o: cf_velang.c
-cf_timestamp.o: cf_timestamp.c
-
-cf_header_io.o: cf_header_io.c
-cf_check_digitizer.o: cf_check_digitizer.c
-cf_nint.o: cf_nint.c
-cf_idf_io.o: cf_idf_io.c
-cf_ids_dead_time.o: cf_ids_dead_time.c
-cf_electronics_dead_time.o: cf_electronics_dead_time.c
-cf_apply_dead_time.o: cf_apply_dead_time.c
-cf_fifo_dead_time.o: cf_fifo_dead_time.c
-cf_thermal_distort.o: cf_thermal_distort.c
-cf_count_rate_y_distort.o: cf_count_rate_y_distort.c
-cf_time_xy_distort.o : cf_time_xy_distort.c
-cf_geometric_distort: cf_geometric_distort.c
-cf_pha_x_distort.o: cf_pha_x_distort.c
-cf_active_region.o: cf_active_region.c
-cf_find_spectra.o: cf_find_spectra.c
-cf_identify_channel.o: cf_identify_channel.c
-cf_init_support.o: cf_init_support.c
-cf_target_count_rate.o: cf_target_count_rate.c
-cf_calculate_ycent_motion.o: cf_calculate_ycent_motion.c
-cf_source_aper.o: cf_source_aper.c
-cf_grating_motion.o: cf_grating_motion.c
-cf_fpa_position.o: cf_fpa_position.c
-cf_read_fpa_pos.o: cf_read_fpa_pos.c
-cf_make_mask.o: cf_make_mask.c
-cf_mirror_motion.o: cf_mirror_motion.c
-cf_satellite_jitter.o: cf_satellite_jitter.c
-cf_calculate_y_centroid.o: cf_calculate_y_centroid.c
-cf_screen_airglow.o: cf_screen_airglow.c
-cf_screen_bad_pixels.o: cf_screen_bad_pixels.c
-cf_screen_jitter.o: cf_screen_jitter.c
-cf_screen_limb_angle.o: cf_screen_limb_angle.c
-cf_screen_saa.o: cf_screen_saa.c
-cf_screen_high_voltage.o: cf_screen_high_voltage.c
-cf_screen_burst.o: cf_screen_burst.c
-cf_set_user_gtis.o: cf_set_user_gtis.c 
-cf_set_photon_flags.o: cf_set_photon_flags.c
-cf_set_good_time_intervals.o: cf_set_good_time_intervals.c
-cf_modify_hist_pha.o: cf_modify_hist_pha.c
-cf_modify_hist_times.o: cf_modify_hist_times.c
-cf_screen_pulse_height.o: cf_screen_pulse_height.c
-cf_convert_to_ergs.o: cf_convert_to_ergs.c
-cf_extraction_limits.o: cf_extraction_limits.c
-cf_astigmatism.o: cf_astigmatism.c
-cf_dispersion.o: cf_dispersion.c
-cf_doppler_and_heliocentric.o: cf_doppler_and_heliocentric.c
-cf_apply_filters.o: cf_apply_filters.c
-cf_scale_bkgd.o: cf_scale_bkgd.c
-cf_make_mask.o: cf_make_mask.c
-cf_make_wave_array.o: cf_make_wave_array.c
-cf_rebin_background.o: cf_rebin_background.c
-cf_rebin_probability_array.o: cf_rebin_probability_array.c
-cf_standard_or_optimal_extraction.o: cf_standard_or_optimal_extraction.c
-cf_optimal_extraction.o: cf_optimal_extraction.c
-cf_write_extracted_spectrum.o: cf_write_extracted_spectrum.c
-
diff --git a/src/libcf/Makefile.Solaris.orig b/src/libcf/Makefile.Solaris.orig
deleted file mode 100644
index f817dfe..0000000
--- a/src/libcf/Makefile.Solaris.orig
+++ /dev/null
@@ -1,152 +0,0 @@
-LIBRARY=	libcf
-
-CALFUSEDIR=	${PWD}/../..
-SHARED=		-G
-FITSVER=	2.470
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-# OPT=		-p -v -xO2 -xdepend -xchip=ultra -xarch=generic
-OPT=		-O -DCFORTRAN -KPIC
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-FUSELIBS=	-lcfitsio-${FITSVER} -lsla
-LIBS=		-lc -lm -lnsl -ldl -lsocket
-LDFLAGS=	
-
-# Symbols used for creating shared libraries
-
-SO=		.so
-
-OBJS=		calfits.o sgp4.o eclipse.o saa.o \
-		state_limb.o state_geod.o space_vel.o helio_vel.o \
-		geod_mag.o pole_ang.o solar_ang.o lsrd_vel.o lsrk_vel.o \
-		month_day.o read_tle.o cf_velang.o \
-		set_orbit_parms.o cf_error_msg.o \
-		cf_cal_file.o cf_proc_check.o cf_proc_update.o \
-		cf_timestamp.o cf_fuv_init.o cf_header_io.o \
-		cf_check_digitizer.o cf_nint.o \
-		cf_idf_io.o cf_ids_dead_time.o cf_electronics_dead_time.o \
-		cf_fifo_dead_time.o cf_apply_dead_time.o \
-		cf_thermal_distort.o cf_count_rate_y_distort.o cf_time_xy_distort.o \
-		cf_geometric_distort.o cf_pha_x_distort.o \
-		cf_active_region.o cf_find_spectra.o cf_identify_channel.o \
-		cf_calculate_ycent_motion.o cf_source_aper.o\
-		cf_grating_motion.o cf_fpa_position.o cf_read_fpa_pos.o \
-		cf_make_mask.o cf_mirror_motion.o \
-		cf_satellite_jitter.o cf_calculate_y_centroid.o \
-		cf_target_count_rate.o \
-		cf_screen_jitter.o cf_screen_limb_angle.o cf_screen_saa.o \
-		cf_screen_high_voltage.o cf_screen_burst.o cf_screen_airglow.o \
-		cf_screen_bad_pixels.o cf_set_user_gtis.o \
-		cf_set_photon_flags.o cf_set_good_time_intervals.o \
-		cf_modify_hist_times.o cf_screen_pulse_height.o \
-		cf_convert_to_ergs.o cf_extraction_limits.o \
-		cf_astigmatism.o cf_dispersion.o cf_doppler_and_heliocentric.o \
-		cf_apply_filters.o cf_scale_bkgd.o \
-		cf_make_wave_array.o cf_rebin_background.o \
-		cf_rebin_probability_array.o cf_optimal_extraction.o \
-		cf_write_extracted_spectrum.o cf_standard_or_optimal_extraction.o \
-		cf_init_support.o cf_modify_hist_pha.o \
-		cf_fes_proc_check.o cf_fes_proc_update.o
-
-all:		${OBJS}
-		${CC} ${SHARED} -o ${LIBRARY}${SO} ${OBJS} \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-install:	all
-		chmod g+w ${OBJS} ${LIBRARY}${SO}
-		/bin/cp -p ${LIBRARY}${SO} ${CALFUSEDIR}/lib/${LIBRARY}${SO}
-
-clean: 
-	-	/bin/rm -f *.o ${LIBRARY}${SO} ${LIBRARY}${O}
-
-distclean: 
-	-	/bin/rm -f *.o ${LIBRARY}${SO} ${LIBRARY}${O}
-		cd ../../lib; /bin/rm -f ${LIBRARY}${SO}
-
-calfits.o: calfits.c
-sgp4.o: sgp4.c
-eclipse.o: eclipse.c
-set_orbit_parms.o: set_orbit_parms.c
-saa.o: saa.c
-state_limb.o: state_limb.c
-state_geod.o: state_geod.c
-space_vel.o: space_vel.c
-helio_vel.o: helio_vel.c
-geod_mag.o: geod_mag.c
-pole_ang.o: pole_ang.c
-solar_ang.o: solar_ang.c
-lsrd_vel.o: lsrd_vel.c
-lsrk_vel.o: lsrk_vel.c
-month_day.o: month_day.c
-read_tle.o: read_tle.c
-
-cf_error_msg.o: cf_error_msg.c
-cf_cal_file.o: cf_cal_file.c
-cf_fes_proc_check.o: cf_fes_proc_check.c
-cf_fes_proc_update.o: cf_fes_proc_update.c
-cf_proc_check.o: cf_proc_check.c
-cf_proc_update.o: cf_proc_update.c
-cf_fuv_init.o: cf_fuv_init.c
-cf_velang.o: cf_velang.c
-cf_timestamp.o: cf_timestamp.c
-
-cf_header_io.o: cf_header_io.c
-cf_check_digitizer.o: cf_check_digitizer.c
-cf_nint.o: cf_nint.c
-cf_idf_io.o: cf_idf_io.c
-cf_ids_dead_time.o: cf_ids_dead_time.c
-cf_electronics_dead_time.o: cf_electronics_dead_time.c
-cf_apply_dead_time.o: cf_apply_dead_time.c
-cf_fifo_dead_time.o: cf_fifo_dead_time.c
-cf_thermal_distort.o: cf_thermal_distort.c
-cf_count_rate_y_distort.o: cf_count_rate_y_distort.c
-cf_time_xy_distort.o : cf_time_xy_distort.c
-cf_geometric_distort: cf_geometric_distort.c
-cf_pha_x_distort.o: cf_pha_x_distort.c
-cf_active_region.o: cf_active_region.c
-cf_find_spectra.o: cf_find_spectra.c
-cf_identify_channel.o: cf_identify_channel.c
-cf_init_support.o: cf_init_support.c
-cf_target_count_rate.o: cf_target_count_rate.c
-cf_calculate_ycent_motion.o: cf_calculate_ycent_motion.c
-cf_source_aper.o: cf_source_aper.c
-cf_grating_motion.o: cf_grating_motion.c
-cf_fpa_position.o: cf_fpa_position.c
-cf_read_fpa_pos.o: cf_read_fpa_pos.c
-cf_make_mask.o: cf_make_mask.c
-cf_mirror_motion.o: cf_mirror_motion.c
-cf_satellite_jitter.o: cf_satellite_jitter.c
-cf_calculate_y_centroid.o: cf_calculate_y_centroid.c
-cf_screen_airglow.o: cf_screen_airglow.c
-cf_screen_bad_pixels.o: cf_screen_bad_pixels.c
-cf_screen_jitter.o: cf_screen_jitter.c
-cf_screen_limb_angle.o: cf_screen_limb_angle.c
-cf_screen_saa.o: cf_screen_saa.c
-cf_screen_high_voltage.o: cf_screen_high_voltage.c
-cf_screen_burst.o: cf_screen_burst.c
-cf_set_user_gtis.o: cf_set_user_gtis.c 
-cf_set_photon_flags.o: cf_set_photon_flags.c
-cf_set_good_time_intervals.o: cf_set_good_time_intervals.c
-cf_modify_hist_pha.o: cf_modify_hist_pha.c
-cf_modify_hist_times.o: cf_modify_hist_times.c
-cf_screen_pulse_height.o: cf_screen_pulse_height.c
-cf_convert_to_ergs.o: cf_convert_to_ergs.c
-cf_extraction_limits.o: cf_extraction_limits.c
-cf_astigmatism.o: cf_astigmatism.c
-cf_dispersion.o: cf_dispersion.c
-cf_doppler_and_heliocentric.o: cf_doppler_and_heliocentric.c
-cf_apply_filters.o: cf_apply_filters.c
-cf_scale_bkgd.o: cf_scale_bkgd.c
-cf_make_mask.o: cf_make_mask.c
-cf_make_wave_array.o: cf_make_wave_array.c
-cf_rebin_background.o: cf_rebin_background.c
-cf_rebin_probability_array.o: cf_rebin_probability_array.c
-cf_standard_or_optimal_extraction.o: cf_standard_or_optimal_extraction.c
-cf_optimal_extraction.o: cf_optimal_extraction.c
-cf_write_extracted_spectrum.o: cf_write_extracted_spectrum.c
diff --git a/src/libcf/Makefile.orig.orig b/src/libcf/Makefile.orig.orig
deleted file mode 100644
index f817dfe..0000000
--- a/src/libcf/Makefile.orig.orig
+++ /dev/null
@@ -1,152 +0,0 @@
-LIBRARY=	libcf
-
-CALFUSEDIR=	${PWD}/../..
-SHARED=		-G
-FITSVER=	2.470
-
-# Symbols for include directories
-FUSEINCLDIR=	-I${CALFUSEDIR}/include
-
-# Symbols used for compiling
-CC=		cc
-# OPT=		-p -v -xO2 -xdepend -xchip=ultra -xarch=generic
-OPT=		-O -DCFORTRAN -KPIC
-CFLAGS=		${OPT} ${FUSEINCLDIR}
-
-FUSELIBDIR=	-L${CALFUSEDIR}/lib
-FUSELIBS=	-lcfitsio-${FITSVER} -lsla
-LIBS=		-lc -lm -lnsl -ldl -lsocket
-LDFLAGS=	
-
-# Symbols used for creating shared libraries
-
-SO=		.so
-
-OBJS=		calfits.o sgp4.o eclipse.o saa.o \
-		state_limb.o state_geod.o space_vel.o helio_vel.o \
-		geod_mag.o pole_ang.o solar_ang.o lsrd_vel.o lsrk_vel.o \
-		month_day.o read_tle.o cf_velang.o \
-		set_orbit_parms.o cf_error_msg.o \
-		cf_cal_file.o cf_proc_check.o cf_proc_update.o \
-		cf_timestamp.o cf_fuv_init.o cf_header_io.o \
-		cf_check_digitizer.o cf_nint.o \
-		cf_idf_io.o cf_ids_dead_time.o cf_electronics_dead_time.o \
-		cf_fifo_dead_time.o cf_apply_dead_time.o \
-		cf_thermal_distort.o cf_count_rate_y_distort.o cf_time_xy_distort.o \
-		cf_geometric_distort.o cf_pha_x_distort.o \
-		cf_active_region.o cf_find_spectra.o cf_identify_channel.o \
-		cf_calculate_ycent_motion.o cf_source_aper.o\
-		cf_grating_motion.o cf_fpa_position.o cf_read_fpa_pos.o \
-		cf_make_mask.o cf_mirror_motion.o \
-		cf_satellite_jitter.o cf_calculate_y_centroid.o \
-		cf_target_count_rate.o \
-		cf_screen_jitter.o cf_screen_limb_angle.o cf_screen_saa.o \
-		cf_screen_high_voltage.o cf_screen_burst.o cf_screen_airglow.o \
-		cf_screen_bad_pixels.o cf_set_user_gtis.o \
-		cf_set_photon_flags.o cf_set_good_time_intervals.o \
-		cf_modify_hist_times.o cf_screen_pulse_height.o \
-		cf_convert_to_ergs.o cf_extraction_limits.o \
-		cf_astigmatism.o cf_dispersion.o cf_doppler_and_heliocentric.o \
-		cf_apply_filters.o cf_scale_bkgd.o \
-		cf_make_wave_array.o cf_rebin_background.o \
-		cf_rebin_probability_array.o cf_optimal_extraction.o \
-		cf_write_extracted_spectrum.o cf_standard_or_optimal_extraction.o \
-		cf_init_support.o cf_modify_hist_pha.o \
-		cf_fes_proc_check.o cf_fes_proc_update.o
-
-all:		${OBJS}
-		${CC} ${SHARED} -o ${LIBRARY}${SO} ${OBJS} \
-		${FUSELIBDIR} ${FUSELIBS} ${LIBS} ${LDFLAGS}
-
-install:	all
-		chmod g+w ${OBJS} ${LIBRARY}${SO}
-		/bin/cp -p ${LIBRARY}${SO} ${CALFUSEDIR}/lib/${LIBRARY}${SO}
-
-clean: 
-	-	/bin/rm -f *.o ${LIBRARY}${SO} ${LIBRARY}${O}
-
-distclean: 
-	-	/bin/rm -f *.o ${LIBRARY}${SO} ${LIBRARY}${O}
-		cd ../../lib; /bin/rm -f ${LIBRARY}${SO}
-
-calfits.o: calfits.c
-sgp4.o: sgp4.c
-eclipse.o: eclipse.c
-set_orbit_parms.o: set_orbit_parms.c
-saa.o: saa.c
-state_limb.o: state_limb.c
-state_geod.o: state_geod.c
-space_vel.o: space_vel.c
-helio_vel.o: helio_vel.c
-geod_mag.o: geod_mag.c
-pole_ang.o: pole_ang.c
-solar_ang.o: solar_ang.c
-lsrd_vel.o: lsrd_vel.c
-lsrk_vel.o: lsrk_vel.c
-month_day.o: month_day.c
-read_tle.o: read_tle.c
-
-cf_error_msg.o: cf_error_msg.c
-cf_cal_file.o: cf_cal_file.c
-cf_fes_proc_check.o: cf_fes_proc_check.c
-cf_fes_proc_update.o: cf_fes_proc_update.c
-cf_proc_check.o: cf_proc_check.c
-cf_proc_update.o: cf_proc_update.c
-cf_fuv_init.o: cf_fuv_init.c
-cf_velang.o: cf_velang.c
-cf_timestamp.o: cf_timestamp.c
-
-cf_header_io.o: cf_header_io.c
-cf_check_digitizer.o: cf_check_digitizer.c
-cf_nint.o: cf_nint.c
-cf_idf_io.o: cf_idf_io.c
-cf_ids_dead_time.o: cf_ids_dead_time.c
-cf_electronics_dead_time.o: cf_electronics_dead_time.c
-cf_apply_dead_time.o: cf_apply_dead_time.c
-cf_fifo_dead_time.o: cf_fifo_dead_time.c
-cf_thermal_distort.o: cf_thermal_distort.c
-cf_count_rate_y_distort.o: cf_count_rate_y_distort.c
-cf_time_xy_distort.o : cf_time_xy_distort.c
-cf_geometric_distort: cf_geometric_distort.c
-cf_pha_x_distort.o: cf_pha_x_distort.c
-cf_active_region.o: cf_active_region.c
-cf_find_spectra.o: cf_find_spectra.c
-cf_identify_channel.o: cf_identify_channel.c
-cf_init_support.o: cf_init_support.c
-cf_target_count_rate.o: cf_target_count_rate.c
-cf_calculate_ycent_motion.o: cf_calculate_ycent_motion.c
-cf_source_aper.o: cf_source_aper.c
-cf_grating_motion.o: cf_grating_motion.c
-cf_fpa_position.o: cf_fpa_position.c
-cf_read_fpa_pos.o: cf_read_fpa_pos.c
-cf_make_mask.o: cf_make_mask.c
-cf_mirror_motion.o: cf_mirror_motion.c
-cf_satellite_jitter.o: cf_satellite_jitter.c
-cf_calculate_y_centroid.o: cf_calculate_y_centroid.c
-cf_screen_airglow.o: cf_screen_airglow.c
-cf_screen_bad_pixels.o: cf_screen_bad_pixels.c
-cf_screen_jitter.o: cf_screen_jitter.c
-cf_screen_limb_angle.o: cf_screen_limb_angle.c
-cf_screen_saa.o: cf_screen_saa.c
-cf_screen_high_voltage.o: cf_screen_high_voltage.c
-cf_screen_burst.o: cf_screen_burst.c
-cf_set_user_gtis.o: cf_set_user_gtis.c 
-cf_set_photon_flags.o: cf_set_photon_flags.c
-cf_set_good_time_intervals.o: cf_set_good_time_intervals.c
-cf_modify_hist_pha.o: cf_modify_hist_pha.c
-cf_modify_hist_times.o: cf_modify_hist_times.c
-cf_screen_pulse_height.o: cf_screen_pulse_height.c
-cf_convert_to_ergs.o: cf_convert_to_ergs.c
-cf_extraction_limits.o: cf_extraction_limits.c
-cf_astigmatism.o: cf_astigmatism.c
-cf_dispersion.o: cf_dispersion.c
-cf_doppler_and_heliocentric.o: cf_doppler_and_heliocentric.c
-cf_apply_filters.o: cf_apply_filters.c
-cf_scale_bkgd.o: cf_scale_bkgd.c
-cf_make_mask.o: cf_make_mask.c
-cf_make_wave_array.o: cf_make_wave_array.c
-cf_rebin_background.o: cf_rebin_background.c
-cf_rebin_probability_array.o: cf_rebin_probability_array.c
-cf_standard_or_optimal_extraction.o: cf_standard_or_optimal_extraction.c
-cf_optimal_extraction.o: cf_optimal_extraction.c
-cf_write_extracted_spectrum.o: cf_write_extracted_spectrum.c