IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 13, 2015, 5:50:46 AM (11 years ago)
Author:
eugene
Message:

merged changes from trunk

Location:
branches/eam_branches/ipp-20151113
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20151113

  • branches/eam_branches/ipp-20151113/Ohana/src/relastro/Makefile

    r38986 r39266  
    1010MAN     =       $(HOME)/doc
    1111INC     =       $(HOME)/include
     12TESTDIR =       $(HOME)/test
     13TESTBIN =       $(HOME)/test
    1214include ../../Makefile.Common
    1315
    … …  
    2224install: $(DESTBIN)/relastro $(DESTBIN)/relastro_client
    2325
    24 # $(DESTBIN)/testparallax
    25 
    2626RELASTRO = \
    2727$(SRC)/ConfigInit.$(ARCH).o          \
    … …  
    2929$(SRC)/FitMosaic.$(ARCH).o           \
    3030$(SRC)/FitSimple.$(ARCH).o           \
    31 $(SRC)/FitAstromOps.$(ARCH).o           \
     31$(SRC)/FitAstromOps.$(ARCH).o        \
    3232$(SRC)/FitPM.$(ARCH).o               \
     33$(SRC)/FitPM_IRLS.$(ARCH).o          \
    3334$(SRC)/FitPMandPar.$(ARCH).o         \
     35$(SRC)/FitPMandPar_IRLS.$(ARCH).o               \
    3436$(SRC)/FitPosPMfixed.$(ARCH).o       \
     37$(SRC)/BootstrapOps.$(ARCH).o        \
    3538$(SRC)/ImageOps.$(ARCH).o            \
    3639$(SRC)/MosaicOps.$(ARCH).o           \
    … …  
    103106$(SRC)/ConfigInit.$(ARCH).o          \
    104107$(SRC)/FitSimple.$(ARCH).o           \
    105 $(SRC)/FitAstromOps.$(ARCH).o           \
     108$(SRC)/FitAstromOps.$(ARCH).o        \
    106109$(SRC)/FitPM.$(ARCH).o               \
     110$(SRC)/FitPM_IRLS.$(ARCH).o          \
    107111$(SRC)/FitPMandPar.$(ARCH).o         \
     112$(SRC)/FitPMandPar_IRLS.$(ARCH).o               \
    108113$(SRC)/FitPosPMfixed.$(ARCH).o       \
     114$(SRC)/BootstrapOps.$(ARCH).o        \
    109115$(SRC)/ImageOps.$(ARCH).o            \
    110116$(SRC)/MosaicOps.$(ARCH).o           \
    … …  
    159165$(TESTPAR): $(INC)/relastro.h
    160166$(BIN)/testparallax.$(ARCH): $(TESTPAR)
     167
     168fitpm: $(BIN)/fitpm.$(ARCH)
     169
     170FITPM = \
     171$(SRC)/fitpm.$(ARCH).o        \
     172$(SRC)/ParFactor.$(ARCH).o           \
     173$(SRC)/FitAstromOps.$(ARCH).o        \
     174$(SRC)/FitPM.$(ARCH).o               \
     175$(SRC)/FitPM_IRLS.$(ARCH).o               \
     176$(SRC)/FitPMandPar.$(ARCH).o               \
     177$(SRC)/FitPMandPar_IRLS.$(ARCH).o               \
     178$(SRC)/BootstrapOps.$(ARCH).o        \
     179$(SRC)/mkpolyterm.$(ARCH).o            \
     180$(SRC)/fitpoly.$(ARCH).o
     181
     182$(FITPM): $(INC)/relastro.h
     183$(BIN)/fitpm.$(ARCH): $(FITPM)
Note: See TracChangeset for help on using the changeset viewer.