Changeset 39365 for trunk/Ohana/src/relastro/Makefile

Timestamp:

Feb 21, 2016, 6:00:44 AM (10 years ago)

Author:

eugene

Message:

consolidate irls and non-irls fitting; clean up rules for UpdateObjects

File:

• trunk/Ohana/src/relastro/Makefile (modified) (4 diffs)

trunk/Ohana/src/relastro/Makefile

@@ -31 +31 @@
 $(SRC)/FitAstromOps.$(ARCH).o        \
 $(SRC)/FitPM.$(ARCH).o               \
-$(SRC)/FitPM_IRLS.$(ARCH).o          \
 $(SRC)/FitPMandPar.$(ARCH).o         \
-$(SRC)/FitPMandPar_IRLS.$(ARCH).o               \
 $(SRC)/FitPosPMfixed.$(ARCH).o       \
 $(SRC)/BootstrapOps.$(ARCH).o        \
@@ -108 +106 @@
 $(SRC)/FitAstromOps.$(ARCH).o        \
 $(SRC)/FitPM.$(ARCH).o               \
-$(SRC)/FitPM_IRLS.$(ARCH).o          \
 $(SRC)/FitPMandPar.$(ARCH).o         \
-$(SRC)/FitPMandPar_IRLS.$(ARCH).o               \
 $(SRC)/FitPosPMfixed.$(ARCH).o       \
 $(SRC)/BootstrapOps.$(ARCH).o        \
@@ -172 +168 @@
 $(SRC)/ParFactor.$(ARCH).o           \
 $(SRC)/FitAstromOps.$(ARCH).o        \
-$(SRC)/FitPM.$(ARCH).o               \
-$(SRC)/FitPM_IRLS.$(ARCH).o               \
+$(SRC)/FitPosPMfixed.$(ARCH).o               \
+$(SRC)/FitPM.$(ARCH).o               \
 $(SRC)/FitPMandPar.$(ARCH).o               \
-$(SRC)/FitPMandPar_IRLS.$(ARCH).o               \
 $(SRC)/BootstrapOps.$(ARCH).o        \
 $(SRC)/mkpolyterm.$(ARCH).o            \
@@ -182 +177 @@
 $(FITPM): $(INC)/relastro.h
 $(BIN)/fitpm.$(ARCH): $(FITPM)
+
+fitobj: $(BIN)/fitobj.$(ARCH)
+
+FITOBJ = \
+$(SRC)/fitobj.$(ARCH).o               \
+$(SRC)/ParFactor.$(ARCH).o           \
+$(SRC)/FitAstromOps.$(ARCH).o        \
+$(SRC)/FitPosPMfixed.$(ARCH).o               \
+$(SRC)/FitPM.$(ARCH).o               \
+$(SRC)/FitPMandPar.$(ARCH).o               \
+$(SRC)/UpdateObjects.$(ARCH).o               \
+$(SRC)/BootstrapOps.$(ARCH).o        \
+$(SRC)/mkpolyterm.$(ARCH).o            \
+$(SRC)/GetAstromError.$(ARCH).o            \
+$(SRC)/ImageOps.$(ARCH).o            \
+$(SRC)/MosaicOps.$(ARCH).o            \
+$(SRC)/extra.$(ARCH).o            \
+$(SRC)/plotstuff.$(ARCH).o            \
+$(SRC)/fitpoly.$(ARCH).o
+
+$(FITOBJ): $(INC)/relastro.h
+$(BIN)/fitobj.$(ARCH): $(FITOBJ)
+
+# $(SRC)/FitPM_IRLS.$(ARCH).o          \
+# $(SRC)/FitPMandPar_IRLS.$(ARCH).o               \
+# $(SRC)/FitPM_IRLS.$(ARCH).o          \
+# $(SRC)/FitPMandPar_IRLS.$(ARCH).o               \
+# $(SRC)/FitPosPMfixed_IRLS.$(ARCH).o               \
+# $(SRC)/FitPM_IRLS.$(ARCH).o               \
+# $(SRC)/FitPMandPar_IRLS.$(ARCH).o               \