Index: /trunk/Ohana/src/addstar/Makefile
===================================================================
--- /trunk/Ohana/src/addstar/Makefile	(revision 10314)
+++ /trunk/Ohana/src/addstar/Makefile	(revision 10315)
@@ -4,5 +4,4 @@
 
 include ../../Configure
-
 HOME 	=	$(ROOT)/src/addstar
 BIN	=	$(HOME)/bin
@@ -11,12 +10,8 @@
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
-
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+include ../../Makefile.Common
+
+CFLAGS	:=	$(CFLAGS) -fPIC
+LDFLAGS := 	-lkapa -ldvo -lFITS -lohana $(LDFLAGS)
 
 ADDSTAR = \
@@ -209,6 +204,4 @@
 addstart                : $(BIN)/addstart.$(ARCH)
 $(BIN)/addstart.$(ARCH) : $(ADDSTART)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $^ -o $@ $(LFLAGS) -lpthread
 
 addstarc                : $(BIN)/addstarc.$(ARCH)
@@ -231,22 +224,7 @@
 all: addstar addstarc addstard addstart sedstar load2mass
 
-INSTALL = addstar
+INSTALL = addstar addstarc addstard addstart sedstar load2mass
 
 # dependancy rules for binary code #########################
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $^ -o $@ $(LFLAGS)
-
-$(DESTBIN)/%: $(BIN)/%.$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$*
-	cp $(BIN)/$*.$(ARCH) $(DESTBIN)/$*
-
 $(INSTALL) $(DEVEL): % : $(BIN)/%.$(ARCH)
 
@@ -257,12 +235,4 @@
 	make $(DESTBIN)/$*
 
-# utilities #################################################
-
 install:
 	for i in $(INSTALL); do make $$i.install; done
