Changeset 3806


Ignore:
Timestamp:
Mar 22, 2016 4:13:50 PM (4 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 256147abd1ffb46688686cc6cd53908c9a64d957
end hash code: 13e3d99f3d3a15377d9dc2439fdbe40e9fd6223d

commit 13e3d99f3d3a15377d9dc2439fdbe40e9fd6223d
Author: Brad Bell <bradbell@…>
Date: Tue Mar 22 13:12:11 2016 -0700

Auto-tools automatic changes missing in last commit.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/example/atomic/makefile.in

    r3805 r3806  
    9999CONFIG_CLEAN_VPATH_FILES =
    100100am_atomic_OBJECTS = atomic.$(OBJEXT) checkpoint.$(OBJEXT) \
    101         extended_ode.$(OBJEXT) for_sparse_hes.$(OBJEXT) \
    102         for_sparse_jac.$(OBJEXT) forward.$(OBJEXT) \
    103         get_started.$(OBJEXT) mat_mul.$(OBJEXT) mul_level.$(OBJEXT) \
    104         norm_sq.$(OBJEXT) ode.$(OBJEXT) reciprocal.$(OBJEXT) \
    105         rev_sparse_hes.$(OBJEXT) rev_sparse_jac.$(OBJEXT) \
    106         reverse.$(OBJEXT) set_sparsity.$(OBJEXT) tangent.$(OBJEXT)
     101        eigen_mat_mul.$(OBJEXT)
    107102atomic_OBJECTS = $(am_atomic_OBJECTS)
    108103atomic_LDADD = $(LDADD)
     
    350345        atomic.cpp \
    351346        checkpoint.cpp \
    352         extended_ode.cpp \
    353         for_sparse_hes.cpp \
    354         for_sparse_jac.cpp \
    355         forward.cpp \
    356         get_started.cpp \
    357         mat_mul.cpp \
    358         mul_level.cpp \
    359         norm_sq.cpp \
    360         ode.cpp \
    361         reciprocal.cpp \
    362         rev_sparse_hes.cpp \
    363         rev_sparse_jac.cpp \
    364         reverse.cpp \
    365         set_sparsity.cpp \
    366         tangent.cpp
     347        eigen_mat_mul.cpp
    367348
    368349all: all-am
     
    415396@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atomic.Po@am__quote@
    416397@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpoint.Po@am__quote@
    417 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extended_ode.Po@am__quote@
    418 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/for_sparse_hes.Po@am__quote@
    419 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/for_sparse_jac.Po@am__quote@
    420 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/forward.Po@am__quote@
    421 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_started.Po@am__quote@
    422 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mat_mul.Po@am__quote@
    423 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mul_level.Po@am__quote@
    424 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/norm_sq.Po@am__quote@
    425 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ode.Po@am__quote@
    426 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reciprocal.Po@am__quote@
    427 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rev_sparse_hes.Po@am__quote@
    428 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rev_sparse_jac.Po@am__quote@
    429 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reverse.Po@am__quote@
    430 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set_sparsity.Po@am__quote@
    431 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tangent.Po@am__quote@
     398@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eigen_mat_mul.Po@am__quote@
    432399
    433400.cpp.o:
     
    650617.PRECIOUS: makefile
    651618
     619        extended_ode.cpp \
     620        for_sparse_hes.cpp \
     621        for_sparse_jac.cpp \
     622        forward.cpp \
     623        get_started.cpp \
     624        mat_mul.cpp \
     625        mul_level.cpp \
     626        norm_sq.cpp \
     627        ode.cpp \
     628        reciprocal.cpp \
     629        rev_sparse_hes.cpp \
     630        rev_sparse_jac.cpp \
     631        reverse.cpp \
     632        set_sparsity.cpp \
     633        tangent.cpp
    652634
    653635test: check
  • trunk/makefile.in

    r3805 r3806  
    486486        cppad/example/base_adolc.hpp \
    487487        cppad/example/cppad_eigen.hpp \
     488        cppad/example/eigen_mat_mul.hpp \
    488489        cppad/example/eigen_plugin.hpp \
    489490        cppad/example/mat_mul.hpp \
Note: See TracChangeset for help on using the changeset viewer.