Index: trunk/Ohana/src/addstar/Makefile
===================================================================
--- trunk/Ohana/src/addstar/Makefile	(revision 33719)
+++ trunk/Ohana/src/addstar/Makefile	(revision 33963)
@@ -29,7 +29,7 @@
 mkcmf       : $(BIN)/mkcmf.$(ARCH)
 
-all: addstar sedstar load2mass skycells mkcmf loadwise loadsupercos dumpskycells
-
-INSTALL = addstar sedstar load2mass skycells mkcmf loadwise loadsupercos dumpskycells
+all: addstar addstar_client sedstar load2mass skycells mkcmf loadwise loadsupercos dumpskycells
+
+INSTALL = addstar addstar_client sedstar load2mass skycells mkcmf loadwise loadsupercos dumpskycells
 
 # I need to fix the client/server version of addstar now that I have dropped Stars
@@ -78,4 +78,5 @@
 $(SRC)/resort_threaded.$(ARCH).o \
 $(SRC)/resort_unthreaded.$(ARCH).o \
+$(SRC)/resort_unthreaded_catalogs.$(ARCH).o \
 $(SRC)/StarOps.$(ARCH).o \
 $(SRC)/ReadStarsFITS.$(ARCH).o \
@@ -89,4 +90,19 @@
 $(SRC)/update_coords.$(ARCH).o \
 $(SRC)/psps_ids.$(ARCH).o
+
+# this is the client for parallel operations
+ADDSTAR_CLIENT = \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/SkyListForStars.$(ARCH).o \
+$(SRC)/SkyRegionUtils.$(ARCH).o \
+$(SRC)/build_links.$(ARCH).o \
+$(SRC)/addstar_client.$(ARCH).o \
+$(SRC)/args_parallel_client.$(ARCH).o \
+$(SRC)/resort_catalog.$(ARCH).o \
+$(SRC)/resort_threaded.$(ARCH).o \
+$(SRC)/resort_unthreaded.$(ARCH).o \
+$(SRC)/resort_unthreaded_catalogs.$(ARCH).o
 
 ADDSTARD = \
@@ -168,4 +184,5 @@
 $(SRC)/psps_ids.$(ARCH).o
 
+# this is the client for server / client addstar operations
 ADDSTARC = \
 $(SRC)/addstarc.$(ARCH).o \
@@ -220,5 +237,5 @@
 LOAD-WISE = \
 $(SRC)/loadwise.$(ARCH).o \
-$(SRC)/loadwise_prelim_rawdata.$(ARCH).o \
+$(SRC)/loadwise_rawdata.$(ARCH).o \
 $(SRC)/loadwise_ops.$(ARCH).o \
 $(SRC)/loadwise_star_full.$(ARCH).o \
@@ -282,26 +299,28 @@
 $(SRC)/SetSignals.$(ARCH).o \
 
-$(ADDSTARC)   : $(INC)/addstar.h
-$(ADDSTARD)   : $(INC)/addstar.h
-$(ADDSTART)   : $(INC)/addstar.h
-$(ADDSTAR)    : $(INC)/addstar.h
-$(SKYCELLS)   : $(INC)/addstar.h
-$(DUMPSKYCELLS): $(INC)/addstar.h
-$(LOAD-2MASS) : $(INC)/addstar.h $(INC)/2mass.h
-$(LOAD-WISE)  : $(INC)/addstar.h $(INC)/WISE.h
-$(MKCMF)      : $(INC)/mkcmf.h
-
-$(BIN)/addstar.$(ARCH) 	   : $(ADDSTAR)
-$(BIN)/addstard.$(ARCH)	   : $(ADDSTARD)
-$(BIN)/addstart.$(ARCH)	   : $(ADDSTART)
-$(BIN)/addstarc.$(ARCH)	   : $(ADDSTARC)
-$(BIN)/mkacc-2mass.$(ARCH) : $(MKACC-2MASS)
-$(BIN)/sedstar.$(ARCH)     : $(SEDSTAR)
-$(BIN)/load2mass.$(ARCH)   : $(LOAD-2MASS)
-$(BIN)/loadwise.$(ARCH)    : $(LOAD-WISE)
-$(BIN)/loadsupercos.$(ARCH): $(LOAD-SUPERCOS)
-$(BIN)/skycells.$(ARCH)    : $(SKYCELLS)
-$(BIN)/dumpskycells.$(ARCH) : $(DUMPSKYCELLS)
-$(BIN)/mkcmf.$(ARCH)       : $(MKCMF)
+$(ADDSTARC)   	  : $(INC)/addstar.h
+$(ADDSTARD)   	  : $(INC)/addstar.h
+$(ADDSTART)   	  : $(INC)/addstar.h
+$(ADDSTAR)    	  : $(INC)/addstar.h
+$(ADDSTAR_CLIENT) : $(INC)/addstar.h
+$(SKYCELLS)    	  : $(INC)/addstar.h
+$(DUMPSKYCELLS)	  : $(INC)/addstar.h
+$(LOAD-2MASS)  	  : $(INC)/addstar.h $(INC)/2mass.h
+$(LOAD-WISE)   	  : $(INC)/addstar.h $(INC)/WISE.h
+$(MKCMF)       	  : $(INC)/mkcmf.h
+
+$(BIN)/addstar.$(ARCH) 	      : $(ADDSTAR)
+$(BIN)/addstar_client.$(ARCH) : $(ADDSTAR_CLIENT)
+$(BIN)/addstard.$(ARCH)	      : $(ADDSTARD)
+$(BIN)/addstart.$(ARCH)	      : $(ADDSTART)
+$(BIN)/addstarc.$(ARCH)	      : $(ADDSTARC)
+$(BIN)/mkacc-2mass.$(ARCH)    : $(MKACC-2MASS)
+$(BIN)/sedstar.$(ARCH)        : $(SEDSTAR)
+$(BIN)/load2mass.$(ARCH)      : $(LOAD-2MASS)
+$(BIN)/loadwise.$(ARCH)       : $(LOAD-WISE)
+$(BIN)/loadsupercos.$(ARCH)   : $(LOAD-SUPERCOS)
+$(BIN)/skycells.$(ARCH)       : $(SKYCELLS)
+$(BIN)/dumpskycells.$(ARCH)   : $(DUMPSKYCELLS)
+$(BIN)/mkcmf.$(ARCH)          : $(MKCMF)
 
 # I need to fix the client/server version of addstar now that I have dropped Stars