Index: /trunk/Ohana/src/delstar/Makefile
===================================================================
--- /trunk/Ohana/src/delstar/Makefile	(revision 5241)
+++ /trunk/Ohana/src/delstar/Makefile	(revision 5242)
@@ -16,5 +16,5 @@
 #  
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lohana -lFITS -lm 
+LIBS	= 	-L$(LLIB) -ldvo -lFITS -lohana -lm 
 CFLAGS	=	-o $*.$(ARCH).o $(INCS) -O2
 CCFLAGS	=	$(INCS) $(LIBS) 
Index: /trunk/Ohana/src/elixir/include/controller.h
===================================================================
--- /trunk/Ohana/src/elixir/include/controller.h	(revision 5241)
+++ /trunk/Ohana/src/elixir/include/controller.h	(revision 5242)
@@ -1,3 +1,4 @@
 # include <ohana.h>
+# include <fitsio.h>
 # include <signal.h>
 # include <errno.h>
Index: /trunk/Ohana/src/gastro/Makefile
===================================================================
--- /trunk/Ohana/src/gastro/Makefile	(revision 5241)
+++ /trunk/Ohana/src/gastro/Makefile	(revision 5242)
@@ -17,5 +17,5 @@
 #  
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lohana -lFITS -lm -lsocket -lnsl 
+LIBS	= 	-L$(LLIB) -ldvo -lFITS -lohana -lm -lsocket -lnsl 
 CFLAGS	=	$(INCS)
 LFLAGS	=	$(LIBS) 
Index: /trunk/Ohana/src/gastro2/Makefile
===================================================================
--- /trunk/Ohana/src/gastro2/Makefile	(revision 5241)
+++ /trunk/Ohana/src/gastro2/Makefile	(revision 5242)
@@ -14,5 +14,5 @@
 #  
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lohana -lFITS -lsocket -lnsl -lm 
+LIBS	= 	-L$(LLIB) -ldvo -lFITS -lohana -lsocket -lnsl -lm 
 CFLAGS	=	-o $*.$(ARCH).o $(INCS)
 CCFLAGS	=	$(INCS) $(LIBS) 
Index: /trunk/Ohana/src/getstar/Makefile
===================================================================
--- /trunk/Ohana/src/getstar/Makefile	(revision 5241)
+++ /trunk/Ohana/src/getstar/Makefile	(revision 5242)
@@ -14,5 +14,5 @@
 #  
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lFITS -lohana -lm 
+LIBS	= 	-L$(LLIB) -ldvo -lFITS -lohana -lm 
 CFLAGS	=	-o $*.$(ARCH).o $(INCS)
 CCFLAGS	=	$(INCS) $(LIBS) 
Index: /trunk/Ohana/src/gophot/include/gophot.h
===================================================================
--- /trunk/Ohana/src/gophot/include/gophot.h	(revision 5241)
+++ /trunk/Ohana/src/gophot/include/gophot.h	(revision 5242)
@@ -2,4 +2,5 @@
 
 # include <ohana.h>
+# include <fitsio.h>
 
 typedef char bool;
Index: /trunk/Ohana/src/imclean/Makefile
===================================================================
--- /trunk/Ohana/src/imclean/Makefile	(revision 5241)
+++ /trunk/Ohana/src/imclean/Makefile	(revision 5242)
@@ -14,5 +14,5 @@
 #  
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lohana -lFITS -lm 
+LIBS	= 	-L$(LLIB) -ldvo -lFITS -lohana -lm 
 CFLAGS	=	-o $*.$(ARCH).o $(INCS)
 CCFLAGS	=	$(INCS) $(LIBS) 
Index: /trunk/Ohana/src/imregister/Makefile
===================================================================
--- /trunk/Ohana/src/imregister/Makefile	(revision 5241)
+++ /trunk/Ohana/src/imregister/Makefile	(revision 5242)
@@ -21,5 +21,5 @@
 
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lohana -lFITS -lm 
+LIBS	= 	-L$(LLIB) -ldvo -lFITS -lohana -lm 
 CFLAGS	=	$(INCS)
 LFLAGS	=	$(LIBS)
Index: /trunk/Ohana/src/imregister/src/imphotmerge.c
===================================================================
--- /trunk/Ohana/src/imregister/src/imphotmerge.c	(revision 5241)
+++ /trunk/Ohana/src/imregister/src/imphotmerge.c	(revision 5242)
@@ -1,8 +1,8 @@
 # include "imregister.h"
 
-/*** this needs to be written using dvo_image functions ***/
+/*** this needs to be written using dvo_image functions !!! ***/
 
 Image *LoadImageTable (FILE *f, Header *header, int *nimage);
-static char *version = "imphotcopy $Revision: 1.3 $";
+static char *version = "imphotcopy $Revision: 1.4 $";
 
 int main (int argc, char **argv) {
Index: /trunk/Ohana/src/kapa/include/Ximage.h
===================================================================
--- /trunk/Ohana/src/kapa/include/Ximage.h	(revision 5241)
+++ /trunk/Ohana/src/kapa/include/Ximage.h	(revision 5242)
@@ -1,3 +1,4 @@
 # include <Xohana.h>
+# include <fitsio.h>
 # include "constants.h"
 # include "structures.h"
Index: /trunk/Ohana/src/kii/Makefile
===================================================================
--- /trunk/Ohana/src/kii/Makefile	(revision 5241)
+++ /trunk/Ohana/src/kii/Makefile	(revision 5242)
@@ -21,5 +21,5 @@
 #
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) $(XLIB) -lohana -lFITS -ljpeg -lX11 -lsocket -lnsl -lm
+LIBS	= 	-L$(LLIB) $(XLIB) -ldvo -lFITS -lohana -ljpeg -lX11 -lsocket -lnsl -lm
 # LIBS	= 	-L$(LLIB) $(XLIB) -lohana -lFITS -ljpeg -lX11 -lsocket -lnsl -lm -static
 CFLAGS  =	-o $*.$(ARCH).o $(INCS) 
Index: /trunk/Ohana/src/libautocode/def/common.h
===================================================================
--- /trunk/Ohana/src/libautocode/def/common.h	(revision 5241)
+++ /trunk/Ohana/src/libautocode/def/common.h	(revision 5242)
@@ -1,3 +1,4 @@
 # include <ohana.h>
+# include <fitsio.h>
 
 # ifndef AUTOCODE_H
Index: /trunk/Ohana/src/lightcurve/Makefile
===================================================================
--- /trunk/Ohana/src/lightcurve/Makefile	(revision 5241)
+++ /trunk/Ohana/src/lightcurve/Makefile	(revision 5242)
@@ -16,5 +16,5 @@
 #  
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lohana -lFITS -lm 
+LIBS	= 	-L$(LLIB) -ldvo -lFITS -lohana -lm 
 CFLAGS	=	-o $*.o $(INCS) 
 CCFLAGS	=	$(INCS) $(LIBS) 
Index: /trunk/Ohana/src/markrock/Makefile
===================================================================
--- /trunk/Ohana/src/markrock/Makefile	(revision 5241)
+++ /trunk/Ohana/src/markrock/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 #  
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lohana -lFITS -lm 
+LIBS	= 	-L$(LLIB) -ldvo -lFITS -lohana -lm 
 CFLAGS	=	-o $*.$(ARCH).o $(INCS)
 CCFLAGS	=	$(INCS) $(LIBS) 
Index: /trunk/Ohana/src/markstar/Makefile
===================================================================
--- /trunk/Ohana/src/markstar/Makefile	(revision 5241)
+++ /trunk/Ohana/src/markstar/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 #  
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lFITS -lohana -lm 
+LIBS	= 	-L$(LLIB) -ldvo -lFITS -lohana -lm 
 CFLAGS	=	-o $*.$(ARCH).o $(INCS)
 CCFLAGS	=	$(INCS) $(LIBS) 
Index: /trunk/Ohana/src/misc/doc/Changes.log
===================================================================
--- /trunk/Ohana/src/misc/doc/Changes.log	(revision 5241)
+++ /trunk/Ohana/src/misc/doc/Changes.log	(revision 5242)
@@ -1,2 +1,15 @@
+
+2005.10.07
+
+	I was having some memory collision problems, and attempting to
+	use the ohana_allocate functions reminded me that the libFITS
+	functions were not supported under ohana_allocate.  This was
+	unhelpful.  I bit the bullet and split libohana into libohana
+	(base functions only, including ohana_allocate) and libdvo
+	(functions based on the libautocode structures).  Doing this
+	allowed me to make libFITS depend on libohana (including
+	ohana_allocate).  BUT, this forced me to change all LDFLAGS
+	entries in ohana to swap -lohana -lFITS for -lFITS -lohana,
+	and to add include <fitsio.h> in some cases.
 
 misc-1-1:
Index: /trunk/Ohana/src/mosastro/Makefile
===================================================================
--- /trunk/Ohana/src/mosastro/Makefile	(revision 5241)
+++ /trunk/Ohana/src/mosastro/Makefile	(revision 5242)
@@ -17,5 +17,5 @@
 #
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lohana -lFITS -lm 
+LIBS	= 	-L$(LLIB) -ldvo -lFITS -lohana -lm 
 CFLAGS	=	$(INCS)
 LFLAGS	=	$(LIBS)
Index: /trunk/Ohana/src/opihi/cmd.astro/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/cmd.astro/Makefile	(revision 5241)
+++ /trunk/Ohana/src/opihi/cmd.astro/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
+LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lFITS -lohana -lm
 CFLAGS  =       $(INCS)
 CCFLAGS =       $(LIBS) 
Index: /trunk/Ohana/src/opihi/cmd.basic/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/cmd.basic/Makefile	(revision 5241)
+++ /trunk/Ohana/src/opihi/cmd.basic/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
+LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lFITS -lohana -lm
 CFLAGS  =       $(INCS)
 CCFLAGS =       $(LIBS) 
