Changeset 3b35e7 for src/Fragmentation/Summation

Timestamp:

Aug 20, 2014, 12:59:14 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

0c74aa

Parents:

3a33e3

git-author:

Frederik Heber <heber@…> (08/17/14 19:07:34)

git-committer:

Frederik Heber <heber@…> (08/20/14 12:59:14)

Message:

Fixes due to update to Ubuntu 14.04.

• subdir-objects is default behavior for automake.
• INCLUDES is deprecated (in favor of AM_CPPFLAGS), made sure that every .._CPPFLAGS includes AM_CPPFLAGS.
• updated boost.m4 (serial 22), re-added missing macros.
• qwt.m4 does not use QString in constructor, as it pulls in QtCore dependency.
• VectorUnitTest lacked libboost_system dep.

Location:

src/Fragmentation/Summation

Files:

• Containers/Makefile.am (modified) (1 diff)
• Containers/unittests/Makefile.am (modified) (1 diff)
• Converter/Makefile.am (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• SetValues/Makefile.am (modified) (1 diff)

src/Fragmentation/Summation/Containers/Makefile.am

@@ -41 +41 @@
 noinst_LTLIBRARIES += libMolecuilderFragmentationContainers.la
 libMolecuilderFragmentationContainers_la_includedir = $(includedir)/MoleCuilder/
-libMolecuilderFragmentationContainers_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS)
+libMolecuilderFragmentationContainers_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS)
 libMolecuilderFragmentationContainers_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}
 libMolecuilderFragmentationContainers_la_LIBADD = \

src/Fragmentation/Summation/Containers/unittests/Makefile.am

@@ -24 +24 @@
 
 MPQCDataUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
-MPQCDataUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
+MPQCDataUnitTest_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
 MPQCDataUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
   ../Fragmentation/Summation/Containers/unittests/MPQCDataUnitTest.cpp \

src/Fragmentation/Summation/Converter/Makefile.am

@@ -10 +10 @@
 noinst_LTLIBRARIES += libMolecuilderFragmentationConverter.la
 libMolecuilderFragmentationConverter_la_includedir = $(includedir)/MoleCuilder/
-libMolecuilderFragmentationConverter_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
+libMolecuilderFragmentationConverter_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 libMolecuilderFragmentationConverter_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}
 libMolecuilderFragmentationConverter_la_LIBADD = \

src/Fragmentation/Summation/Makefile.am

@@ -34 +34 @@
 lib_LTLIBRARIES += libMolecuilderFragmentationSummation.la
 libMolecuilderFragmentationSummation_la_includedir = $(includedir)/MoleCuilder/
-libMolecuilderFragmentationSummation_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
+libMolecuilderFragmentationSummation_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 libMolecuilderFragmentationSummation_la_LDFLAGS = -ldl \
         $(BOOST_SERIALIZATION_LDFLAGS) \

src/Fragmentation/Summation/SetValues/Makefile.am

@@ -22 +22 @@
 noinst_LTLIBRARIES += libMolecuilderFragmentationSetValues.la
 libMolecuilderFragmentationSetValues_la_includedir = $(includedir)/MoleCuilder/
-libMolecuilderFragmentationSetValues_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
+libMolecuilderFragmentationSetValues_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 libMolecuilderFragmentationSetValues_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}
 libMolecuilderFragmentationSetValues_la_LIBADD = \