Index: trunk/Ohana/src/libfits/Makefile
===================================================================
--- trunk/Ohana/src/libfits/Makefile	(revision 3522)
+++ trunk/Ohana/src/libfits/Makefile	(revision 5238)
@@ -2,6 +2,6 @@
 
 include ../../Configure
-HOME	=	.
 
+HOME	=	$(ROOT)/src/libfits
 HEAD	=	$(HOME)/header
 MATR	=	$(HOME)/matrix
@@ -14,19 +14,13 @@
 DESTMAN	=	$(LMAN)
 
-INCS	=	-I$(INC) 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS) -D$(ARCH)
-LFLAGS	=	-c $(INCS)
+CFLAGS	=	-I$(LINC) -D$(ARCH)
 
 default: install
 
-sample: /h/eugene/src/ohana/lib/linux/libFITS.a sample.o
-	gcc -g -o sample sample.o /h/eugene/src/ohana/lib/linux/libFITS.a -lm
+install: $(DESTLIB)/libFITS.a $(DESTMAN)/fits.1
 
-sample2: /h/eugene/src/ohana/lib/linux/libFITS.a sample2.o
-	gcc -g -o sample2 sample2.o /h/eugene/src/ohana/lib/linux/libFITS.a -lm
+libfits: $(LIB)/libFITS.$(ARCH).a
 
-fits: $(DESTLIB)/libFITS.a
-
-install: $(DESTINC)/fitsio.h $(DESTLIB)/libFITS.a $(DESTMAN)/fits.1
+INCS = $(DESTINC)/fitsio.h 
 
 HEADER_OBJ = \
@@ -62,13 +56,7 @@
 # $(TABL)/F_get_T_value.$(ARCH).o
 
-LIBOBJ = $(HEADER_OBJ) $(MATRIX_OBJ) $(TABLE_OBJ)
+OBJS = $(HEADER_OBJ) $(MATRIX_OBJ) $(TABLE_OBJ)
 
-$(LIBOBJ): $(INC)/fits.h $(INC)/fitsio.h
-
-$(LIB)/libFITS.$(ARCH).a: $(LIBOBJ)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libFITS.$(ARCH).a
-	ar rcv $(LIB)/libFITS.$(ARCH).a $(LIBOBJ)
-	$(RANLIB) $(LIB)/libFITS.$(ARCH).a
+$(OBJS): $(INCS)
 
 $(DESTLIB)/libFITS.a: $(LIB)/libFITS.$(ARCH).a 
@@ -77,8 +65,14 @@
 	cp $(LIB)/libFITS.$(ARCH).a $(DESTLIB)/libFITS.a
 
-$(DESTINC)/fitsio.h: $(INC)/fitsio.h
+$(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
+
+$(DESTINC)/%: $(INC)/%
 	@if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
-	rm -f $(DESTINC)/fitsio.h
-	cp $(INC)/fitsio.h $(DESTINC)/
+	rm -f $(DESTINC)/$*
+	cp $(INC)/$* $(DESTINC)/
 
 $(DESTMAN)/fits.1: $(MAN)/fits.1
@@ -93,7 +87,8 @@
 	rm -f */#*
 
+dist: clean
+
 .SUFFIXES: .$(ARCH).o
 
 .c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $<
-
+	$(CC) $(CFLAGS) -c $*.c -o $@