Index: trunk/Ohana/src/libautocode/Makefile
===================================================================
--- trunk/Ohana/src/libautocode/Makefile	(revision 10305)
+++ trunk/Ohana/src/libautocode/Makefile	(revision 10315)
@@ -1,88 +1,29 @@
 default: autocode
 help:
-	@echo "make options: install autocode (default)"
+	@echo "make options: install autocode latex objects"
 
 include ../../Configure
+HOME	=	$(ROOT)/src/libautocode
+BIN	=	$(HOME)/bin
+LIB	=	$(HOME)/lib
+SRC	=	$(HOME)/src
+MAN	= 	$(HOME)/doc
+DEF	=	$(HOME)/def
+TEX	=	$(HOME)/tex
+INC	=	$(HOME)/include
+ASRC    =       $(SRC)
+AINC    =       $(INC)
+include ../../Makefile.Common
 
-HOME	=	$(ROOT)/src/libautocode
-SRC	=	$(HOME)/src
-BIN	=	$(HOME)/bin
-DEF	=	$(HOME)/def
-LIB	=	$(HOME)/lib
-INC	=	$(HOME)/include
-TEX	=	$(HOME)/tex
-MAN	= 	$(HOME)/doc
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+CFLAGS	:=	$(CFLAGS) -fPIC
 
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
+latex:    $(LIBTEX)
+objects:  $(AOBJS)
+install:  $(DESTINC)/autocode.h $(DESTLIB)/libautocode.a $(DESTLIB)/libautocode.so
+autocode: $(INC)/autocode.h $(LIB)/libautocode.$(ARCH).a $(LIB)/libautocode.$(ARCH).so
 
-# remember to add entries here to libohana/Makefile:AOBJ as well
-LIBOBJ = \
-$(SRC)/coords.$(ARCH).o \
-$(SRC)/average.$(ARCH).o \
-$(SRC)/average-loneos.$(ARCH).o \
-$(SRC)/average-elixir.$(ARCH).o \
-$(SRC)/average-panstarrs.$(ARCH).o \
-$(SRC)/average-pmtest.$(ARCH).o \
-$(SRC)/secfilt.$(ARCH).o \
-$(SRC)/secfilt-loneos.$(ARCH).o \
-$(SRC)/secfilt-elixir.$(ARCH).o \
-$(SRC)/secfilt-panstarrs.$(ARCH).o \
-$(SRC)/measure.$(ARCH).o \
-$(SRC)/measure-loneos.$(ARCH).o \
-$(SRC)/measure-elixir.$(ARCH).o \
-$(SRC)/measure-panstarrs.$(ARCH).o \
-$(SRC)/missing.$(ARCH).o \
-$(SRC)/photcode.$(ARCH).o \
-$(SRC)/image.$(ARCH).o \
-$(SRC)/image-loneos.$(ARCH).o \
-$(SRC)/image-elixir.$(ARCH).o \
-$(SRC)/image-panstarrs.$(ARCH).o \
-$(SRC)/regimage.$(ARCH).o \
-$(SRC)/detreg.$(ARCH).o \
-$(SRC)/photreg.$(ARCH).o \
-$(SRC)/photreg-old.$(ARCH).o \
-$(SRC)/smpdata.$(ARCH).o \
-$(SRC)/spectrum.$(ARCH).o \
-$(SRC)/spectrum-ascii.$(ARCH).o \
-$(SRC)/Stars.$(ARCH).o \
-$(SRC)/GSCRegion.$(ARCH).o \
-$(SRC)/AddstarClientOptions.$(ARCH).o \
-$(SRC)/SkyRegion.$(ARCH).o
-
-LIBINC = \
-$(INC)/coords.h \
-$(INC)/average.h \
-$(INC)/average-loneos.h \
-$(INC)/average-elixir.h \
-$(INC)/average-panstarrs.h \
-$(INC)/average-pmtest.h \
-$(INC)/secfilt.h \
-$(INC)/secfilt-loneos.h \
-$(INC)/secfilt-elixir.h \
-$(INC)/secfilt-panstarrs.h \
-$(INC)/measure.h \
-$(INC)/measure-loneos.h \
-$(INC)/measure-elixir.h \
-$(INC)/measure-panstarrs.h \
-$(INC)/missing.h \
-$(INC)/photcode.h \
-$(INC)/image.h \
-$(INC)/image-loneos.h \
-$(INC)/image-elixir.h \
-$(INC)/image-panstarrs.h \
-$(INC)/regimage.h \
-$(INC)/detreg.h \
-$(INC)/photreg.h \
-$(INC)/photreg-old.h \
-$(INC)/smpdata.h \
-$(INC)/spectrum.h \
-$(INC)/spectrum-ascii.h \
-$(INC)/Stars.h \
-$(INC)/GSCRegion.h \
-$(INC)/AddstarClientOptions.h \
-$(INC)/SkyRegion.h
+# this library is not normally installed: the objects in the
+# file included below are rolled into libdvo 
+include Makefile.Targets
 
 LIBTEX = \
@@ -95,52 +36,14 @@
 $(TEX)/image.tex 
 
-objects: $(LIBOBJ)
+$(LIB)/libautocode.$(ARCH).a: $(AOBJS)
+$(LIB)/libautocode.$(ARCH).so: $(AOBJS)
 
-latex: $(LIBTEX)
+$(AOBJS): $(INC)/autocode.h
 
-install: $(DESTINC)/autocode.h $(DESTLIB)/libautocode.a
-	@echo done install
-
-test: $(DESTINC)/autocode.h
-
-autocode: $(INC)/autocode.h $(LIB)/libautocode.$(ARCH).a
-	@echo done autocode
-
-$(LIBOBJ): $(INC)/autocode.h
-
-$(INC)/autocode.h: $(LIBINC)
+$(INC)/autocode.h: $(AINCS) $(DEF)/common.h
 	cat $(DEF)/common.h >  $(INC)/autocode.h
-	cat $(LIBINC)       >> $(INC)/autocode.h
+	cat $(AINCS)        >> $(INC)/autocode.h
 	@echo "# endif"     >> $(INC)/autocode.h
-	@echo done with libautocode.a
-
-$(DESTINC)/autocode.h: $(INC)/autocode.h
-	@if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
-	rm -f $(DESTINC)/autocode.h
-	cp $(INC)/autocode.h $(DESTINC)/
-	@echo installed autocode.h
-
-$(LIB)/libautocode.$(ARCH).a: $(LIBOBJ)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libautocode.$(ARCH).a
-	ar rcv $(LIB)/libautocode.$(ARCH).a $(LIBOBJ)
-	$(RANLIB) $(LIB)/libautocode.$(ARCH).a
-	@echo done with libautocode.$(ARCH).a
-
-$(DESTLIB)/libautocode.a: $(LIB)/libautocode.$(ARCH).a 
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	rm -f  $(DESTLIB)/libautocode.a
-	cp $(LIB)/libautocode.$(ARCH).a $(DESTLIB)/libautocode.a
-	@echo installed libautocode.a
-
-$(DESTLIB)/libautocode.so: $(LIB)/libautocode.$(ARCH).so
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	rm -f $(DESTLIB)/libautocode.so
-	cp $(LIB)/libautocode.$(ARCH).so $(DESTLIB)/libautocode.so
-
-$(LIB)/libautocode.$(ARCH).so: $(OBJS)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libautocode.$(ARCH).so
-	gcc -shared -Wl,-soname,libautocode.so -o $(LIB)/libautocode.$(ARCH).so $(OBJS) -lc
+	@echo done with autocode.h
 
 $(TEX)/%.tex: $(DEF)/%.d $(DEF)/autocode.tex
@@ -156,12 +59,6 @@
 	./generate $< $(DEF)/autocode.c $@
 
-%.$(ARCH).o: %.c
-	$(CC) $(CFLAGS) -c $*.c -o $@
-
-clean:	
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*.a"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
+clean:	cleandef
+cleandef:
 	rm -f `find src -name "*.c"`
 	rm -f `find include -name "*.h"`
@@ -169,5 +66,4 @@
 
 .PRECIOUS: $(SRC)/%.c
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
 .PRECIOUS: $(LIB)/%.$(ARCH).a
+.PRECIOUS: $(LIB)/%.$(ARCH).so