Changeset e5bf2b

Timestamp:

Feb 3, 2011, 9:51:14 AM (14 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:

d1115d

Parents:

b2ae3b

git-author:

Frederik Heber <heber@…> (01/10/11 22:34:20)

git-committer:

Frederik Heber <heber@…> (02/03/11 09:51:14)

Message:

removed CPPUNIT_LIBS/FLAGS from most Makefile.am and LIBS/libs -> LIBADD.

• CPPUNIT_LIBS/FLAGS is only needed for unit tests.
• LIBS/libs should actually be LIBDADD, see also ticket #133.

Location:

src

Files:

• Actions/Makefile.am (modified) (2 diffs)
• Exceptions/Makefile.am (modified) (2 diffs)
• LinearAlgebra/Makefile.am (modified) (2 diffs)
• Makefile.am (modified) (3 diffs)
• Parser/Makefile.am (modified) (2 diffs)
• Shapes/Makefile.am (modified) (2 diffs)
• UIElements/Makefile.am (modified) (2 diffs)

src/Actions/Makefile.am

@@ -4 +4 @@
 INCLUDES = -I$(top_srcdir)/src
 
-AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
-AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
+AM_LDFLAGS = -ldl
+AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 
 ACTIONSSOURCE = \
@@ -217 +217 @@
 
 lib_LTLIBRARIES = libMolecuilderActions.la
-libMolecuilderActions_includedir = $(includedir)/MoleCuilder/Actions/
-libMolecuilderActions_libs = \
+libMolecuilderActions_la_includedir = $(includedir)/MoleCuilder/Actions/
+libMolecuilderActions_la_LIBADD = \
         ../Parser/libMolecuilderParser.la \
-        ../UIElements/libMolecuilderUI.la
-nobase_libMolecuilderActions_include_HEADERS = ${ACTIONSHEADER}
+        ../Shapes/libMolecuilderShapes.la \
+        ${CodePatterns_LIBS}
+#       ../UIElements/libMolecuilderUI.la
+nobase_libMolecuilderActions_la_include_HEADERS = ${ACTIONSHEADER}
 
 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"

src/Exceptions/Makefile.am

@@ -4 +4 @@
 INCLUDES = -I$(top_srcdir)/src
 
-AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
-# Position-Independent Code necessary for shared library
-AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
+AM_LDFLAGS = ${CodePatterns_LIBS} -ldl
+AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 
 EXCEPTIONSOURCE = \
@@ -37 +36 @@
 
 lib_LTLIBRARIES = libMolecuilderExceptions.la
-libMolecuilderExceptions_includedir = $(includedir)/MoleCuilder/Exceptions/
-nobase_libMolecuilderExceptions_include_HEADERS = ${EXCEPTIONHEADER}
+libMolecuilderExceptions_la_includedir = $(includedir)/MoleCuilder/Exceptions/
+nobase_libMolecuilderExceptions_la_include_HEADERS = ${EXCEPTIONHEADER}
 
 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"

src/LinearAlgebra/Makefile.am

@@ -4 +4 @@
 INCLUDES = -I$(top_srcdir)/src
 
-# Position-Independent Code necessary for shared library
-AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
-AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
+AM_LDFLAGS = ${CodePatterns_LIBS} -ldl
+AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 
 LINALGSOURCE = \
@@ -52 +51 @@
 
 lib_LTLIBRARIES = libMolecuilderLinearAlgebra.la
-libMolecuilderLinearAlgebra_includedir = $(includedir)/MoleCuilder/LinearAlgebra/
-libMolecuilderLinearAlgebra_libs = ../Exceptions/libMolecuilderExceptions.la $(GSL_LIBS)
-nobase_libMolecuilderLinearAlgebra_include_HEADERS = ${LINALGHEADER}
+libMolecuilderLinearAlgebra_la_includedir = $(includedir)/MoleCuilder/LinearAlgebra/
+libMolecuilderLinearAlgebra_la_LIBADD = \
+        ../Exceptions/libMolecuilderExceptions.la \
+        $(GSL_LIBS)
+nobase_libMolecuilderLinearAlgebra_la_include_HEADERS = ${LINALGHEADER}
 
 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"

src/Makefile.am

@@ -2 +2 @@
 # Also indentation by a single tab
 
-SUBDIRS = Actions Exceptions LinearAlgebra Parser Shapes UIElements
+SUBDIRS = \
+        Exceptions \
+        Parser \
+        LinearAlgebra \
+        Shapes \
+        Actions \
+        UIElements
 
 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
@@ -228 +234 @@
 
 lib_LTLIBRARIES = libMolecuilder.la
-libMolecuilder_includedir = $(includedir)/MoleCuilder/
-libMolecuilder_LIBS = \
+libMolecuilder_la_includedir = $(includedir)/MoleCuilder/
+libMolecuilder_la_LIBADD = \
         LinearAlgebra/libMolecuilderLinearAlgebra.la \
         ${CodePatterns_LIBS} \
         ${BOOST_PROGRAM_OPTIONS_LIB}
 
-nobase_libMolecuilder_include_HEADERS = ${MOLECUILDERHEADER}
+nobase_libMolecuilder_la_include_HEADERS = ${MOLECUILDERHEADER}
 
 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
@@ -262 +268 @@
 ## configuration header file is generated at configure time and should not be
 ## shipped with the source tarball.
-libMolecuilder_libincludedir = $(libdir)/MoleCuilder/include
-nodist_libMolecuilder_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
+libMolecuilder_la_libincludedir = $(libdir)/MoleCuilder/include
+nodist_libMolecuilder_la_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
 
 ## Install the generated pkg-config file (.pc) into the expected location for

src/Parser/Makefile.am

@@ -4 +4 @@
 INCLUDES = -I$(top_srcdir)/src
 
-AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
-AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
+AM_LDFLAGS = ${CodePatterns_LIBS} -ldl
+AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 
 PARSERSOURCE = \
@@ -35 +35 @@
 
 lib_LTLIBRARIES = libMolecuilderParser.la
-libMolecuilderParser_includedir = $(includedir)/MoleCuilder/Parser/
-nobase_libMolecuilderParser_include_HEADERS = ${PARSERHEADER}
+libMolecuilderParser_la_includedir = $(includedir)/MoleCuilder/Parser/
+nobase_libMolecuilderParser_la_include_HEADERS = ${PARSERHEADER}
 
 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"

src/Shapes/Makefile.am

@@ -5 +5 @@
 
 # Position-Independent Code necessary for shared library
-AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
-AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
+AM_LDFLAGS = ${CodePatterns_LIBS} -ldl
+AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 
 SHAPESOURCE = \
@@ -20 +20 @@
 
 lib_LTLIBRARIES = libMolecuilderShapes.la
-libMolecuilderShapes_includedir = $(includedir)/MoleCuilder/Shapes/
-libMolecuilderShapes_libs = \
-  ../LinearAlgebra/libMolecuilderExceptions.la \
+libMolecuilderShapes_la_includedir = $(includedir)/MoleCuilder/Shapes/
+libMolecuilderShapes_la_LIBADD = \
+  ../LinearAlgebra/libMolecuilderLinearAlgebra.la \
         ../Exceptions/libMolecuilderExceptions.la \
         $(GSL_LIBS)
-nobase_libMolecuilderShapes_include_HEADERS = ${SHAPEHEADER}
+nobase_libMolecuilderShapes_la_include_HEADERS = ${SHAPEHEADER}
 
 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"

src/UIElements/Makefile.am

@@ -3 +3 @@
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/UIElements
 
-AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
-AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS} ${QT_CXXFLAGS}
+AM_LDFLAGS = ${CodePatterns_LIBS} -ldl
+AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} ${QT_CXXFLAGS}
  
 VIEWSOURCE = \
