Index: trunk/Ohana/src/addstar/Makefile
===================================================================
--- trunk/Ohana/src/addstar/Makefile	(revision 8342)
+++ trunk/Ohana/src/addstar/Makefile	(revision 8361)
@@ -22,4 +22,10 @@
 
 ADDSTAR = \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/SkyListForStars.$(ARCH).o \
+$(SRC)/SkyRegionUtils.$(ARCH).o \
+$(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
 $(SRC)/addstar.$(ARCH).o \
 $(SRC)/airmass.$(ARCH).o \
@@ -27,6 +33,55 @@
 $(SRC)/build_links.$(ARCH).o \
 $(SRC)/calibrate.$(ARCH).o \
-$(SRC)/ConfigInit.$(ARCH).o \
 $(SRC)/dump.$(ARCH).o \
+$(SRC)/edge_check.$(ARCH).o \
+$(SRC)/fakeimage.$(ARCH).o \
+$(SRC)/find_matches.$(ARCH).o \
+$(SRC)/find_matches_closest.$(ARCH).o \
+$(SRC)/find_matches_refstars.$(ARCH).o \
+$(SRC)/find_subset.$(ARCH).o \
+$(SRC)/get2mass.$(ARCH).o \
+$(SRC)/get2mass_as.$(ARCH).o \
+$(SRC)/get2mass_as_raw.$(ARCH).o \
+$(SRC)/get2mass_dr2.$(ARCH).o \
+$(SRC)/get2mass_ops.$(ARCH).o \
+$(SRC)/getgsc.$(ARCH).o \
+$(SRC)/gettycho.$(ARCH).o \
+$(SRC)/getusno.$(ARCH).o \
+$(SRC)/getusnob.$(ARCH).o \
+$(SRC)/gimages.$(ARCH).o \
+$(SRC)/greference.$(ARCH).o \
+$(SRC)/grefstars.$(ARCH).o \
+$(SRC)/gstars.$(ARCH).o \
+$(SRC)/in_image.$(ARCH).o \
+$(SRC)/load_subpix.$(ARCH).o \
+$(SRC)/opening_angle.$(ARCH).o \
+$(SRC)/parse_time.$(ARCH).o \
+$(SRC)/replace_match.$(ARCH).o \
+$(SRC)/resort_catalog.$(ARCH).o \
+$(SRC)/rfits.$(ARCH).o \
+$(SRC)/rtext.$(ARCH).o \
+$(SRC)/sort_lists.$(ARCH).o \
+$(SRC)/update_coords.$(ARCH).o
+
+ADDSTARD = \
+$(SRC)/CheckPassword.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/NewImage.$(ARCH).o \
+$(SRC)/NewRefcat.$(ARCH).o \
+$(SRC)/NewReflist.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/SkyListForStars.$(ARCH).o \
+$(SRC)/SkyRegionUtils.$(ARCH).o \
+$(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
+$(SRC)/SocketOps.$(ARCH).o \
+$(SRC)/UpdateDatabase_Image.$(ARCH).o \
+$(SRC)/UpdateDatabase_Refcat.$(ARCH).o \
+$(SRC)/UpdateDatabase_Reflist.$(ARCH).o \
+$(SRC)/addstard.$(ARCH).o \
+$(SRC)/airmass.$(ARCH).o \
+$(SRC)/args_server.$(ARCH).o \
+$(SRC)/build_links.$(ARCH).o \
+$(SRC)/calibrate.$(ARCH).o \
 $(SRC)/edge_check.$(ARCH).o \
 $(SRC)/find_matches.$(ARCH).o \
@@ -34,97 +89,25 @@
 $(SRC)/find_matches_refstars.$(ARCH).o \
 $(SRC)/find_subset.$(ARCH).o \
-$(SRC)/fakeimage.$(ARCH).o \
 $(SRC)/get2mass.$(ARCH).o \
 $(SRC)/get2mass_as.$(ARCH).o \
-$(SRC)/get2mass_ops.$(ARCH).o \
 $(SRC)/get2mass_as_raw.$(ARCH).o \
 $(SRC)/get2mass_dr2.$(ARCH).o \
+$(SRC)/get2mass_ops.$(ARCH).o \
 $(SRC)/getgsc.$(ARCH).o \
+$(SRC)/gettycho.$(ARCH).o \
 $(SRC)/getusno.$(ARCH).o \
 $(SRC)/getusnob.$(ARCH).o \
-$(SRC)/gettycho.$(ARCH).o \
+$(SRC)/gimages.$(ARCH).o \
 $(SRC)/greference.$(ARCH).o \
-$(SRC)/grefstars.$(ARCH).o \
-$(SRC)/gimages.$(ARCH).o \
-$(SRC)/gstars.$(ARCH).o \
 $(SRC)/in_image.$(ARCH).o \
 $(SRC)/load_subpix.$(ARCH).o \
 $(SRC)/opening_angle.$(ARCH).o \
-$(SRC)/parse_time.$(ARCH).o \
-$(SRC)/replace_match.$(ARCH).o \
-$(SRC)/resort_catalog.$(ARCH).o \
-$(SRC)/SetSignals.$(ARCH).o \
-$(SRC)/sort_lists.$(ARCH).o \
-$(SRC)/update_coords.$(ARCH).o \
-$(SRC)/Shutdown.$(ARCH).o \
-$(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
-$(SRC)/SkyRegionUtils.$(ARCH).o \
-$(SRC)/SkyListForStars.$(ARCH).o \
-$(SRC)/rfits.$(ARCH).o \
-$(SRC)/rtext.$(ARCH).o
-
-GSC-OPS = \
-$(SRC)/RegionOps.$(ARCH).o \
-$(SRC)/gregion_image.$(ARCH).o \
-$(SRC)/gregion_match.$(ARCH).o \
-$(SRC)/gregion_patch.$(ARCH).o \
-$(SRC)/gregion_star.$(ARCH).o
-
-MKACC-2MASS = \
-$(SRC)/mkacc-2mass.$(ARCH).o \
-$(SRC)/image-db.$(ARCH).o \
-$(SRC)/ConfigInit.$(ARCH).o \
-$(SRC)/SetSignals.$(ARCH).o \
-$(SRC)/wimage.$(ARCH).o \
-$(SRC)/get2mass_as.$(ARCH).o
-
-SCAN-2MASS = \
-$(SRC)/scan2mass.$(ARCH).o \
-$(SRC)/scan2mass_as_data.$(ARCH).o \
-$(SRC)/get2mass_as.$(ARCH).o \
-$(SRC)/ConfigInit.$(ARCH).o \
-$(SRC)/Shutdown.$(ARCH).o \
-$(SRC)/SetSignals.$(ARCH).o
-
-LOAD-2MASS = \
-$(SRC)/load2mass.$(ARCH).o \
-$(SRC)/load2mass_as_rawdata.$(ARCH).o \
-$(SRC)/load2mass_catalog.$(ARCH).o \
-$(SRC)/get2mass_ops.$(ARCH).o \
-$(SRC)/find_matches_refstars.$(ARCH).o \
-$(SRC)/load_pt_catalog.$(ARCH).o \
-$(SRC)/args_load2mass.$(ARCH).o \
-$(SRC)/sort_lists.$(ARCH).o \
-$(SRC)/replace_match.$(ARCH).o \
-$(SRC)/update_coords.$(ARCH).o \
-$(SRC)/gcatalog.$(ARCH).o \
-$(SRC)/mkcatalog.$(ARCH).o \
-$(SRC)/wcatalog.$(ARCH).o \
-$(SRC)/ConfigInit.$(ARCH).o \
-$(SRC)/Shutdown.$(ARCH).o \
-$(SRC)/SetSignals.$(ARCH).o
-
-SEDSTAR = \
-$(SRC)/sedstar.$(ARCH).o \
-$(SRC)/SEDtableLoad.$(ARCH).o \
-$(SRC)/SEDfit.$(ARCH).o \
-$(SRC)/SEDops.$(ARCH).o \
-$(SRC)/args_sedstar.$(ARCH).o \
-$(SRC)/gcatalog.$(ARCH).o \
-$(SRC)/mkcatalog.$(ARCH).o \
-$(SRC)/wcatalog.$(ARCH).o \
-$(SRC)/ConfigInit.$(ARCH).o \
-$(SRC)/Shutdown.$(ARCH).o \
-$(SRC)/SetSignals.$(ARCH).o
-
-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 \
-
-ADDSTARD = \
-$(SRC)/addstard.$(ARCH).o \
+$(SRC)/replace_match.$(ARCH).o \
+$(SRC)/sort_lists.$(ARCH).o \
+$(SRC)/update_coords.$(ARCH).o
+
+ADDSTART = \
+$(SRC)/addstart.$(ARCH).o \
+$(SRC)/DatasetOps.$(ARCH).o \
 $(SRC)/SocketOps.$(ARCH).o \
 $(SRC)/ConfigInit.$(ARCH).o \
@@ -143,5 +126,7 @@
 $(SRC)/get2mass.$(ARCH).o \
 $(SRC)/get2mass_as.$(ARCH).o \
+$(SRC)/get2mass_as_raw.$(ARCH).o \
 $(SRC)/get2mass_dr2.$(ARCH).o \
+$(SRC)/get2mass_ops.$(ARCH).o \
 $(SRC)/getgsc.$(ARCH).o \
 $(SRC)/getusno.$(ARCH).o \
@@ -149,11 +134,7 @@
 $(SRC)/gettycho.$(ARCH).o \
 $(SRC)/greference.$(ARCH).o \
-$(SRC)/gcatalog.$(ARCH).o \
 $(SRC)/gimages.$(ARCH).o \
-$(SRC)/image-db.$(ARCH).o \
 $(SRC)/in_image.$(ARCH).o \
-$(SRC)/load_pt_catalog.$(ARCH).o \
-$(SRC)/load_subpix.$(ARCH).o \
-$(SRC)/mkcatalog.$(ARCH).o \
+$(SRC)/load_subpix.$(ARCH).o \
 $(SRC)/replace_match.$(ARCH).o \
 $(SRC)/SetSignals.$(ARCH).o \
@@ -162,52 +143,4 @@
 $(SRC)/sort_lists.$(ARCH).o \
 $(SRC)/update_coords.$(ARCH).o \
-$(SRC)/wcatalog.$(ARCH).o \
-$(SRC)/Shutdown.$(ARCH).o \
-$(SRC)/edge_check.$(ARCH).o \
-$(SRC)/opening_angle.$(ARCH).o \
-$(SRC)/NewImage.$(ARCH).o \
-$(SRC)/NewReflist.$(ARCH).o \
-$(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
-$(SRC)/NewRefcat.$(ARCH).o 
-
-ADDSTART = \
-$(SRC)/addstart.$(ARCH).o \
-$(SRC)/DatasetOps.$(ARCH).o \
-$(SRC)/SocketOps.$(ARCH).o \
-$(SRC)/ConfigInit.$(ARCH).o \
-$(SRC)/args_server.$(ARCH).o \
-$(SRC)/CheckPassword.$(ARCH).o \
-$(SRC)/UpdateDatabase_Image.$(ARCH).o \
-$(SRC)/UpdateDatabase_Reflist.$(ARCH).o \
-$(SRC)/UpdateDatabase_Refcat.$(ARCH).o \
-$(SRC)/airmass.$(ARCH).o \
-$(SRC)/build_links.$(ARCH).o \
-$(SRC)/calibrate.$(ARCH).o \
-$(SRC)/find_matches.$(ARCH).o \
-$(SRC)/find_matches_closest.$(ARCH).o \
-$(SRC)/find_matches_refstars.$(ARCH).o \
-$(SRC)/find_subset.$(ARCH).o \
-$(SRC)/get2mass.$(ARCH).o \
-$(SRC)/get2mass_as.$(ARCH).o \
-$(SRC)/get2mass_dr2.$(ARCH).o \
-$(SRC)/getgsc.$(ARCH).o \
-$(SRC)/getusno.$(ARCH).o \
-$(SRC)/getusnob.$(ARCH).o \
-$(SRC)/gettycho.$(ARCH).o \
-$(SRC)/greference.$(ARCH).o \
-$(SRC)/gcatalog.$(ARCH).o \
-$(SRC)/gimages.$(ARCH).o \
-$(SRC)/image-db.$(ARCH).o \
-$(SRC)/in_image.$(ARCH).o \
-$(SRC)/load_pt_catalog.$(ARCH).o \
-$(SRC)/load_subpix.$(ARCH).o \
-$(SRC)/mkcatalog.$(ARCH).o \
-$(SRC)/replace_match.$(ARCH).o \
-$(SRC)/SetSignals.$(ARCH).o \
-$(SRC)/SkyRegionUtils.$(ARCH).o \
-$(SRC)/SkyListForStars.$(ARCH).o \
-$(SRC)/sort_lists.$(ARCH).o \
-$(SRC)/update_coords.$(ARCH).o \
-$(SRC)/wcatalog.$(ARCH).o \
 $(SRC)/Shutdown.$(ARCH).o \
 $(SRC)/edge_check.$(ARCH).o \
@@ -233,4 +166,35 @@
 $(SRC)/args_client.$(ARCH).o
 
+### this program may need to be repaired (EAM 2006.08)
+MKACC-2MASS = \
+$(SRC)/mkacc-2mass.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
+$(SRC)/get2mass_as.$(ARCH).o
+
+LOAD-2MASS = \
+$(SRC)/load2mass.$(ARCH).o \
+$(SRC)/load2mass_as_rawdata.$(ARCH).o \
+$(SRC)/load2mass_catalog.$(ARCH).o \
+$(SRC)/get2mass_ops.$(ARCH).o \
+$(SRC)/find_matches_refstars.$(ARCH).o \
+$(SRC)/args_load2mass.$(ARCH).o \
+$(SRC)/sort_lists.$(ARCH).o \
+$(SRC)/replace_match.$(ARCH).o \
+$(SRC)/update_coords.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o
+
+SEDSTAR = \
+$(SRC)/sedstar.$(ARCH).o \
+$(SRC)/SEDtableLoad.$(ARCH).o \
+$(SRC)/SEDfit.$(ARCH).o \
+$(SRC)/SEDops.$(ARCH).o \
+$(SRC)/args_sedstar.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o
+
 $(ADDSTARC) : $(INC)/addstar.h
 $(ADDSTARD) : $(INC)/addstar.h
@@ -252,13 +216,11 @@
 $(BIN)/addstarc.$(ARCH) : $(ADDSTARC)
 
-gztest                  : $(BIN)/gztest.$(ARCH)
-
 mkacc-2mass                : $(BIN)/mkacc-2mass.$(ARCH)
 $(BIN)/mkacc-2mass.$(ARCH) : $(MKACC-2MASS)
 mkacc-2mass.install        : $(DESTBIN)/mkacc-2mass
 
-scan2mass                : $(BIN)/scan2mass.$(ARCH)
-$(BIN)/scan2mass.$(ARCH) : $(SCAN-2MASS)
-scan2mass.install        : $(DESTBIN)/scan2mass
+sedstar                  : $(BIN)/sedstar.$(ARCH)
+$(BIN)/sedstar.$(ARCH)   : $(SEDSTAR)
+sedstar.install          : $(DESTBIN)/sedstar
 
 load2mass                : $(BIN)/load2mass.$(ARCH)
@@ -266,9 +228,7 @@
 load2mass.install        : $(DESTBIN)/load2mass
 
-sedstar                  : $(BIN)/sedstar.$(ARCH)
-$(BIN)/sedstar.$(ARCH)   : $(SEDSTAR)
-sedstar.install          : $(DESTBIN)/sedstar
-
-all: addstar addstarc addstard addstart 
+gztest                  : $(BIN)/gztest.$(ARCH)
+
+all: addstar addstarc addstard addstart sedstar load2mass
 
 INSTALL = addstar