Index: trunk/Ohana/src/mosastro/Makefile
===================================================================
--- trunk/Ohana/src/mosastro/Makefile	(revision 10305)
+++ trunk/Ohana/src/mosastro/Makefile	(revision 10342)
@@ -4,19 +4,19 @@
 
 include ../../Configure
-
 HOME    =       $(ROOT)/src/mosastro
 LIB	=	$(HOME)/lib
 BIN	=	$(HOME)/bin
-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)
+
+mosastro: $(BIN)/mosastro.$(ARCH)
+mkstandards: $(BIN)/mkstandards.$(ARCH)
+mkobs: $(BIN)/mkobs.$(ARCH)
+warptest: $(BIN)/warptest.(ARCH)
+install: $(DESTBIN)/mosastro $(DESTBIN)/mosastro $(DESTBIN)/mosastro
 
 MOS = \
@@ -57,7 +57,4 @@
 $(SRC)/wstars.$(ARCH).o
 
-mosastro: $(BIN)/mosastro.$(ARCH)
-$(BIN)/mosastro.$(ARCH) : $(MOS)
-
 STD = \
 $(SRC)/mkstandards.$(ARCH).o \
@@ -66,7 +63,4 @@
 $(SRC)/wstars.$(ARCH).o \
 $(SRC)/wfits.$(ARCH).o
-
-mkstandards: $(BIN)/mkstandards.$(ARCH)
-$(BIN)/mkstandards.$(ARCH) : $(STD)
 
 OBS = \
@@ -92,49 +86,10 @@
 $(SRC)/wstars.$(ARCH).o
 
-mkobs: $(BIN)/mkobs.$(ARCH)
-$(BIN)/mkobs.$(ARCH) : $(OBS)
-
-warptest: $(BIN)/warptest.(ARCH)
-$(BIN)/warptest.(ARCH) : $(SRC)/warptest.$(ARCH).o
-
 $(MOS) : $(INC)/mosastro.h
 $(OBS) : $(INC)/mosastro.h
 $(STD) : $(INC)/mosastro.h
 
-# INSTALL = mosastro mkstandards mkobs
-INSTALL = mosastro
-
-# 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 "#*"`
+$(BIN)/mosastro.$(ARCH) : $(MOS)
+$(BIN)/mkstandards.$(ARCH) : $(STD)
+$(BIN)/mkobs.$(ARCH) : $(OBS)
+$(BIN)/warptest.(ARCH) : $(SRC)/warptest.$(ARCH).o