Index: trunk/Ohana/src/addstar/Makefile
===================================================================
--- trunk/Ohana/src/addstar/Makefile	(revision 3339)
+++ trunk/Ohana/src/addstar/Makefile	(revision 3361)
@@ -1,6 +1,9 @@
+default: addstar
+help:
+	@echo "make options: addstar (default)"
+
 include ../../Configure
+
 HOME 	=	$(ROOT)/src/addstar
-PROGRAM =       addstar
-
 BIN	=	$(HOME)/bin
 INC	= 	$(HOME)/include
@@ -15,43 +18,95 @@
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
 LIBS	= 	-L$(LLIB) -lFITS -lohana -lm 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS)
-CCFLAGS	=	$(INCS) $(LIBS) 
+CFLAGS	=	$(INCS)
+LFLAGS	=	$(LIBS) 
 
 ADDSTAR = \
-$(SRC)/addstar.$(ARCH).o 	$(SRC)/gcatalog.$(ARCH).o     \
-$(SRC)/gregion_image.$(ARCH).o 	$(SRC)/gregion_star.$(ARCH).o \
-$(SRC)/gimages.$(ARCH).o        $(SRC)/wimage.$(ARCH).o       \
-$(SRC)/gstars.$(ARCH).o         $(SRC)/grefstars.$(ARCH).o    \
-$(SRC)/find_matches.$(ARCH).o 	$(SRC)/find_matches_refstars.$(ARCH).o \
-$(SRC)/wcatalog.$(ARCH).o       $(SRC)/conversions.$(ARCH).o     \
-$(SRC)/sort_lists.$(ARCH).o 	$(SRC)/ConfigInit.$(ARCH).o   \
-$(SRC)/aregion.$(ARCH).o	$(SRC)/find_subset.$(ARCH).o  \
-$(SRC)/load_subpix.$(ARCH).o	$(SRC)/airmass.$(ARCH).o      \
-$(SRC)/mkcatalog.$(ARCH).o      $(SRC)/calibrate.$(ARCH).o    \
-$(SRC)/args.$(ARCH).o		$(SRC)/parse_time.$(ARCH).o   \
-$(SRC)/match_refstars.$(ARCH).o		\
-$(SRC)/check_permissions.$(ARCH).o 
+$(SRC)/addstar.$(ARCH).o \
+$(SRC)/airmass.$(ARCH).o \
+$(SRC)/aregion.$(ARCH).o \
+$(SRC)/args.$(ARCH).o \
+$(SRC)/calibrate.$(ARCH).o \
+$(SRC)/check_permissions.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/conversions.$(ARCH).o \
+$(SRC)/edge_check.$(ARCH).o \
+$(SRC)/find_matches.$(ARCH).o \
+$(SRC)/find_matches_refstars.$(ARCH).o \
+$(SRC)/find_subset.$(ARCH).o \
+$(SRC)/gcatalog.$(ARCH).o \
+$(SRC)/get2mass.$(ARCH).o \
+$(SRC)/getgsc.$(ARCH).o \
+$(SRC)/getusno.$(ARCH).o \
+$(SRC)/gimages.$(ARCH).o \
+$(SRC)/greference.$(ARCH).o \
+$(SRC)/grefstars.$(ARCH).o \
+$(SRC)/gregion_image.$(ARCH).o \
+$(SRC)/gregion_match.$(ARCH).o \
+$(SRC)/gregion_patch.$(ARCH).o \
+$(SRC)/gregion_star.$(ARCH).o \
+$(SRC)/gstars.$(ARCH).o \
+$(SRC)/image-db.$(ARCH).o \
+$(SRC)/in_image.$(ARCH).o \
+$(SRC)/load_pt_catalog.$(ARCH).o \
+$(SRC)/load_subpix.$(ARCH).o \
+$(SRC)/make_backup.$(ARCH).o \
+$(SRC)/mkcatalog.$(ARCH).o \
+$(SRC)/opening_angle.$(ARCH).o \
+$(SRC)/parse_time.$(ARCH).o \
+$(SRC)/RegionOps.$(ARCH).o \
+$(SRC)/replace_match.$(ARCH).o \
+$(SRC)/save_pt_catalog.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
+$(SRC)/sort_lists.$(ARCH).o \
+$(SRC)/update_coords.$(ARCH).o \
+$(SRC)/wcatalog.$(ARCH).o \
+$(SRC)/wimage.$(ARCH).o
 
-OBJ = $(ADDSTAR)
+EXTRA = \
+$(SRC)/bracket.$(ARCH).o \
+$(SRC)/find_proper.$(ARCH).o \
+$(SRC)/gregion_match_glob.$(ARCH).o \
+$(SRC)/gregions.$(ARCH).o \
+$(SRC)/match_refstars.$(ARCH).o \
 
 default: $(PROGRAM)
 
-$(ADDSTAR): $(INC)/addstar.h
+addstar                : $(BIN)/addstar.$(ARCH)
 
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
+$(BIN)/addstar.$(ARCH) : $(ADDSTAR)
 
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
+# $(ADDSTAR): $(INC)/addstar.h
+
+INSTALL = addstar
+
+# 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)
@@ -59,9 +114,2 @@
 	rm -f `find . -name "*~"`
 	rm -f `find . -name "#*"`
-
-.SUFFIXES: .$(ARCH).o
-
-.c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $<
-
-