Index: /trunk/Ohana/src/opihi/cmd.data/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 5241)
+++ /trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
+LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lFITS -lohana -lm
 CFLAGS  =       $(INCS)
 CCFLAGS =       $(LIBS) 
Index: /trunk/Ohana/src/opihi/dimm/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/dimm/Makefile	(revision 5241)
+++ /trunk/Ohana/src/opihi/dimm/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
+LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -ldvo -lFITS -lohana -lm
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata -lsbig
 LIBS    =       $(LIBS2) $(LIBS1) 
Index: /trunk/Ohana/src/opihi/dvo/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/dvo/Makefile	(revision 5241)
+++ /trunk/Ohana/src/opihi/dvo/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
+LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -ldvo -lFITS -lohana -lm
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
 LIBS    =       $(LIBS2) $(LIBS1) 
Index: /trunk/Ohana/src/opihi/dvo2/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/dvo2/Makefile	(revision 5241)
+++ /trunk/Ohana/src/opihi/dvo2/Makefile	(revision 5242)
@@ -17,5 +17,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
+LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lFITS -lohana -lm
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
 LIBS    =       $(LIBS2) $(LIBS1) 
Index: /trunk/Ohana/src/opihi/lib.data/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/lib.data/Makefile	(revision 5241)
+++ /trunk/Ohana/src/opihi/lib.data/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
+LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lFITS -lohana -lm
 CFLAGS  =       $(INCS)
 CCFLAGS =       $(LIBS) 
Index: /trunk/Ohana/src/opihi/lib.shell/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/lib.shell/Makefile	(revision 5241)
+++ /trunk/Ohana/src/opihi/lib.shell/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
+LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lFITS -lohana -lm
 CFLAGS  =       $(INCS)
 CCFLAGS =       $(LIBS) 
Index: /trunk/Ohana/src/opihi/mana/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/mana/Makefile	(revision 5241)
+++ /trunk/Ohana/src/opihi/mana/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
+LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -ldvo -lFITS -lohana -lm
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
 LIBS    =       $(LIBS2) $(LIBS1) 
Index: /trunk/Ohana/src/opihi/pantasks/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pantasks/Makefile	(revision 5241)
+++ /trunk/Ohana/src/opihi/pantasks/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
+LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -ldvo -lFITS -lohana -lm
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
 LIBS    =       $(LIBS2) $(LIBS1) 
Index: /trunk/Ohana/src/opihi/pclient/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pclient/Makefile	(revision 5241)
+++ /trunk/Ohana/src/opihi/pclient/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
+LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lFITS -lohana -lm
 LIBS2   =       -lbasiccmd -lshell -ldata
 LIBS    =       $(LIBS2) $(LIBS1) 
Index: /trunk/Ohana/src/opihi/pcontrol/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 5241)
+++ /trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lohana -lFITS -lm
+LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lFITS -lohana -lm
 LIBS2   =       -lbasiccmd -lshell -ldata
 LIBS    =       $(LIBS2) $(LIBS1) 
Index: /trunk/Ohana/src/photdbc/Makefile
===================================================================
--- /trunk/Ohana/src/photdbc/Makefile	(revision 5241)
+++ /trunk/Ohana/src/photdbc/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 #
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lohana -lFITS -lm 
+LIBS	= 	-L$(LLIB) -ldvo -lFITS -lohana -lm 
 CFLAGS	=	-o $*.$(ARCH).o $(INCS)
 CCFLAGS	=	$(INCS) $(LIBS) 
Index: /trunk/Ohana/src/relphot/Makefile
===================================================================
--- /trunk/Ohana/src/relphot/Makefile	(revision 5241)
+++ /trunk/Ohana/src/relphot/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 #
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lsocket -lnsl -lohana -lFITS -lm 
+LIBS	= 	-L$(LLIB) -lsocket -lnsl -ldvo -lFITS -lohana -lm 
 CFLAGS	=	-o $*.$(ARCH).o $(INCS)
 CCFLAGS	=	$(INCS) $(LIBS) 
Index: /trunk/Ohana/src/uniphot/Makefile
===================================================================
--- /trunk/Ohana/src/uniphot/Makefile	(revision 5241)
+++ /trunk/Ohana/src/uniphot/Makefile	(revision 5242)
@@ -15,5 +15,5 @@
 #
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lohana -lFITS -lm 
+LIBS	= 	-L$(LLIB) -ldvo -lFITS -lohana -lm 
 CFLAGS	=	-o $*.$(ARCH).o $(INCS) -Wall
 CCFLAGS	=	$(INCS) $(LIBS) -Wall
Index: /trunk/Ohana/src/uniphot/src/wimages.c
===================================================================
--- /trunk/Ohana/src/uniphot/src/wimages.c	(revision 5241)
+++ /trunk/Ohana/src/uniphot/src/wimages.c	(revision 5242)
@@ -1,3 +1,5 @@
 # include "uniphot.h"
+
+/***** this needs to be changed to use the dvo autocode structures !!! */
 
 void wimages (Image *image, int Nimage) {