Index: trunk/Ohana/src/gastro/Makefile
===================================================================
--- trunk/Ohana/src/gastro/Makefile	(revision 10305)
+++ trunk/Ohana/src/gastro/Makefile	(revision 10342)
@@ -4,22 +4,18 @@
 
 include ../../Configure
-
 HOME 	=	$(ROOT)/src/gastro
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
 
-# -----------------------
-OBJ	= \
+gastro: $(BIN)/gastro.$(ARCH)
+install: $(DESTBIN)/gastro
+
+GASTRO	= \
 $(SRC)/gastro.$(ARCH).o \
 $(SRC)/gstars.$(ARCH).o \
@@ -42,49 +38,5 @@
 $(SRC)/misc.$(ARCH).o
 
-#$(SRC)/gregions2.$(ARCH).o \
-#$(SRC)/gcatalog.$(ARCH).o \
-#$(SRC)/gptolemy.$(ARCH).o \
-#$(SRC)/g2mass.$(ARCH).o \
+$(GASTRO): $(INC)/gastro.h
+$(BIN)/gastro.$(ARCH): $(GASTRO)
 
-gastro: $(BIN)/gastro.$(ARCH)
-
-$(BIN)/gastro.$(ARCH): $(OBJ)
-
-$(OBJ): $(INC)/gastro.h
-
-INSTALL = gastro
-
-# generic 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)
-
-%.clean :
-	rm -f $(BIN)/$*.$(ARCH)
-
-%.install:
-	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 "#*"`