Index: trunk/Ohana/src/addstar/Makefile
===================================================================
--- trunk/Ohana/src/addstar/Makefile	(revision 38636)
+++ trunk/Ohana/src/addstar/Makefile	(revision 38986)
@@ -37,33 +37,13 @@
 mkcmf        : $(BIN)/mkcmf.$(ARCH)
 
-# programs in 'OTHERS' have not been updated since moving from Stars to Catalog as an internal carrier
 # programs in 'SERVER' use the client-server concept and are out of date
 
-INSTALL = addstar sedstar loadgalphot loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf dumpskycells findskycell
-OTHERS  = load2mass loadwise loadtycho loadsupercos
+INSTALL = addstar sedstar loadgalphot loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf dumpskycells findskycell load2mass loadwise loadtycho loadsupercos
 SERVER  = addstar_client addstarc addstard addstart
 
-old: $(OTHERS)
 all: $(INSTALL)
 
 # I need to fix the client/server version of addstar now that I have dropped Stars
 # as an autocode type and have converted to carrying average and measure
-# all: addstar sedstar load2mass skycells
-
-# $(SRC)/find_matches.$(ARCH).o \
-# $(SRC)/find_matches_closest.$(ARCH).o \
-# $(SRC)/find_matches_refstars.$(ARCH).o \
-# $(SRC)/find_matches_closest_refstars.$(ARCH).o \
-# $(SRC)/find_subset.$(ARCH).o \
-# $(SRC)/getgsc.$(ARCH).o \
-# $(SRC)/getusno.$(ARCH).o \
-# $(SRC)/getusnob.$(ARCH).o \
-# $(SRC)/greference.$(ARCH).o \
-# $(SRC)/grefstars.$(ARCH).o \
-# $(SRC)/dump.$(ARCH).o \
-# $(SRC)/ReadStarsTEXT.$(ARCH).o \
-# $(SRC)/StarOps.$(ARCH).o \
-# $(SRC)/replace_match.$(ARCH).o \
-# 
 
 ADDSTAR = \
@@ -104,4 +84,14 @@
 $(SRC)/ReadStarsUKIRT.$(ARCH).o \
 $(SRC)/ReadXradFITS.$(ARCH).o \
+$(SRC)/find_matches.$(ARCH).o \
+$(SRC)/find_matches_closest.$(ARCH).o \
+$(SRC)/find_matches_refstars.$(ARCH).o \
+$(SRC)/find_matches_closest_refstars.$(ARCH).o \
+$(SRC)/getgsc.$(ARCH).o \
+$(SRC)/getusno.$(ARCH).o \
+$(SRC)/getusnob.$(ARCH).o \
+$(SRC)/greference.$(ARCH).o \
+$(SRC)/grefstars.$(ARCH).o \
+$(SRC)/replace_match.$(ARCH).o \
 $(SRC)/FilterStars.$(ARCH).o \
 $(SRC)/ImageOptions.$(ARCH).o \
@@ -112,6 +102,4 @@
 $(SRC)/update_coords.$(ARCH).o \
 $(SRC)/psps_ids.$(ARCH).o
-
-##
 
 # this is the client for parallel operations
@@ -243,5 +231,4 @@
 $(SRC)/load2mass.$(ARCH).o \
 $(SRC)/load2mass_as_rawdata.$(ARCH).o \
-$(SRC)/load2mass_catalog.$(ARCH).o \
 $(SRC)/get2mass_ops.$(ARCH).o \
 $(SRC)/get2mass_full.$(ARCH).o \
@@ -252,9 +239,10 @@
 $(SRC)/update_coords.$(ARCH).o \
 $(SRC)/SkyRegionUtils.$(ARCH).o \
-$(SRC)/StarOps.$(ARCH).o \
-$(SRC)/ConfigInit.$(ARCH).o \
-$(SRC)/Shutdown.$(ARCH).o \
-$(SRC)/SetSignals.$(ARCH).o \
-$(SRC)/psps_ids.$(ARCH).o
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
+$(SRC)/psps_ids.$(ARCH).o
+
+# $(SRC)/load2mass_catalog.$(ARCH).o 
 
 LOAD-GALPHOT = \
@@ -296,4 +284,5 @@
 $(SRC)/loadstarpar_save_remote.$(ARCH).o \
 $(SRC)/loadstarpar_table.$(ARCH).o \
+$(SRC)/loadstarpar_extras.$(ARCH).o \
 $(SRC)/resort_catalog.$(ARCH).o \
 $(SRC)/psps_ids.$(ARCH).o
@@ -314,6 +303,9 @@
 $(SRC)/loadstarpar_save_remote.$(ARCH).o \
 $(SRC)/loadstarpar_table.$(ARCH).o \
+$(SRC)/loadstarpar_extras.$(ARCH).o \
 $(SRC)/resort_catalog.$(ARCH).o \
 $(SRC)/psps_ids.$(ARCH).o
+
+# drop resort_catalog?
 
 LOAD-ICRF = \
@@ -359,5 +351,4 @@
 $(SRC)/ConfigInit.$(ARCH).o \
 $(SRC)/Shutdown.$(ARCH).o \
-$(SRC)/StarOps.$(ARCH).o \
 $(SRC)/find_matches_refstars.$(ARCH).o \
 $(SRC)/build_links.$(ARCH).o \
@@ -376,4 +367,5 @@
 $(SRC)/Shutdown.$(ARCH).o \
 $(SRC)/find_matches_closest_refstars.$(ARCH).o \
+$(SRC)/replace_match.$(ARCH).o \
 $(SRC)/build_links.$(ARCH).o \
 $(SRC)/SetSignals.$(ARCH).o \
@@ -391,5 +383,5 @@
 $(SRC)/ConfigInit.$(ARCH).o \
 $(SRC)/Shutdown.$(ARCH).o \
-$(SRC)/StarOps.$(ARCH).o \
+$(SRC)/SkyListForStars.$(ARCH).o \
 $(SRC)/find_matches_refstars.$(ARCH).o \
 $(SRC)/build_links.$(ARCH).o \