Index: trunk/Ohana/src/libohana/Makefile
===================================================================
--- trunk/Ohana/src/libohana/Makefile	(revision 5228)
+++ trunk/Ohana/src/libohana/Makefile	(revision 5237)
@@ -22,13 +22,10 @@
 libohana: $(LIB)/libohana.$(ARCH).a 
 
-INC1 = \
+INCS = \
 $(DESTINC)/Xohana.h  \
 $(DESTINC)/ohana_allocate.h \
 $(DESTINC)/ohana.h
 
-INC2 = \
-$(DESTINC)/dvo.h
-
-OBJ1 = \
+OBJS = \
 $(SRC)/ohana_allocate.$(ARCH).o  \
 $(SRC)/string.$(ARCH).o		 \
@@ -37,59 +34,8 @@
 $(SRC)/time.$(ARCH).o		 \
 $(SRC)/config.$(ARCH).o		 \
+$(SRC)/Fread.$(ARCH).o		 \
 $(SRC)/version.$(ARCH).o
 
-OBJ2 = \
-$(SRC)/Fread.$(ARCH).o		 \
-$(SRC)/coordops.$(ARCH).o	 \
-$(SRC)/LoadPhotcodes.$(ARCH).o   \
-$(SRC)/imreg_datatypes.$(ARCH).o \
-$(SRC)/mosaic_astrom.$(ARCH).o   \
-$(SRC)/fits_db.$(ARCH).o	 \
-$(SRC)/photfits.$(ARCH).o        \
-$(SRC)/dvo_image.$(ARCH).o       \
-$(SRC)/dvo_image_raw.$(ARCH).o   \
-$(SRC)/dvo_catalog.$(ARCH).o     \
-$(SRC)/dvo_catalog_raw.$(ARCH).o       \
-$(SRC)/dvo_catalog_mef.$(ARCH).o       \
-$(SRC)/dvo_catalog_split.$(ARCH).o     \
-$(SRC)/dvo_convert.$(ARCH).o           \
-$(SRC)/dvo_convert_elixir.$(ARCH).o    \
-$(SRC)/dvo_convert_loneos.$(ARCH).o    \
-$(SRC)/dvo_convert_panstarrs.$(ARCH).o
-
-AOBJ = \
-$(ASRC)/coords.$(ARCH).o \
-$(ASRC)/average.$(ARCH).o \
-$(ASRC)/average-loneos.$(ARCH).o \
-$(ASRC)/average-elixir.$(ARCH).o \
-$(ASRC)/average-panstarrs.$(ARCH).o \
-$(ASRC)/secfilt.$(ARCH).o \
-$(ASRC)/secfilt-loneos.$(ARCH).o \
-$(ASRC)/secfilt-elixir.$(ARCH).o \
-$(ASRC)/secfilt-panstarrs.$(ARCH).o \
-$(ASRC)/measure.$(ARCH).o \
-$(ASRC)/measure-loneos.$(ARCH).o \
-$(ASRC)/measure-elixir.$(ARCH).o \
-$(ASRC)/measure-panstarrs.$(ARCH).o \
-$(ASRC)/missing.$(ARCH).o \
-$(ASRC)/photcode.$(ARCH).o \
-$(ASRC)/image.$(ARCH).o \
-$(ASRC)/image-loneos.$(ARCH).o \
-$(ASRC)/image-elixir.$(ARCH).o \
-$(ASRC)/image-panstarrs.$(ARCH).o \
-$(ASRC)/regimage.$(ARCH).o \
-$(ASRC)/detreg.$(ARCH).o \
-$(ASRC)/photreg.$(ARCH).o \
-$(ASRC)/photreg-old.$(ARCH).o \
-$(ASRC)/smpdata.$(ARCH).o \
-$(ASRC)/spectrum.$(ARCH).o \
-$(ASRC)/spectrum-ascii.$(ARCH).o
-
-ACOM = $(ADEF)/autocode.c $(ADEF)/autocode.h $(ADEF)/common.h
-
-$(OBJ1): $(INC1)
-$(OBJ2): $(INC2)
-$(AOBJ): $(ASRC)/%.$(ARCH).o : $(ADEF)/%.d $(ACOM)
-	cd $(AUTO) && make install
+$(OBJS): $(INCS)
 
 $(DESTLIB)/libohana.a: $(LIB)/libohana.$(ARCH).a
@@ -98,8 +44,8 @@
 	cp $(LIB)/libohana.$(ARCH).a $(DESTLIB)/libohana.a
 
-$(LIB)/libohana.$(ARCH).a: $(OBJ1) $(AOBJ) $(OBJ2)
+$(LIB)/libohana.$(ARCH).a: $(OBJS)
 	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
 	rm -f $(LIB)/libohana.$(ARCH).a
-	ar rcv $(LIB)/libohana.$(ARCH).a $(OBJ1) $(AOBJ) $(OBJ2)
+	ar rcv $(LIB)/libohana.$(ARCH).a $(OBJS)
 	$(RANLIB) $(LIB)/libohana.$(ARCH).a
 
@@ -114,5 +60,4 @@
 	rm -f */*.o
 	rm -f */*.a
-	cd $(AUTO) && make clean
 
 dist: clean