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

Timestamp:

Apr 16, 2020, 1:54:47 PM (6 years ago)

Author:

tdeboer

Message:

revert to working Ohana build

File:

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

trunk/Ohana/src/addstar/Makefile

@@ -27 +27 @@
 loadgaia     : $(BIN)/loadgaia.$(ARCH)
 loadgaia_dr2 : $(BIN)/loadgaia_dr2.$(ARCH)
-loadukirt_uhs : $(BIN)/loadukirt_uhs.$(ARCH)
 loadstarpar  : $(BIN)/loadstarpar.$(ARCH)
 loadstarpar_client : $(BIN)/loadstarpar_client.$(ARCH)
@@ -45 +44 @@
 # programs in 'SERVER' use the client-server concept and are out of date
 
-INSTALL = addstar addstar_client sedstar loadgalphot loadgaia loadgaia_dr2 loadukirt_uhs loadstarpar loadstarpar_client setobjflags setobjflags_client loadICRF loadICRF_client skycells mkcmf dumpskycells findskycell load2mass loadwise loadtycho loadbsc loadsupercos 
+INSTALL = addstar addstar_client sedstar loadgalphot loadgaia loadgaia_dr2 loadstarpar loadstarpar_client setobjflags setobjflags_client loadICRF loadICRF_client skycells mkcmf dumpskycells findskycell load2mass loadwise loadtycho loadbsc loadsupercos 
 SERVER  = addstarc addstard addstart
 
@@ -306 +305 @@
 $(SRC)/psps_ids.$(ARCH).o
 
-LOAD-UKIRT_UHS = \
-$(SRC)/loadukirt_uhs.$(ARCH).o \
-$(SRC)/ConfigInit.$(ARCH).o \
-$(SRC)/SetSignals.$(ARCH).o \
-$(SRC)/Shutdown.$(ARCH).o \
-$(SRC)/args_loadukirt_uhs.$(ARCH).o \
-$(SRC)/find_matches_ukirt_uhs.$(ARCH).o \
-$(SRC)/loadukirt_uhs_catalog.$(ARCH).o \
-$(SRC)/loadukirt_uhs_make_subset.$(ARCH).o \
-$(SRC)/loadukirt_uhs_readstars.$(ARCH).o \
-$(SRC)/loadukirt_uhs_readstars_uhs.$(ARCH).o \
-$(SRC)/loadukirt_uhs_readstars_ugcs.$(ARCH).o \
-$(SRC)/loadukirt_uhs_readstars_ugps.$(ARCH).o \
-$(SRC)/loadukirt_uhs_readstars_ulas.$(ARCH).o \
-$(SRC)/loadukirt_uhs_table.$(ARCH).o \
-$(SRC)/parse_csv.$(ARCH).o \
-$(SRC)/resort_catalog.$(ARCH).o \
-$(SRC)/build_links.$(ARCH).o \
-$(SRC)/strhash.$(ARCH).o \
-$(SRC)/sortIDs.$(ARCH).o \
-$(SRC)/psps_ids.$(ARCH).o
-
 LOAD-STARPAR = \
 $(SRC)/loadstarpar.$(ARCH).o \
@@ -551 +528 @@
 $(LOAD-GAIA)           : $(INC)/addstar.h $(INC)/gaia.h
 $(LOAD-GAIA_DR2)       : $(INC)/addstar.h $(INC)/gaia_dr2.h
-$(LOAD-UKIRT_UHS)      : $(INC)/addstar.h $(INC)/ukirt_uhs.h
 $(LOAD-STARPAR)        : $(INC)/addstar.h $(INC)/loadstarpar.h
 $(LOAD-STARPAR-CLIENT) : $(INC)/addstar.h $(INC)/loadstarpar.h
@@ -575 +551 @@
 $(BIN)/loadgaia.$(ARCH)       : $(LOAD-GAIA)
 $(BIN)/loadgaia_dr2.$(ARCH)   : $(LOAD-GAIA_DR2)
-$(BIN)/loadukirt_uhs.$(ARCH)  : $(LOAD-UKIRT_UHS)
 $(BIN)/loadstarpar.$(ARCH)    : $(LOAD-STARPAR)
 $(BIN)/loadstarpar_client.$(ARCH) : $(LOAD-STARPAR-CLIENT)