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

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

@@ -1 @@
-default: uniphot setphot setphot_client setfwhm setposangle setposangle_client setastrom setastrom_client fiximids fiximids_client fixstkids fixstkids_client ckids ckids_client
+default: uniphot setphot setphot_client setfwhm setposangle setposangle_client setastrom setastrom_client setgalmodel setgalmodel_client fiximids fiximids_client fixstkids fixstkids_client ckids ckids_client
 help:
 @echo "make options: uniphot setphot setfwhm default help install default (uniphot setphot setfwhm)"
@@ -25 +25 @@
 setastrom: $(BIN)/setastrom.$(ARCH)
 setastrom_client: $(BIN)/setastrom_client.$(ARCH)
+setgalmodel: $(BIN)/setgalmodel.$(ARCH)
+setgalmodel_client: $(BIN)/setgalmodel_client.$(ARCH)
 fiximids: $(BIN)/fiximids.$(ARCH)
 fiximids_client: $(BIN)/fiximids_client.$(ARCH)
@@ -32 +34 @@
 ckids_client: $(BIN)/ckids_client.$(ARCH)
 
-install: $(DESTBIN)/uniphot $(DESTBIN)/setfwhm $(DESTBIN)/setphot $(DESTBIN)/setphot_client $(DESTBIN)/setposangle $(DESTBIN)/setposangle_client $(DESTBIN)/setastrom $(DESTBIN)/setastrom_client $(DESTBIN)/fiximids $(DESTBIN)/fiximids_client $(DESTBIN)/fixstkids $(DESTBIN)/fixstkids_client $(DESTBIN)/ckids $(DESTBIN)/ckids_client
+install: $(DESTBIN)/uniphot $(DESTBIN)/setfwhm $(DESTBIN)/setphot $(DESTBIN)/setphot_client $(DESTBIN)/setposangle $(DESTBIN)/setposangle_client $(DESTBIN)/setastrom $(DESTBIN)/setastrom_client $(DESTBIN)/setgalmodel $(DESTBIN)/setgalmodel_client $(DESTBIN)/fiximids $(DESTBIN)/fiximids_client $(DESTBIN)/fixstkids $(DESTBIN)/fixstkids_client $(DESTBIN)/ckids $(DESTBIN)/ckids_client
 
 UNIPHOT = \
@@ -110 +112 @@
 $(SRC)/setastrom.$(ARCH).o          \
 $(SRC)/initialize_setastrom.$(ARCH).o \
+$(SRC)/dcr_correction.$(ARCH).o \
+$(SRC)/kh_correction.$(ARCH).o \
 $(SRC)/astrom_correction.$(ARCH).o \
 $(SRC)/update_dvo_setastrom.$(ARCH).o \
@@ -123 +127 @@
 $(SRC)/update_dvo_setastrom.$(ARCH).o \
 $(SRC)/update_catalog_setastrom.$(ARCH).o \
+$(SRC)/dcr_correction.$(ARCH).o \
+$(SRC)/kh_correction.$(ARCH).o \
 $(SRC)/astrom_correction.$(ARCH).o \
 $(SRC)/initialize_setastrom.$(ARCH).o
@@ -128 +134 @@
 $(SETASTROM_CLIENT): $(INC)/setastrom.h
 $(BIN)/setastrom_client.$(ARCH): $(SETASTROM_CLIENT)
+
+SETGALMODEL = \
+$(SRC)/setgalmodel.$(ARCH).o        \
+$(SRC)/initialize_setgalmodel.$(ARCH).o \
+$(SRC)/galmodel_correction.$(ARCH).o \
+$(SRC)/update_dvo_setgalmodel.$(ARCH).o \
+$(SRC)/update_catalog_setgalmodel.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o         \
+$(SRC)/Shutdown.$(ARCH).o           
+
+$(SETGALMODEL): $(INC)/setgalmodel.h
+$(BIN)/setgalmodel.$(ARCH): $(SETGALMODEL)
+
+SETGALMODEL_CLIENT = \
+$(SRC)/setgalmodel_client.$(ARCH).o         \
+$(SRC)/update_dvo_setgalmodel.$(ARCH).o \
+$(SRC)/update_catalog_setgalmodel.$(ARCH).o \
+$(SRC)/galmodel_correction.$(ARCH).o \
+$(SRC)/initialize_setgalmodel.$(ARCH).o
+
+$(SETGALMODEL_CLIENT): $(INC)/setgalmodel.h
+$(BIN)/setgalmodel_client.$(ARCH): $(SETGALMODEL_CLIENT)
 
 SETFWHM =                           \