@@ -232 +232 @@
 lib_LTLIBRARIES = libMolecuilderUI.la \
         libMolecuilderQtUI.la
-libMolecuilderUI_includedir = $(includedir)/MoleCuilder/UIElements/
-libMolecuilderQtUI_includedir = $(includedir)/MoleCuilder/UIElements/ 
-libMolecuilderUI_la_LIBS = \
-        Actions/libMolecuilderActions.la
-libMolecuilderQtUI_la_LIBS = \
-        Actions/libMolecuilderActions.la
-
-libMolecuilderQtUI_la_LIBADD = ${QT_LIB_GUI} -lQtOpenGL ${GLU_LIBS} ${QT_LDADD}
-
-nobase_libMolecuilderUI_include_HEADERS = ${UIHEADER}
-nobase_libMolecuilderQtUI_include_HEADERS = ${QTUIHEADER}
+libMolecuilderUI_la_includedir = $(includedir)/MoleCuilder/UIElements/
+libMolecuilderQtUI_la_includedir = $(includedir)/MoleCuilder/UIElements/ 
+libMolecuilderUI_la_LIBADD = \
+        ../Actions/libMolecuilderActions.la
+libMolecuilderQtUI_la_LIBADD = \
+        ../Actions/libMolecuilderActions.la \
+        ${QT_LIB_GUI} \
+        -lQtOpenGL \
+        ${GLU_LIBS} \
+        ${QT_LDADD}
+
+nobase_libMolecuilderUI_la_include_HEADERS = ${UIHEADER}
+nobase_libMolecuilderQtUI_la_include_HEADERS = ${QTUIHEADER}
 
 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"