Changeset 251420 for ThirdParty/mpqc_open/src/lib/util

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/util

Files:

• group/Makefile.am (modified) (4 diffs)
• misc/Makefile.am (modified) (3 diffs)
• ref/Makefile.am (modified) (1 diff)
• render/Makefile.am (modified) (1 diff)
• state/Makefile.am (modified) (1 diff)
• state/statetest.cc (modified) (1 diff)

ThirdParty/mpqc_open/src/lib/util/group/Makefile.am

@@ -1 +1 @@
 LIBSCGROUPSOURCES = \
+        util/group/globcnt.cc \
+        util/group/hcube.cc \
+        util/group/memamsg.cc \
+        util/group/memiter.cc \
+        util/group/memmsg.cc \
+        util/group/memmtmpi.cc \
+        util/group/memory.cc \
+        util/group/memproc.cc \
+        util/group/memrdma.cc \
+        util/group/memshm.cc \
+        util/group/message.cc \
+        util/group/messimpl.cc \
+        util/group/messint.cc \
+        util/group/messmpi.cc \
+        util/group/messproc.cc \
+        util/group/messshm.cc \
+        util/group/mstate.cc \
+        util/group/pool.cc \
+        util/group/pregtime.cc \
+        util/group/reduce.cc \
+        util/group/rnglock.cc \
+        util/group/thpthd.cc \
+        util/group/thread.cc \
+        util/group/topology.cc
+
+#       util/group/file.cc \
+#       util/group/fileproc.cc \
+#       util/group/memarmci.cc \
+#       util/group/thpuma.cc \
+#
+TESTSOURCES = \
         util/group/message.cc \
         util/group/messimpl.cc \
@@ -18 +49 @@
         util/group/memrdma.cc
 
-#       util/group/file.cc \
-#       util/group/fileproc.cc \
-#       util/group/globcnt.cc \
-#       util/group/hcube.cc \
-#       util/group/memamsg.cc \
-#       util/group/memarmci.cc \
-#       util/group/memiter.cc \
-#       util/group/memmsg.cc \
-#       util/group/memmtmpi.cc \
-#       util/group/memory.cc \
-#       util/group/memproc.cc \
-#       util/group/memrdma.cc \
-#       util/group/memshm.cc \
-#       util/group/message.cc \
-#       util/group/messimpl.cc \
-#       util/group/messint.cc \
-#       util/group/messmpi.cc \
-#       util/group/messproc.cc \
-#       util/group/messshm.cc \
-#       util/group/mstate.cc \
-#       util/group/pool.cc \
-#       util/group/pregtime.cc \
-#       util/group/reduce.cc \
-#       util/group/rnglock.cc \
-#       util/group/thpthd.cc \
-#       util/group/thpuma.cc \
-#       util/group/thread.cc \
-#       util/group/topology.cc
+LIBSCGROUPHEADERS = \
+        util/group/globcnt.h \
+        util/group/hcube.h \
+        util/group/LIBS.h \
+        util/group/linkage.h \
+        util/group/memamsg.h \
+        util/group/memiter.h \
+        util/group/memmsg.h \
+        util/group/memmtmpi.h \
+        util/group/memory.h \
+        util/group/memproc.h \
+        util/group/memrdma.h \
+        util/group/memshm.h \
+        util/group/message.h \
+        util/group/messaget.h \
+        util/group/messmpi.h \
+        util/group/messshm.h \
+        util/group/mstate.h \
+        util/group/pool.h \
+        util/group/pregtime.h \
+        util/group/rnglock.h \
+        util/group/thpthd.h \
+        util/group/thread.h \
+        util/group/topology.h
 
-
-LIBSCGROUPHEADERS = \
+#       util/group/file.h \
+#       util/group/fileproc.h \
+#       util/group/memarmci.h \
+#       util/group/thpuma.h \
+#
+TESTHEADERS = \
         util/group/message.h \
         util/group/topology.h \
@@ -62 +93 @@
         util/group/memiter.h \
         util/group/memrdma.h
