Index: trunk/Ohana/src/libdvo/Makefile
===================================================================
--- trunk/Ohana/src/libdvo/Makefile	(revision 10305)
+++ trunk/Ohana/src/libdvo/Makefile	(revision 10315)
@@ -1,24 +1,21 @@
+default: install
+help:
+	@echo "make options: install libdvo clean dist"
+
 include ../../Configure
-
 HOME 	=	$(ROOT)/src/libdvo
 AUTO	=	$(ROOT)/src/libautocode
-ASRC	=	$(AUTO)/src
-ADEF	=	$(AUTO)/def
 LIB	= 	$(HOME)/lib
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
 INC	=	$(HOME)/include
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
-
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
+ASRC	=	$(AUTO)/src
+AINC	=	$(AUTO)/include
+ADEF	=	$(AUTO)/def
+include ../../Makefile.Common
 
 default: install
-
-install: $(DESTLIB)/libdvo.a
-
-libdvo: $(LIB)/libdvo.$(ARCH).a
+install: $(DESTLIB)/libdvo.a $(DESTLIB)/libdvo.so
+libdvo: $(LIB)/libdvo.$(ARCH).a $(LIB)/libdvo.$(ARCH).so
 
 INCS = $(DESTINC)/dvo.h $(DESTINC)/autocode.h
@@ -48,87 +45,27 @@
 $(SRC)/skyregion_ops.$(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)/average-pmtest.$(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 \
-$(ASRC)/Stars.$(ARCH).o \
-$(ASRC)/GSCRegion.$(ARCH).o \
-$(ASRC)/AddstarClientOptions.$(ARCH).o \
-$(ASRC)/SkyRegion.$(ARCH).o
+include ../libautocode/Makefile.Targets
 
-ACOM = $(ADEF)/autocode.c $(ADEF)/autocode.h $(ADEF)/common.h
+$(LIB)/libdvo.$(ARCH).a: $(AOBJS) $(OBJS)
+$(LIB)/libdvo.$(ARCH).so: $(AOBJS) $(OBJS)
 
-$(OBJS): $(INCS) $(AOBJ)
+$(AOBJS): $(ADEF)/autocode.c $(ADEF)/autocode.h $(AINC)/autocode.h
 
-$(AOBJ): $(ASRC)/%.$(ARCH).o : $(ADEF)/%.d $(ACOM)
-	cd $(AUTO) && make install
+$(ASRC)/%.$(ARCH).o : $(ADEF)/%.d
+	echo "make $@ from $^"
+	cd $(AUTO) && make $@
 
-$(DESTINC)/autocode.h:
-	cd $(AUTO) && make install
+$(AINC)/%.h : $(ADEF)/%.d
+	echo "make $@ from $^"
+	cd $(AUTO) && make $@
 
-$(DESTLIB)/libdvo.a: $(LIB)/libdvo.$(ARCH).a
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	rm -f $(DESTLIB)/libdvo.a
-	cp $(LIB)/libdvo.$(ARCH).a $(DESTLIB)/libdvo.a
-
-$(LIB)/libdvo.$(ARCH).a: $(AOBJ) $(OBJS)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libdvo.$(ARCH).a
-	ar rcv $(LIB)/libdvo.$(ARCH).a $(AOBJ) $(OBJS)
-	$(RANLIB) $(LIB)/libdvo.$(ARCH).a
-
-$(DESTLIB)/libdvo.so: $(LIB)/libdvo.$(ARCH).so
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	rm -f $(DESTLIB)/libdvo.so
-	cp $(LIB)/libdvo.$(ARCH).so $(DESTLIB)/libdvo.so
-
-$(LIB)/libdvo.$(ARCH).so: $(OBJS)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libdvo.$(ARCH).so
-	gcc -shared -Wl,-soname,libdvo.so -o $(LIB)/libdvo.$(ARCH).so $(OBJS) -lc
-
-$(DESTINC)/%: $(INC)/%
-	@if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
-	rm -f $(DESTINC)/$*
-	cp $(INC)/$* $(DESTINC)/
+$(AINC)/autocode.h: $(AINCS) $(ADEF)/common.h
+	echo "make $@ from $^"
+	cd $(AUTO) && make $@
 
 tabletest: install
 	gcc -L$(LIBDIR) -I$(INCDIR) -o tabletest $(SRC)/tabletest.c -ldvo -lFITS -lohana -lm
 
-clean:
-	rm -f */*~
-	rm -f */#*
-	rm -f */*.o
-	rm -f */*.a
+clean: cleandef
+cleandef:
 	cd $(AUTO) && make clean
-
-dist: clean
-
-.SUFFIXES: .$(ARCH).o
-
-.c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $*.c -o $@