Index: trunk/Ohana/src/libfits/Makefile
===================================================================
--- trunk/Ohana/src/libfits/Makefile	(revision 10305)
+++ 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 $@