-                
-#       util/group/file.h \
-#       util/group/fileproc.h \
-#       util/group/globcnt.h \
-#       util/group/hcube.h \
-#       util/group/LIBS.h \
-#       util/group/linkage.h \
-#       util/group/memamsg.h \
-#       util/group/memarmci.h \
-#       util/group/memiter.h \
-#       util/group/memmsg.h \
-#       util/group/memmtmpi.h \
-#       util/group/memory.h \
-#       util/group/memproc.h \
-#       util/group/memrdma.h \
-#       util/group/memshm.h \
-#       util/group/message.h \
-#       util/group/messaget.h \
-#       util/group/messmpi.h \
-#       util/group/messshm.h \
-#       util/group/mstate.h \
-#       util/group/pool.h \
-#       util/group/pregtime.h \
-#       util/group/rnglock.h \
-#       util/group/thpthd.h \
-#       util/group/thpuma.h \
-#       util/group/thread.h \
-#       util/group/topology.h
-
 
 lib_LTLIBRARIES +=
@@ -143 +145 @@
 
 GROUPLIBS = \
-        libSCgroup.la \
-        libSCkeyval.la \
-        libSCmisc.la \
-        libSCstate.la \
-        libSCclass.la \
-        libSCcontainer.la \
-        libSCref.la
+        libSCgroup.la libSCmisc.la libSCstate.la libSCkeyval.la libSCclass.la libSCcontainer.la libSCref.la
 
 memtest_SOURCES = \

ThirdParty/mpqc_open/src/lib/util/misc/Makefile.am

@@ -81 +81 @@
         scinttest \
         bugtest \
-        scextest_misc \
         unittest \
         formiot
@@ -88 +87 @@
 noinst_PROGRAMS += $(MISCTESTS)
 
-MISCLIBS =
+MISCLIBS = \
+        libSCmisc.la libSCstate.la libSCkeyval.la libSCclass.la libSCcontainer.la libSCref.la
 
 autovectest_SOURCES = \
@@ -115 +115 @@
         $(MISCLIBS)
 
-scextest_misc_SOURCES = \
-        util/misc/scextest.cc
-scextest_misc_LDADD = \
-        $(MISCLIBS)
-
 unittest_SOURCES = \
         util/misc/unittest.cc

ThirdParty/mpqc_open/src/lib/util/ref/Makefile.am

@@ -61 +61 @@
 reftest_SOURCES = \
         util/ref/reftest.cc \
-        util/ref/reftextx.cc \
-        util/ref/reftextx.h
+        util/ref/reftestx.cc \
+        util/ref/reftestx.h
 
 reftest_LDADD = \

ThirdParty/mpqc_open/src/lib/util/render/Makefile.am

@@ -82 +82 @@
 
 RENDERLIBS = \
-        libSCkeyval.la \
-        libSCgroup.la libSCrender.la libSCclass.la \
-        libSCcontainer.la libSCref.la libSCmisc.la
+        libSCrender.la libSCmisc.la libSCstate.la libSCkeyval.la libSCclass.la libSCcontainer.la libSCref.la
 
 rentest_SOURCES = \

ThirdParty/mpqc_open/src/lib/util/state/Makefile.am

@@ -70 +70 @@
 
 STATELIBS = \
-        libSCkeyval.la \
-        libSCgroup.la libSCstate.la libSCclass.la \
-        libSCcontainer.la libSCref.la libSCmisc.la
+        libSCkeyval.la libSCgroup.la libSCstate.la libSCclass.la libSCcontainer.la libSCref.la libSCmisc.la
 
 statetest_SOURCES = \

ThirdParty/mpqc_open/src/lib/util/state/statetest.cc

@@ -432 +432 @@
   cout << " --- saving to A ---" << endl;
   StateOutTypeA soa("statetest.a.out");
-  ra = new A(new PrefixKeyVal("test:object_a",pkv));
+  ra = new A(new PrefixKeyVal(pkv, "test:object_a"));
   cout << "  first a" << endl;
   ra->save_object_state(soa);