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

Timestamp:

Jun 12, 2015, 10:29:47 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM branch ipp-20150419

File:

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

trunk/Ohana/src/addstar/Makefile

@@ -29 +29 @@
 loadICRF_client : $(BIN)/loadICRF_client.$(ARCH)
 loadwise     : $(BIN)/loadwise.$(ARCH)
+loadtycho    : $(BIN)/loadtycho.$(ARCH)
 dumpskycells : $(BIN)/dumpskycells.$(ARCH)
 findskycell  : $(BIN)/findskycell.$(ARCH)
@@ -35 +36 @@
 mkcmf        : $(BIN)/mkcmf.$(ARCH)
 
-all: addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadsupercos dumpskycells findskycell
-
-INSTALL = addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadsupercos dumpskycells findskycell
+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
 
 # I need to fix the client/server version of addstar now that I have dropped Stars
@@ -49 +50 @@
 $(SRC)/SkyListForStars.$(ARCH).o \
 $(SRC)/SkyRegionUtils.$(ARCH).o \
-$(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
 $(SRC)/addstar.$(ARCH).o \
 $(SRC)/addstar_create_ID.$(ARCH).o \
@@ -65 +65 @@
 $(SRC)/find_subset.$(ARCH).o \
 $(SRC)/getgsc.$(ARCH).o \
-$(SRC)/gettycho.$(ARCH).o \
 $(SRC)/getusno.$(ARCH).o \
 $(SRC)/getusnob.$(ARCH).o \
@@ -76 +75 @@
 $(SRC)/LoadData.$(ARCH).o \
 $(SRC)/LoadDataSDSS.$(ARCH).o \
+$(SRC)/LoadDataUKIRT.$(ARCH).o \
 $(SRC)/LoadDataPMM.$(ARCH).o \
 $(SRC)/in_image.$(ARCH).o \
@@ -90 +90 @@
 $(SRC)/ReadStarsTEXT.$(ARCH).o \
 $(SRC)/ReadStarsSDSS.$(ARCH).o \
+$(SRC)/ReadStarsUKIRT.$(ARCH).o \
 $(SRC)/ReadXradFITS.$(ARCH).o \
 $(SRC)/FilterStars.$(ARCH).o \
@@ -125 +126 @@
 $(SRC)/SkyListForStars.$(ARCH).o \
 $(SRC)/SkyRegionUtils.$(ARCH).o \
-$(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
 $(SRC)/SocketOps.$(ARCH).o \
 $(SRC)/UpdateDatabase_Image.$(ARCH).o \
@@ -141 +141 @@
 $(SRC)/find_subset.$(ARCH).o \
 $(SRC)/getgsc.$(ARCH).o \
-$(SRC)/gettycho.$(ARCH).o \
 $(SRC)/getusno.$(ARCH).o \
 $(SRC)/getusnob.$(ARCH).o \
@@ -174 +173 @@
 $(SRC)/getusno.$(ARCH).o \
 $(SRC)/getusnob.$(ARCH).o \
-$(SRC)/gettycho.$(ARCH).o \
 $(SRC)/greference.$(ARCH).o \
 $(SRC)/in_image.$(ARCH).o \
@@ -186 +184 @@
 $(SRC)/edge_check.$(ARCH).o \
 $(SRC)/opening_angle.$(ARCH).o \
-$(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
 $(SRC)/ListenClients_Thread.$(ARCH).o \
 $(SRC)/NewImage_Thread.$(ARCH).o \
@@ -204 +201 @@
 $(SRC)/LoadData.$(ARCH).o \
 $(SRC)/LoadDataSDSS.$(ARCH).o \
+$(SRC)/LoadDataUKIRT.$(ARCH).o \
 $(SRC)/LoadDataPMM.$(ARCH).o \
 $(SRC)/grefstars.$(ARCH).o \
@@ -213 +211 @@
 $(SRC)/ReadStarsTEXT.$(ARCH).o \
 $(SRC)/ReadStarsSDSS.$(ARCH).o \
+$(SRC)/ReadStarsUKIRT.$(ARCH).o \
 $(SRC)/ImageIndex.$(ARCH).o \
 $(SRC)/UpdateImageIDs.$(ARCH).o \
@@ -323 +322 @@
 $(SRC)/StarOps.$(ARCH).o \
 $(SRC)/find_matches_refstars.$(ARCH).o \
+$(SRC)/build_links.$(ARCH).o \
+$(SRC)/replace_match.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
+$(SRC)/update_coords.$(ARCH).o \
+$(SRC)/SkyRegionUtils.$(ARCH).o \
+$(SRC)/psps_ids.$(ARCH).o
+
+LOAD-TYCHO = \
+$(SRC)/loadtycho.$(ARCH).o \
+$(SRC)/loadtycho_rawdata.$(ARCH).o \
+$(SRC)/loadtycho_ops.$(ARCH).o \
+$(SRC)/args_loadtycho.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/find_matches_closest_refstars.$(ARCH).o \
 $(SRC)/build_links.$(ARCH).o \
 $(SRC)/replace_match.$(ARCH).o \
@@ -406 +420 @@
 $(BIN)/load2mass.$(ARCH)      : $(LOAD-2MASS)
 $(BIN)/loadwise.$(ARCH)       : $(LOAD-WISE)
+$(BIN)/loadtycho.$(ARCH)      : $(LOAD-TYCHO)
 $(BIN)/loadstarpar.$(ARCH)    : $(LOAD-STARPAR)
 $(BIN)/loadstarpar_client.$(ARCH) : $(LOAD-STARPAR-CLIENT)