Changeset 38553 for trunk/Ohana/src/addstar/Makefile

Timestamp:

Jun 25, 2015, 10:41:05 PM (11 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/ipp-20150616

File:

• trunk/Ohana/src/addstar/Makefile (modified) (9 diffs)

trunk/Ohana/src/addstar/Makefile

@@ -24 +24 @@
 sedstar      : $(BIN)/sedstar.$(ARCH)
 load2mass    : $(BIN)/load2mass.$(ARCH)
+loadgalphot  : $(BIN)/loadgalphot.$(ARCH)
 loadstarpar  : $(BIN)/loadstarpar.$(ARCH)
 loadstarpar_client : $(BIN)/loadstarpar_client.$(ARCH)
@@ -36 +37 @@
 mkcmf        : $(BIN)/mkcmf.$(ARCH)
 
-all: addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadtycho loadsupercos dumpskycells findskycell
-
-INSTALL = addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadtycho loadsupercos dumpskycells findskycell
+# 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 loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf dumpskycells findskycell
+OTHERS  = 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 addstarc addstard addstart sedstar load2mass skycells
+# 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 = \
@@ -56 +79 @@
 $(SRC)/build_links.$(ARCH).o \
 $(SRC)/calibrate.$(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_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)/GetZeroPointExposure.$(ARCH).o \
+$(SRC)/LoadFilenames.$(ARCH).o \
 $(SRC)/LoadStars.$(ARCH).o \
 $(SRC)/LoadHeaders.$(ARCH).o \
@@ -81 +96 @@
 $(SRC)/opening_angle.$(ARCH).o \
 $(SRC)/parse_time.$(ARCH).o \
-$(SRC)/replace_match.$(ARCH).o \
 $(SRC)/resort_catalogs.$(ARCH).o \
 $(SRC)/resort_threaded.$(ARCH).o \
 $(SRC)/resort_unthreaded.$(ARCH).o \
 $(SRC)/resort_catalog.$(ARCH).o \
-$(SRC)/StarOps.$(ARCH).o \
 $(SRC)/ReadStarsFITS.$(ARCH).o \
-$(SRC)/ReadStarsTEXT.$(ARCH).o \
 $(SRC)/ReadStarsSDSS.$(ARCH).o \
 $(SRC)/ReadStarsUKIRT.$(ARCH).o \
@@ -100 +112 @@
 $(SRC)/update_coords.$(ARCH).o \
 $(SRC)/psps_ids.$(ARCH).o
+
+##
 
 # this is the client for parallel operations
@@ -244 +258 @@
 $(SRC)/psps_ids.$(ARCH).o
 
+LOAD-GALPHOT = \
+$(SRC)/loadgalphot.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/args_loadgalphot.$(ARCH).o \
+$(SRC)/find_matches_galphot.$(ARCH).o \
+$(SRC)/loadgalphot_catalog.$(ARCH).o \
+$(SRC)/loadgalphot_make_subset.$(ARCH).o \
+$(SRC)/loadgalphot_readstars.$(ARCH).o \
+$(SRC)/loadgalphot_fit2d.$(ARCH).o \
+$(SRC)/loadgalphot_join.$(ARCH).o \
+$(SRC)/loadgalphot_table.$(ARCH).o \
+$(SRC)/strhash.$(ARCH).o \
+$(SRC)/sortIDs.$(ARCH).o \
+$(SRC)/psps_ids.$(ARCH).o
+
+# $(SRC)/SkyRegionUtils.$(ARCH).o 
+# $(SRC)/loadstarpar_io.$(ARCH).o 
+# $(SRC)/loadgalphot_remote_hosts.$(ARCH).o 
+# $(SRC)/loadgalphot_save_remote.$(ARCH).o 
+
 LOAD-STARPAR = \
 $(SRC)/loadstarpar.$(ARCH).o \
@@ -338 +374 @@
 $(SRC)/find_matches_closest_refstars.$(ARCH).o \
 $(SRC)/build_links.$(ARCH).o \
-$(SRC)/replace_match.$(ARCH).o \
 $(SRC)/SetSignals.$(ARCH).o \
 $(SRC)/update_coords.$(ARCH).o \
@@ -404 +439 @@
 $(FINDSKYCELL)         : $(INC)/addstar.h
 $(LOAD-2MASS)          : $(INC)/addstar.h $(INC)/2mass.h
+$(LOAD-GALPHOT)        : $(INC)/addstar.h $(INC)/loadgalphot.h
 $(LOAD-STARPAR)        : $(INC)/addstar.h $(INC)/loadstarpar.h
 $(LOAD-STARPAR-CLIENT) : $(INC)/addstar.h $(INC)/loadstarpar.h
@@ -421 +457 @@
 $(BIN)/loadwise.$(ARCH)       : $(LOAD-WISE)
 $(BIN)/loadtycho.$(ARCH)      : $(LOAD-TYCHO)
+$(BIN)/loadgalphot.$(ARCH)    : $(LOAD-GALPHOT)
 $(BIN)/loadstarpar.$(ARCH)    : $(LOAD-STARPAR)
 $(BIN)/loadstarpar_client.$(ARCH) : $(LOAD-STARPAR-CLIENT)