Changeset 37822 for branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/libdvo/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/libdvo/Makefile (modified) (4 diffs)

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

@@ -38 +38 @@
 $(DESTINC)/ps1_v5_defs.h \
 $(DESTINC)/ps1_ref_defs.h \
+$(DESTINC)/ps1_sim_defs.h \
 $(DESTINC)/cmf-ps1-dv3.h \
 $(DESTINC)/cmf-ps1-v5.h \
 $(DESTINC)/cmf-ps1-sv3.h \
-$(DESTINC)/cmf-ps1-v5-lensing.h
+$(DESTINC)/cmf-ps1-sv4.h \
+$(DESTINC)/cmf-ps1-v5-lensing.h \
+$(DESTINC)/cmf-ps1-v5-lensing-alt.h
 
 INCS = $(DEFS) $(DESTINC)/dvo.h $(DESTINC)/autocode.h $(DESTINC)/dvo_util.h $(DESTINC)/dvodb.h $(DESTINC)/libdvo_astro.h $(DESTINC)/convert.h $(DESTINC)/get_graphdata.h
@@ -48 +51 @@
 $(SRC)/version.$(ARCH).o         \
 $(SRC)/coordops.$(ARCH).o        \
+$(SRC)/galaxy_model.$(ARCH).o    \
 $(SRC)/dvosorts.$(ARCH).o        \
 $(SRC)/dvo_photcode_ops.$(ARCH).o \
@@ -82 +86 @@
 $(SRC)/dvo_convert_PS1_V5.$(ARCH).o \
 $(SRC)/dvo_convert_PS1_REF.$(ARCH).o \
+$(SRC)/dvo_convert_PS1_SIM.$(ARCH).o \
 $(SRC)/flatcorr_io.$(ARCH).o    \
 $(SRC)/skyregion_io.$(ARCH).o    \
 $(SRC)/skyregion_gsc.$(ARCH).o    \
 $(SRC)/skyregion_ops.$(ARCH).o \
+$(SRC)/AstromOffsetMapIO.$(ARCH).o    \
+$(SRC)/AstromOffsetMapOps.$(ARCH).o \
+$(SRC)/AstromOffsetMapUtils.$(ARCH).o \
 $(SRC)/dvo_set_skyregion.$(ARCH).o \
 $(SRC)/dvo_set_catdir.$(ARCH).o \
@@ -92 +100 @@
 $(SRC)/cmf-ps1-dv3.$(ARCH).o \
 $(SRC)/cmf-ps1-sv3.$(ARCH).o \
+$(SRC)/cmf-ps1-sv4.$(ARCH).o \
 $(SRC)/cmf-ps1-v5.$(ARCH).o \
 $(SRC)/cmf-ps1-v5-lensing.$(ARCH).o \
+$(SRC)/cmf-ps1-v5-lensing-alt.$(ARCH).o \
 $(SRC)/dvo_util.$(ARCH).o \
 $(SRC)/dbBooleanCond.$(ARCH).o          \