-
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
Index: /trunk/Ohana/src/libautocode/Makefile
===================================================================
--- /trunk/Ohana/src/libautocode/Makefile	(revision 10314)
+++ /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
Index: /trunk/Ohana/src/libautocode/Makefile.Targets
===================================================================
--- /trunk/Ohana/src/libautocode/Makefile.Targets	(revision 10315)
+++ /trunk/Ohana/src/libautocode/Makefile.Targets	(revision 10315)
@@ -0,0 +1,66 @@
+
+AOBJS = \
+$(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
+
+AINCS = \
+$(AINC)/coords.h \
+$(AINC)/average.h \
+$(AINC)/average-loneos.h \
+$(AINC)/average-elixir.h \
+$(AINC)/average-panstarrs.h \
+$(AINC)/average-pmtest.h \
+$(AINC)/secfilt.h \
+$(AINC)/secfilt-loneos.h \
+$(AINC)/secfilt-elixir.h \
+$(AINC)/secfilt-panstarrs.h \
+$(AINC)/measure.h \
+$(AINC)/measure-loneos.h \
+$(AINC)/measure-elixir.h \
+$(AINC)/measure-panstarrs.h \
+$(AINC)/missing.h \
+$(AINC)/photcode.h \
+$(AINC)/image.h \
+$(AINC)/image-loneos.h \
+$(AINC)/image-elixir.h \
+$(AINC)/image-panstarrs.h \
+$(AINC)/regimage.h \
+$(AINC)/detreg.h \
+$(AINC)/photreg.h \
+$(AINC)/photreg-old.h \
+$(AINC)/smpdata.h \
+$(AINC)/spectrum.h \
+$(AINC)/spectrum-ascii.h \
+$(AINC)/Stars.h \
+$(AINC)/GSCRegion.h \
+$(AINC)/AddstarClientOptions.h \
+$(AINC)/SkyRegion.h
Index: /trunk/Ohana/src/libdvo/Makefile
===================================================================
--- /trunk/Ohana/src/libdvo/Makefile	(revision 10314)
+++ /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 $@
Index: /trunk/Ohana/src/libfits/Makefile
===================================================================
--- /trunk/Ohana/src/libfits/Makefile	(revision 10314)
+++ /trunk/Ohana/src/libfits/Makefile	(revision 10315)
@@ -1,22 +1,23 @@
+default: install
+help:
+	@echo "make options: install libfits man clean dist"
+
 include ../../Configure
-
 HOME	=	$(ROOT)/src/libfits
+BIN	=	$(HOME)/bin
+LIB	=	$(HOME)/lib
 HEAD	=	$(HOME)/header
 MATR	=	$(HOME)/matrix
 TABL	=	$(HOME)/table
-LIB	=	$(HOME)/lib
 INC	=	$(HOME)/include
 MAN	= 	$(HOME)/doc
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+include ../../Makefile.Common
 
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
+CFLAGS	:=	$(CFLAGS) -fPIC
+LDFLAGS := 	$(LDFLAGS) -lFITS -lohana
 
-default: install
-
-install: $(DESTLIB)/libFITS.a $(DESTMAN)/fits.1
-
-libfits: $(LIB)/libFITS.$(ARCH).a
+install: $(DESTLIB)/libFITS.a $(DESTLIB)/libFITS.so $(DESTMAN)/fits.1
+libfits: $(LIB)/libFITS.$(ARCH).a $(LIB)/libFITS.$(ARCH).so
+man: $(DESTMAN)/fits.1
 
 INCS = $(DESTINC)/gfitsio.h 
@@ -50,53 +51,7 @@
 $(TABL)/F_table_row.$(ARCH).o			$(TABL)/F_free_T.$(ARCH).o
 
-# $(TABL)/F_table_column.$(ARCH).o		\
-# $(TABL)/F_get_T_column.$(ARCH).o		\
-# $(TABL)/F_get_T_value.$(ARCH).o
-
 OBJS = $(HEADER_OBJ) $(MATRIX_OBJ) $(TABLE_OBJ)
 
 $(OBJS): $(INCS)
-
-$(DESTLIB)/libFITS.a: $(LIB)/libFITS.$(ARCH).a 
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	rm -f  $(DESTLIB)/libFITS.a
-	cp $(LIB)/libFITS.$(ARCH).a $(DESTLIB)/libFITS.a
-
 $(LIB)/libFITS.$(ARCH).a: $(OBJS)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libFITS.$(ARCH).a
-	ar rcv $(LIB)/libFITS.$(ARCH).a $(OBJS)
-	$(RANLIB) $(LIB)/libFITS.$(ARCH).a
-
-$(DESTLIB)/libFITS.so: $(LIB)/libFITS.$(ARCH).so
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	rm -f $(DESTLIB)/libFITS.so
-	cp $(LIB)/libFITS.$(ARCH).so $(DESTLIB)/libFITS.so
-
 $(LIB)/libFITS.$(ARCH).so: $(OBJS)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libFITS.$(ARCH).so
-	gcc -shared -Wl,-soname,libFITS.so -o $(LIB)/libFITS.$(ARCH).so $(OBJS) -lc
-
-$(DESTINC)/%: $(INC)/%
-	@if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
-	rm -f $(DESTINC)/$*
-	cp $(INC)/$* $(DESTINC)/
-
-$(DESTMAN)/fits.1: $(MAN)/fits.1
-	@if [ ! -d $(DESTMAN) ]; then mkdir -p $(DESTMAN); fi
-	rm -f $(DESTMAN)/fits.1
-	cp $(MAN)/fits.1    $(DESTMAN)/
-
-clean:
-	rm -f */*.a
-	rm -f */*.o
-	rm -f */*~
-	rm -f */#*
-
-dist: clean
-
-.SUFFIXES: .$(ARCH).o
-
-.c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $*.c -o $@
Index: /trunk/Ohana/src/libkapa/Makefile
===================================================================
--- /trunk/Ohana/src/libkapa/Makefile	(revision 10314)
+++ /trunk/Ohana/src/libkapa/Makefile	(revision 10315)
@@ -1,4 +1,7 @@
+default: install
+help:
+	@echo "make options: install libkapa clean dist"
+
 include ../../Configure
-
 HOME 	=	$(ROOT)/src/libkapa
 LIB	= 	$(HOME)/lib
@@ -6,16 +9,10 @@
 MAN	=	$(HOME)/doc
 INC	=	$(HOME)/include
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+include ../../Makefile.Common
 
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
+CFLAGS	:=	$(CFLAGS) -fPIC
 
-default: install
-
-install: $(DESTINC)/kapa.h $(DESTLIB)/libkapa.a
-
-libkapa: $(LIB)/libkapa.$(ARCH).a
+install: $(DESTINC)/kapa.h $(DESTLIB)/libkapa.a $(DESTLIB)/libkapa.so
+libkapa: $(LIB)/libkapa.$(ARCH).a $(LIB)/libkapa.$(ARCH).so
 
 INCS = $(DESTINC)/kapa.h
@@ -41,40 +38,4 @@
 $(DRAW): $(INCS)
 
-$(DESTLIB)/libkapa.a: $(LIB)/libkapa.$(ARCH).a
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	rm -f $(DESTLIB)/libkapa.a
-	cp $(LIB)/libkapa.$(ARCH).a $(DESTLIB)/libkapa.a
-
 $(LIB)/libkapa.$(ARCH).a: $(OBJS) $(DRAW)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libkapa.$(ARCH).a
-	ar rcv $(LIB)/libkapa.$(ARCH).a $(OBJS) $(DRAW)
-	$(RANLIB) $(LIB)/libkapa.$(ARCH).a
-
-$(DESTLIB)/libkapa.so: $(LIB)/libkapa.$(ARCH).so
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	rm -f $(DESTLIB)/libkapa.so
-	cp $(LIB)/libkapa.$(ARCH).so $(DESTLIB)/libkapa.so
-
-$(LIB)/libkapa.$(ARCH).so: $(OBJS)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libkapa.$(ARCH).so
-	gcc -shared -Wl,-soname,libkapa.so -o $(LIB)/libkapa.$(ARCH).so $(OBJS) -lc
-
-$(DESTINC)/%: $(INC)/%
-	@if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
-	rm -f $(DESTINC)/$*
-	cp $(INC)/$* $(DESTINC)/
-
-clean:
-	rm -f */*~
-	rm -f */#*
-	rm -f */*.o
-	rm -f */*.a
-
-dist: clean
-
-.SUFFIXES: .$(ARCH).o
-
-.c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $*.c -o $@
+$(LIB)/libkapa.$(ARCH).so: $(OBJS) $(DRAW)
Index: /trunk/Ohana/src/libohana/Makefile
===================================================================
--- /trunk/Ohana/src/libohana/Makefile	(revision 10314)
+++ /trunk/Ohana/src/libohana/Makefile	(revision 10315)
@@ -1,5 +1,9 @@
+default: install
+help:
+	@echo "make options: install libohana clean dist"
+
 include ../../Configure
-
 HOME 	=	$(ROOT)/src/libohana
+BIN	= 	$(HOME)/bin
 LIB	= 	$(HOME)/lib
 SRC	=	$(HOME)/src
@@ -7,20 +11,16 @@
 INC	=	$(HOME)/include
 TESTDIR =       $(HOME)/test
-TESTLIB =       $(ROOT)/src/libtap/lib/$(ARCH)
-TESTINC =       $(ROOT)/src/libtap/include
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+include ../../Makefile.Common
 
-CFLAGS	=	-I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
-TFLAGS  =       $(CFLAGS) $(LIBS) -L$(TESTLIB) -I$(TESTINC) -ltap
-LIBS	= 	-L$(LIBDIRS) $(LIBFLAGS) -lohana
+CFLAGS	:=	$(CFLAGS) -fPIC
+LDFLAGS := 	$(LDFLAGS) -lohana
+TFLAGS  =       $(CFLAGS) $(LDFLAGS) -ltap_ohana
 
-default: install
-
-install: $(DESTLIB)/libohana.a 
-
-libohana: $(LIB)/libohana.$(ARCH).a 
+install: $(DESTLIB)/libohana.a $(DESTLIB)/libohana.so
+libohana: $(LIB)/libohana.$(ARCH).a $(LIB)/libohana.$(ARCH).so
+testcode: install $(TEST)
+test:
+	make testcode
+	for i in $(TEST); do $$i; done
 
 INCS = \
@@ -46,52 +46,10 @@
 
 $(OBJS): $(INCS)
+$(LIB)/libohana.$(ARCH).a: $(OBJS)
+$(LIB)/libohana.$(ARCH).so: $(OBJS)
 
-$(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
-
-$(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 $(OBJS)
-	$(RANLIB) $(LIB)/libohana.$(ARCH).a
-
-$(DESTLIB)/libohana.so: $(LIB)/libohana.$(ARCH).so
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	rm -f $(DESTLIB)/libohana.so
-	cp $(LIB)/libohana.$(ARCH).so $(DESTLIB)/libohana.so
-
-$(LIB)/libohana.$(ARCH).so: $(OBJS)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libohana.$(ARCH).so
-	gcc -shared -Wl,-soname,libohana.so -o $(LIB)/libohana.$(ARCH).so $(OBJS) -lc
-
-$(DESTINC)/%: $(INC)/%
-	@if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
-	rm -f $(DESTINC)/$*
-	cp $(INC)/$* $(DESTINC)/
-
-$(TESTDIR)/%.$(ARCH) : $(DESTLIB)/libohana.a $(TESTDIR)/%.c
+$(TESTDIR)/%.$(ARCH) : $(TESTDIR)/%.c
 	$(CC) $^ -o $@ $(TFLAGS)
 
-testcode: install $(TEST)
+.PHONY: test
 
-test:
-	make testcode
-	for i in $(TEST); do $$i; done
-
-clean:
-	rm -f */*~
-	rm -f */#*
-	rm -f */*.o
-	rm -f */*.a
-
-dist: clean
-
-.SUFFIXES: .$(ARCH).o
-
-.c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $*.c -o $@
-
-.PHONY: test