Index: /trunk/Ohana/src/imregister/Makefile
===================================================================
--- /trunk/Ohana/src/imregister/Makefile	(revision 3515)
+++ /trunk/Ohana/src/imregister/Makefile	(revision 3516)
@@ -112,4 +112,5 @@
 $(BASEDIR)/get_fwhm.$(ARCH).o     \
 $(BASEDIR)/misc.$(ARCH).o         \
+$(BASEDIR)/version.$(ARCH).o      \
 $(BASEDIR)/parse_time.$(ARCH).o   \
 $(BASEDIR)/sort.$(ARCH).o
@@ -117,11 +118,11 @@
 all: $(INSTALL) $(DEVEL)
 
-IR = $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)  $(BASEOBJ)
-IS = $(IMREG)/args.imsearch.$(ARCH).o      $(IMOBJ)  $(BASEOBJ)
-DR = $(DETREND)/args.detregister.$(ARCH).o $(DETOBJ) $(BASEOBJ)
-DS = $(DETREND)/args.detsearch.$(ARCH).o   $(DETOBJ) $(BASEOBJ)
+IR = $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+IS = $(IMREG)/args.imsearch.$(ARCH).o      $(IMOBJ)   $(BASEOBJ)
+DR = $(DETREND)/args.detregister.$(ARCH).o $(DETOBJ)  $(BASEOBJ)
+DS = $(DETREND)/args.detsearch.$(ARCH).o   $(DETOBJ)  $(BASEOBJ)
 PS = $(PHOTREG)/args.photsearch.$(ARCH).o  $(PHOTOBJ) $(BASEOBJ)
 PR = $(PHOTREG)/args.photreg.$(ARCH).o     $(PHOTOBJ) $(BASEOBJ)
-SR = $(SPREG)/args.spregister.$(ARCH).o    $(SPOBJ)  
+SR = $(SPREG)/args.spregister.$(ARCH).o    $(SPOBJ)   
 SS = $(SPREG)/args.spsearch.$(ARCH).o      $(SPOBJ)  
 
Index: /trunk/Ohana/src/libohana/Makefile
===================================================================
--- /trunk/Ohana/src/libohana/Makefile	(revision 3515)
+++ /trunk/Ohana/src/libohana/Makefile	(revision 3516)
@@ -1,10 +1,11 @@
 include ../../Configure
-HOME 	=	.
 
+HOME 	=	$(ROOT)/src/libohana
+AUTO	=	$(ROOT)/src/libautocode
+ASRC	=	$(AUTO)/src
 LIB	= 	$(HOME)/lib
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
 INC	=	$(HOME)/include
-DVO	=	$(HOME)/dvo/src
 DESTBIN	=	$(LBIN)
 DESTLIB	=	$(LLIB)
@@ -45,18 +46,20 @@
 $(SRC)/fits_db.$(ARCH).o	 
 
-DOBJ = \
-$(DVO)/spectrum.$(ARCH).o \
-$(DVO)/spectrum-ascii.$(ARCH).o
+AOBJ = \
+$(ASRC)/spectrum.$(ARCH).o \
+$(ASRC)/spectrum-ascii.$(ARCH).o
+
+autocode:
+	cd $(AUTO) && make install
 
 $(DESTLIB)/libohana.a: $(LIB)/libohana.$(ARCH).a
 	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
 	rm -f $(DESTLIB)/libohana.a
-	cp $(LIB)/libohana.$(ARCH).a 	$(DESTLIB)/libohana.a
+	cp $(LIB)/libohana.$(ARCH).a $(DESTLIB)/libohana.a
 
-$(LIB)/libohana.$(ARCH).a: $(HOBJ) $(LOBJ)
-	cd dvo && make install
+$(LIB)/libohana.$(ARCH).a: autocode $(HOBJ) $(LOBJ)
 	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
 	rm -f $(LIB)/libohana.$(ARCH).a
-	ar rcv $(LIB)/libohana.$(ARCH).a $(LOBJ) $(DOBJ)
+	ar rcv $(LIB)/libohana.$(ARCH).a $(LOBJ) $(AOBJ)
 	$(RANLIB) $(LIB)/libohana.$(ARCH).a
 
@@ -73,5 +76,5 @@
 	rm -f */*.o
 	rm -f */*.a
-	cd dvo && make clean
+#	cd $(AUTO) && make clean
 
 dist: clean
Index: /trunk/Ohana/src/libohana/include/dvo.h
===================================================================
--- /trunk/Ohana/src/libohana/include/dvo.h	(revision 3515)
+++ /trunk/Ohana/src/libohana/include/dvo.h	(revision 3516)
@@ -141,5 +141,5 @@
 # endif
 
-# include <dvo-autocode.h>
+# include <autocode.h>
 
 /* these functions refer to the DVO structures define in the includes above */