Index: trunk/Ohana/src/gophot/Makefile
===================================================================
--- trunk/Ohana/src/gophot/Makefile	(revision 2510)
+++ trunk/Ohana/src/gophot/Makefile	(revision 5899)
@@ -1,7 +1,9 @@
+default: gophot
+help:
+	@echo "make options: gophot (default)"
+
 include ../../Configure
+
 HOME    =       $(ROOT)/src/gophot
-PROGRAM =       gophot
-
-CC      =       gcc -g
 BIN	=	$(HOME)/bin
 INC	= 	$(HOME)/include
@@ -14,49 +16,67 @@
 
 #  
-INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
+INCS	= 	-I$(INC) -I$(LINC)
 LIBS	= 	-L$(LLIB) -lFITS -lohana -lm 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS) 
-CCFLAGS	=	$(INCS) $(LIBS) 
-
-default: $(PROGRAM)
+CFLAGS	=	$(INCS)
+LFLAGS	=	$(LIBS) 
 
 OBJ = \
-           $(SRC)/gophot.$(ARCH).o 	   $(SRC)/ConfigInit.$(ARCH).o \
-	   $(SRC)/message.$(ARCH).o	   $(SRC)/dophot.$(ARCH).o \
-	   $(SRC)/makenoise.$(ARCH).o      $(SRC)/findsky.$(ARCH).o \
-           $(SRC)/makemask.$(ARCH).o       $(SRC)/paravg.$(ARCH).o \
-           $(SRC)/objout.$(ARCH).o         $(SRC)/addstar.$(ARCH).o \
-	   $(SRC)/ellipse.$(ARCH).o        $(SRC)/improve.$(ARCH).o \
-           $(SRC)/fillerup.$(ARCH).o       $(SRC)/parinterp.$(ARCH).o \
-           $(SRC)/guess.$(ARCH).o          $(SRC)/offpic.$(ARCH).o \
-           $(SRC)/addlims.$(ARCH).o        $(SRC)/parupd.$(ARCH).o \
-           $(SRC)/toofaint.$(ARCH).o       $(SRC)/isearch.$(ARCH).o \
-           $(SRC)/shape.$(ARCH).o          $(SRC)/galaxy.$(ARCH).o \
-           $(SRC)/transmask.$(ARCH).o      $(SRC)/cosmic.$(ARCH).o \
-           $(SRC)/impaper2.$(ARCH).o       $(SRC)/sort.$(ARCH).o \
-           $(SRC)/oblit.$(ARCH).o          $(SRC)/toobright.$(ARCH).o \
-           $(SRC)/Chisq.$(ARCH).o          $(SRC)/oblims.$(ARCH).o \
-           $(SRC)/ludcmp.$(ARCH).o         $(SRC)/lubksb.$(ARCH).o \
-           $(SRC)/pseud2d.$(ARCH).o        $(SRC)/twofit.$(ARCH).o \
-           $(SRC)/skyfun_plane.$(ARCH).o   $(SRC)/pseud4d.$(ARCH).o \
-	   $(SRC)/large_features.$(ARCH).o $(SRC)/set_thresholds.$(ARCH).o \
-           $(SRC)/outline.$(ARCH).o        $(SRC)/delete_ellipse.$(ARCH).o \
-	   $(SRC)/feature_fluxes.$(ARCH).o $(SRC)/mediansky.$(ARCH).o
+$(SRC)/gophot.$(ARCH).o 	$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/message.$(ARCH).o	$(SRC)/dophot.$(ARCH).o \
+$(SRC)/makenoise.$(ARCH).o      $(SRC)/findsky.$(ARCH).o \
+$(SRC)/makemask.$(ARCH).o       $(SRC)/paravg.$(ARCH).o \
+$(SRC)/objout.$(ARCH).o         $(SRC)/addstar.$(ARCH).o \
+$(SRC)/ellipse.$(ARCH).o        $(SRC)/improve.$(ARCH).o \
+$(SRC)/fillerup.$(ARCH).o       $(SRC)/parinterp.$(ARCH).o \
+$(SRC)/guess.$(ARCH).o          $(SRC)/offpic.$(ARCH).o \
+$(SRC)/addlims.$(ARCH).o        $(SRC)/parupd.$(ARCH).o \
+$(SRC)/toofaint.$(ARCH).o       $(SRC)/isearch.$(ARCH).o \
+$(SRC)/shape.$(ARCH).o          $(SRC)/galaxy.$(ARCH).o \
+$(SRC)/transmask.$(ARCH).o      $(SRC)/cosmic.$(ARCH).o \
+$(SRC)/impaper2.$(ARCH).o       $(SRC)/sort.$(ARCH).o \
+$(SRC)/oblit.$(ARCH).o          $(SRC)/toobright.$(ARCH).o \
+$(SRC)/Chisq.$(ARCH).o          $(SRC)/oblims.$(ARCH).o \
+$(SRC)/ludcmp.$(ARCH).o         $(SRC)/lubksb.$(ARCH).o \
+$(SRC)/pseud2d.$(ARCH).o        $(SRC)/twofit.$(ARCH).o \
+$(SRC)/skyfun_plane.$(ARCH).o   $(SRC)/pseud4d.$(ARCH).o \
+$(SRC)/large_features.$(ARCH).o $(SRC)/set_thresholds.$(ARCH).o \
+$(SRC)/outline.$(ARCH).o        $(SRC)/delete_ellipse.$(ARCH).o \
+$(SRC)/feature_fluxes.$(ARCH).o $(SRC)/mediansky.$(ARCH).o
 
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
+$(OBJ)                : $(INC)/gophot.h $(INC)/prototypes.h
+$(BIN)/gophot.$(ARCH) : $(OBJ)
+gophot                : $(BIN)/gophot.$(ARCH)
 
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
+INSTALL = gophot
+
+# 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) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
+	$(CC) $^ -o $@ $(LFLAGS)
 
-install: $(DESTBIN)/$(PROGRAM)
+$(DESTBIN)/%: $(BIN)/%.$(ARCH)
+	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
+	rm -f $(DESTBIN)/$*
+	cp $(BIN)/$*.$(ARCH) $(DESTBIN)/$*
 
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
+$(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)
@@ -64,7 +84,2 @@
 	rm -f `find . -name "*~"`
 	rm -f `find . -name "#*"`
-
-.SUFFIXES: .$(ARCH).o
-
-.c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $<