Changeset 33448 for branches/eam_branches/ipp-20111122/Ohana/src/relastro/Makefile

Timestamp:

Mar 9, 2012, 7:14:51 AM (14 years ago)

Author:

eugene

Message:

clean top-level function to move the former default mode into relastro_images; adapt to -parallel mode, including the use of MeasureTiny in relastro_images; add relastro_client, etc; make sure high-speed mode also gets a copy of the photcode table, skytable, and images; for high-speed, make an empty WHERE the default (and print the WHERE actually used); move star maps to a block in relastro_images, not load_catalog; drop the UserCatalog global (-catalog RA DEC now just defines a UserPatch value); dropped unused -dophot and -area options

File:

• branches/eam_branches/ipp-20111122/Ohana/src/relastro/Makefile (modified) (4 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/relastro/Makefile

@@ -1 @@
-default: relastro
+default: relastro relastro_client
 help:
         @echo "make options: relastro (default)"
@@ -18 +18 @@
 
 relastro: $(BIN)/relastro.$(ARCH)
-install: $(DESTBIN)/relastro $(DESTBIN)/testparallax
+relastro_client: $(BIN)/relastro_client.$(ARCH)
+
+install: $(DESTBIN)/relastro $(DESTBIN)/relastro_client $(DESTBIN)/testparallax
 
 RELASTRO = \
@@ -53 +55 @@
 $(SRC)/select_images.$(ARCH).o       \
 $(SRC)/relastro.$(ARCH).o            \
+$(SRC)/relastro_images.$(ARCH).o    \
 $(SRC)/relastro_objects.$(ARCH).o    \
 $(SRC)/save_catalogs.$(ARCH).o       \
-$(SRC)/write_coords.$(ARCH).o        \
 $(SRC)/CoordOps.$(ARCH).o            \
 $(SRC)/FixProblemImages.$(ARCH).o    \
@@ -64 +66 @@
 $(SRC)/relastro_merge_source.$(ARCH).o  \
 $(SRC)/resort_catalog.$(ARCH).o  \
+$(SRC)/BrightCatalog.$(ARCH).o  \
 $(SRC)/relastroVisual.$(ARCH).o
+
+#$(SRC)/write_coords.$(ARCH).o        \
 
 $(RELASTRO): $(INC)/relastro.h $(KAPA_INCS)
 $(BIN)/relastro.$(ARCH): $(RELASTRO) $(KAPA_LIBS)
+
+RELASTRO_CLIENT = \
+$(SRC)/ConfigInit.$(ARCH).o          \
+$(SRC)/FitPM.$(ARCH).o               \
+$(SRC)/FitPar.$(ARCH).o              \
+$(SRC)/FitPMandPar.$(ARCH).o         \
+$(SRC)/FitSimple.$(ARCH).o           \
+$(SRC)/ImageOps.$(ARCH).o            \
+$(SRC)/MosaicOps.$(ARCH).o           \
+$(SRC)/ParFactor.$(ARCH).o           \
+$(SRC)/SetSignals.$(ARCH).o          \
+$(SRC)/Shutdown.$(ARCH).o            \
+$(SRC)/UpdateObjects.$(ARCH).o       \
+$(SRC)/UpdateObjectOffsets.$(ARCH).o \
+$(SRC)/UpdateMeasures.$(ARCH).o      \
+$(SRC)/GetAstromError.$(ARCH).o      \
+$(SRC)/args.$(ARCH).o                \
+$(SRC)/bcatalog.$(ARCH).o            \
+$(SRC)/dvo_astrom_ops.$(ARCH).o      \
+$(SRC)/fitpoly.$(ARCH).o             \
+$(SRC)/initialize.$(ARCH).o          \
+$(SRC)/liststats.$(ARCH).o           \
+$(SRC)/load_catalogs.$(ARCH).o       \
+$(SRC)/load_images.$(ARCH).o         \
+$(SRC)/mkpolyterm.$(ARCH).o          \
+$(SRC)/select_images.$(ARCH).o       \
+$(SRC)/relastro_client.$(ARCH).o        \
+$(SRC)/relastro_objects.$(ARCH).o    \
+$(SRC)/save_catalogs.$(ARCH).o       \
+$(SRC)/CoordOps.$(ARCH).o            \
+$(SRC)/high_speed_catalogs.$(ARCH).o  \
+$(SRC)/high_speed_objects.$(ARCH).o  \
+$(SRC)/high_speed_utils.$(ARCH).o  \
+$(SRC)/relastro_merge_source.$(ARCH).o  \
+$(SRC)/resort_catalog.$(ARCH).o  \
+$(SRC)/plot_scatter.$(ARCH).o        \
+$(SRC)/plotstuff.$(ARCH).o           \
+$(SRC)/relastroVisual.$(ARCH).o \
+$(SRC)/BrightCatalog.$(ARCH).o 
+
+#$(SRC)/FitChip.$(ARCH).o             \
+#$(SRC)/FitMosaic.$(ARCH).o           \
+#$(SRC)/UpdateChips.$(ARCH).o         \
+#$(SRC)/UpdateMosaic.$(ARCH).o        \
+#$(SRC)/UpdateSimple.$(ARCH).o        \
+#$(SRC)/write_coords.$(ARCH).o        \
+#$(SRC)/FixProblemImages.$(ARCH).o    \
+#$(SRC)/StarMaps.$(ARCH).o    \
+
+$(RELASTRO_CLIENT): $(INC)/relastro.h $(KAPA_INCS)
+$(BIN)/relastro_client.$(ARCH): $(RELASTRO_CLIENT) $(KAPA_LIBS)
 
 testparallax: $(BIN)/testparallax.$(ARCH)