Ignore:
Timestamp:
Mar 2, 2017, 12:28:37 PM (8 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, Subpackage_levmar, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable
Children:
6b1a6a
Parents:
2e2505
git-author:
Frederik Heber <heber@…> (02/09/17 15:10:39)
git-committer:
Frederik Heber <heber@…> (03/02/17 12:28:37)
Message:

Fixed all src/lib's Makefile.am's linking.

Location:
ThirdParty/mpqc_open/src/lib/math
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/mpqc_open/src/lib/math/isosurf/Makefile.am

    r2e2505 r251420  
    88        math/isosurf/surfse.cc \
    99        math/isosurf/surfst.cc \
     10        math/isosurf/tmplinst.cc \
    1011        math/isosurf/triangle.cc \
    1112        math/isosurf/tricoef.cc \
    … …  
    6869
    6970ISOSURFTESTS = \
    70         tmplinst \
    7171        isotest
    7272
    … …  
    7575
    7676ISOSURFLIBS = \
    77         libSCkeyval.la \
    78         libSCgroup.la libSCisosurf.la libSCclass.la \
    79         libSCcontainer.la libSCref.la libSCmisc.la
    80 
    81 tmplinst_SOURCES = \
    82         math/isosurf/tmplinst.cc
    83 tmplinst_LDADD = \
    84         $(ISOSURFLIBS)
     77        libSCisosurf.la libSCoptimize.la libSCscmat.la libSCgroup.la libSCrender.la libSCmisc.la libSCstate.la libSCkeyval.la libSCclass.la libSCcontainer.la libSCref.la
    8578
    8679isotest_SOURCES = \
    8780        math/isosurf/isotest.cc
     81#isotest_CPPFLAGS = \
     82#       $(AM_CPPFLAGS:-fno-implicit-templates=)
    8883isotest_LDADD = \
    8984        $(ISOSURFLIBS)

  • ThirdParty/mpqc_open/src/lib/math/isosurf/tmplinst.cc

    r2e2505 r251420  
    3333
    3434#include <vector>
     35
     36extern int yylex(void);
    3537
    3638using namespace sc;

  • ThirdParty/mpqc_open/src/lib/math/optimize/Makefile.am

    r2e2505 r251420  
    8484
    8585OPTIMIZELIBS = \
    86         libSCkeyval.la \
    87         libSCgroup.la libSCoptimize.la libSCclass.la \
    88         libSCcontainer.la libSCref.la libSCmisc.la
     86        libSCoptimize.la libSCscmat.la libSCgroup.la libSCmisc.la libSCstate.la libSCkeyval.la libSCclass.la libSCcontainer.la libSCref.la
    8987
    9088opttest_SOURCES = \

  • ThirdParty/mpqc_open/src/lib/math/scmat/Makefile.am

    r2e2505 r251420  
    2525        math/scmat/matrix.cc \
    2626        math/scmat/matrix_i.cc \
     27        math/scmat/pdsteqr.f \
    2728        math/scmat/repl.cc \
    2829        math/scmat/repldiag.cc \
    … …  
    6869
    6970lib_LTLIBRARIES +=
    70 noinst_LTLIBRARIES += libSCscmat.la
     71noinst_LTLIBRARIES += libSCscmat.la libSCscmat_matrixtest.la
    7172libSCscmat_la_includedir = $(includedir)/math/scmat
     73libSCscmat_matrixtest_la_CPPFLAGS = $(AM_CPPFLAGS)
     74libSCscmat_matrixtest_la_LDFLAGS = $(AM_LDFLAGS)
     75libSCscmat_matrixtest_la_LIBADD =
    7276libSCscmat_la_CPPFLAGS = $(AM_CPPFLAGS)
    7377libSCscmat_la_LDFLAGS = $(AM_LDFLAGS)
    … …  
    8791## which are already listed elsewhere in a _HEADERS variable assignment.
    8892libSCscmat_la_SOURCES = ${LIBSCSCMATSOURCES}
     93libSCscmat_matrixtest_la_SOURCES = math/scmat/matrixtest.cc
    8994
    9095## Instruct libtool to include ABI version information in the generated shared
    … …  
    118123
    119124SCMATLIBS = \
    120         libSCkeyval.la \
    121         libSCgroup.la libSCscmat.la libSCclass.la \
    122         libSCcontainer.la libSCref.la libSCmisc.la
     125        libSCscmat.la libSCgroup.la libSCmisc.la libSCstate.la libSCkeyval.la libSCclass.la libSCcontainer.la libSCref.la
    123126
    124127localtest_SOURCES = \
    125128        math/scmat/localtest.cc
    126129localtest_LDADD = \
     130        libSCscmat_matrixtest.la \
    127131        $(SCMATLIBS)
    128132
    … …  
    130134        math/scmat/repltest.cc
    131135repltest_LDADD = \
     136        libSCscmat_matrixtest.la \
    132137        $(SCMATLIBS)
    133138
    … …  
    135140        math/scmat/disttest.cc
    136141disttest_LDADD = \
     142        libSCscmat_matrixtest.la \
    137143        $(SCMATLIBS)
    138144
    … …  
    140146        math/scmat/blockedtest.cc
    141147blockedtest_LDADD = \
     148        libSCscmat_matrixtest.la \
    142149        $(SCMATLIBS)
    143150

  • ThirdParty/mpqc_open/src/lib/math/symmetry/Makefile.am

    r2e2505 r251420  
    6262
    6363SYMMETRYLIBS = \
    64         libSCkeyval.la \
    65         libSCgroup.la libSCsymmetry.la libSCclass.la \
    66         libSCcontainer.la libSCref.la libSCmisc.la
     64        libSCsymmetry.la libSCscmat.la libSCgroup.la libSCmisc.la libSCstate.la libSCkeyval.la libSCclass.la libSCcontainer.la libSCref.la
    6765
    6866testpg_SOURCES = \
Note: See TracChangeset for help on using the changeset viewer.