Changeset 37822 for branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/relastro/Makefile

Timestamp:

Jan 12, 2015, 12:29:24 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-pv3-20140717-merge/Ohana

Files:

• . (modified) (1 prop)
• src/relastro/Makefile (modified) (5 diffs)

branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/relastro/Makefile

@@ -59 +59 @@
 $(SRC)/save_catalogs.$(ARCH).o       \
 $(SRC)/CoordOps.$(ARCH).o            \
-$(SRC)/FixProblemImages.$(ARCH).o    \
+$(SRC)/extra.$(ARCH).o            \
 $(SRC)/StarMaps.$(ARCH).o    \
 $(SRC)/high_speed_catalogs.$(ARCH).o  \
@@ -74 +74 @@
 $(SRC)/relastro_parallel_regions.$(ARCH).o \
 $(SRC)/MeanPosIO.$(ARCH).o \
+$(SRC)/MeasPosIO.$(ARCH).o \
 $(SRC)/share_mean_pos.$(ARCH).o \
+$(SRC)/share_meas_pos.$(ARCH).o \
 $(SRC)/share_images_pos.$(ARCH).o \
+$(SRC)/share_icrf_obj.$(ARCH).o \
+$(SRC)/ICRF.$(ARCH).o \
+$(SRC)/ICRFobjIO.$(ARCH).o \
+$(SRC)/FrameCorrection.$(ARCH).o \
+$(SRC)/FrameCorrectionIO.$(ARCH).o \
+$(SRC)/FrameCorrectionUtils.$(ARCH).o \
 $(SRC)/ImagePosIO.$(ARCH).o \
 $(SRC)/ImageTable.$(ARCH).o \
@@ -81 +89 @@
 $(SRC)/indexCatalogs.$(ARCH).o \
 $(SRC)/syncfile.$(ARCH).o \
+$(SRC)/client_logger.$(ARCH).o \
 $(SRC)/relastroVisual.$(ARCH).o
 
@@ -116 +125 @@
 $(SRC)/relastro_objects.$(ARCH).o    \
 $(SRC)/save_catalogs.$(ARCH).o       \
-$(SRC)/CoordOps.$(ARCH).o            \
+$(SRC)/extra.$(ARCH).o            \
 $(SRC)/high_speed_catalogs.$(ARCH).o  \
 $(SRC)/high_speed_objects.$(ARCH).o  \
@@ -126 +135 @@
 $(SRC)/plot_scatter.$(ARCH).o        \
 $(SRC)/plotstuff.$(ARCH).o           \
+$(SRC)/ICRF.$(ARCH).o \
 $(SRC)/relastroVisual.$(ARCH).o \
 $(SRC)/syncfile.$(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