Context Navigation

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:

Property svn:mergeinfo set to

/branches/eam_branches/ipp-20140206/Ohana	merged	eligible
/branches/eam_branches/ipp-20140214/Ohana	merged	eligible
/branches/eam_branches/ipp-20140226/Ohana	merged	eligible
/branches/eam_branches/ipp-20140402/Ohana	merged	eligible
/branches/eam_branches/ipp-20140423/Ohana	merged	eligible
/branches/eam_branches/ipp-20140610/Ohana	merged	eligible
/branches/eam_branches/ipp-20140717/Ohana	merged	eligible
/branches/eam_branches/ipp-20140813/Ohana	merged	eligible
/branches/eam_branches/ipp-20140904/Ohana	merged	eligible
/branches/eam_branches/ipp-ops-20130712/Ohana	merged	eligible
/branches/eam_branches/ps2-tc3-20130727/Ohana	merged	eligible
/tags/ipp-20130712/Ohana	merged	eligible
/tags/ipp-20140114/Ohana	merged	eligible
/tags/ipp-20141119/Ohana	merged	eligible
/tags/ipp-20141224/Ohana	merged	eligible
/trunk/Ohana	merged	eligible

-              r33646
+              r37822
 $(SRC)/time.$(ARCH).o            \
 $(SRC)/gaussj.$(ARCH).o          \
+$(SRC)/spherical.$(ARCH).o       \
+$(SRC)/vstats.$(ARCH).o          \
 $(SRC)/config.$(ARCH).o          \
 $(SRC)/Fread.$(ARCH).o           \
 …
 $(SRC)/gprint.$(ARCH).o  \
 $(SRC)/version.$(ARCH).o
+# $(SRC)/legendre.$(ARCH).o      \
+# $(SRC)/gsl_utils.$(ARCH).o     \
 TYPETEST = \

Note: See TracChangeset for help on using the changeset viewer.