Changeset 455573 for src/Parser

Timestamp:

Apr 18, 2011, 12:45:06 PM (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:

4217e7

Parents:

ca2cfa

git-author:

Frederik Heber <heber@…> (03/02/11 16:25:13)

git-committer:

Frederik Heber <heber@…> (04/18/11 12:45:06)

Message:

Large Commit: SUBDIRS in src/Makefile.am replaced by include.

• This should let make decide on the dependencies automatically.
• We had to change each Makefile.am due to different relative location now.
• FIX: convenience libs were not created due to lib_LT... instead of noinst_LT... (thanks, Ralf!)
• FIX: convenience libs cannot pass on dependencies on real libs, these (seemingly: libLinearAlgebra) have to be re-specified.
• FIX: RANDOMSOURCE/HEADER were still present to include in libMolecuilder although RandomNumbers have been outsourced for some time already.
• this should make it a lot easier for unit tests to get away with the massive dependencies because we may now include single libs and can construct stubs in replacement.

Location:

src/Parser

Files:

• Makefile.am (modified) (3 diffs)
• unittests/Makefile.am (modified) (2 diffs)

src/Parser/Makefile.am

@@ -2 +2 @@
 # Also indentation by a single tab
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
-
-AM_LDFLAGS = ${CodePatterns_LIBS} -ldl
-AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 
 PARSERSOURCE = \
-  ChangeTracker.cpp \
-  FormatParser.cpp \
-  FormatParserStorage.cpp \
-  MpqcParser.cpp \
-  MpqcParser_Parameters.cpp \
-  MpqcParser_Parameters_initBasis.cpp \
-  PcpParser.cpp \
-  PdbAtomInfoContainer.cpp \
-  PdbParser.cpp \
-  TremoloParser.cpp \
-  TremoloAtomInfoContainer.cpp \
-  XyzParser.cpp
+  Parser/ChangeTracker.cpp \
+  Parser/FormatParser.cpp \
+  Parser/FormatParserStorage.cpp \
+  Parser/MpqcParser.cpp \
+  Parser/MpqcParser_Parameters.cpp \
+  Parser/MpqcParser_Parameters_initBasis.cpp \
+  Parser/PcpParser.cpp \
+  Parser/PdbAtomInfoContainer.cpp \
+  Parser/PdbParser.cpp \
+  Parser/TremoloParser.cpp \
+  Parser/TremoloAtomInfoContainer.cpp \
+  Parser/XyzParser.cpp
 
 PARSERHEADER = \
-  ChangeTracker.hpp \
-  FormatParser.hpp \
-  FormatParserStorage.hpp \
-  MpqcParser.hpp \
-  MpqcParser_Parameters.hpp \
-  PcpParser.hpp \
-  PdbAtomInfoContainer.hpp \
-  PdbKey.hpp \
-  PdbParser.hpp \
-  TremoloKey.hpp \
-  TremoloParser.hpp \
-  TremoloAtomInfoContainer.hpp \
-  XyzParser.hpp
+  Parser/ChangeTracker.hpp \
+  Parser/FormatParser.hpp \
+  Parser/FormatParserStorage.hpp \
+  Parser/MpqcParser.hpp \
+  Parser/MpqcParser_Parameters.hpp \
+  Parser/PcpParser.hpp \
+  Parser/PdbAtomInfoContainer.hpp \
+  Parser/PdbKey.hpp \
+  Parser/PdbParser.hpp \
+  Parser/TremoloKey.hpp \
+  Parser/TremoloParser.hpp \
+  Parser/TremoloAtomInfoContainer.hpp \
+  Parser/XyzParser.hpp
 
 
-lib_LTLIBRARIES = libMolecuilderParser.la
+noinst_LTLIBRARIES += libMolecuilderParser.la
 libMolecuilderParser_la_includedir = $(includedir)/MoleCuilder/Parser/
+
 nobase_libMolecuilderParser_la_include_HEADERS = ${PARSERHEADER}
 
@@ -54 +51 @@
 ## library file (.so).  The library ABI version is defined in configure.ac, so
 ## that all version information is kept in one place.
-libMolecuilderParser_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
+#libMolecuilderParser_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
 
 ## The generated configuration header is installed in its own subdirectory of
@@ -76 +73 @@
 #pkgconfigdir = $(libdir)/pkgconfig
 #pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
-
-unity.cpp:
-        echo "" >  unity.cpp; \
-        list='$(PARSERSOURCE)'; for file in $$list; do \
-          echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
-        done;
-        
-MOSTLYCLEANFILES = unity.cpp

src/Parser/unittests/Makefile.am

@@ -2 +2 @@
 # Also indentation by a single tab
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
 
-AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
-AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
+PARSERTESTSSOURCES = \
+        ../Parser/unittests/ParserMpqcUnitTest.cpp \
+        ../Parser/unittests/ParserPcpUnitTest.cpp \
+        ../Parser/unittests/ParserPdbUnitTest.cpp \
+        ../Parser/unittests/ParserTremoloUnitTest.cpp \
+        ../Parser/unittests/ParserXyzUnitTest.cpp
 
-TESTS = \
+PARSERTESTSHEADERS = \
+        ../Parser/unittests/ParserMpqcUnitTest.hpp \
+        ../Parser/unittests/ParserPcpUnitTest.hpp \
+        ../Parser/unittests/ParserPdbUnitTest.hpp \
+        ../Parser/unittests/ParserTremoloUnitTest.hpp \
+        ../Parser/unittests/ParserXyzUnitTest.hpp
+
+PARSERTESTS = \
   ParserMpqcUnitTest \
   ParserPcpUnitTest \
@@ -14 +24 @@
   ParserXyzUnitTest
 
+TESTS += $(PARSERTESTS)
+check_PROGRAMS += $(PARSERTESTS) 
+noinst_PROGRAMS += $(PARSERTESTS)
 
-check_PROGRAMS = $(TESTS) 
-noinst_PROGRAMS = $(TESTS)
-
-BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
-GSLLIBS = \
-        ../../Shapes/libMolecuilderShapes.la \
+PARSERLIBS = \
+        ../libMolecuilderUI.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
-        ../../RandomNumbers/libMolecuilderRandomNumbers.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)
 
-ALLLIBS = \
-        ../../UIElements/libMolecuilderUI.la \
-        ../../Actions/libMolecuilderActions.la \
-        ${PARSERLIBS} \
-        ../../libMolecuilder.la \
-        ${GSLLIBS}
 
-PARSERLIBS = ../../Parser/libMolecuilderParser.la
-UILIBS = ../../UIElements/libMolecuilderUI.la  
 
 ParserMpqcUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ParserMpqcUnitTest.cpp \
-        ParserMpqcUnitTest.hpp
-ParserMpqcUnitTest_LDADD = ${ALLLIBS}
+        ../Parser/unittests/ParserMpqcUnitTest.cpp \
+        ../Parser/unittests/ParserMpqcUnitTest.hpp
+ParserMpqcUnitTest_LDADD = ${PARSERLIBS}
 
 ParserPcpUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ParserPcpUnitTest.cpp \
-        ParserPcpUnitTest.hpp
-ParserPcpUnitTest_LDADD = ${ALLLIBS}
+        ../Parser/unittests/ParserPcpUnitTest.cpp \
+        ../Parser/unittests/ParserPcpUnitTest.hpp
+ParserPcpUnitTest_LDADD = ${PARSERLIBS}
 
 ParserPdbUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ParserPdbUnitTest.cpp \
-        ParserPdbUnitTest.hpp
-ParserPdbUnitTest_LDADD = ${ALLLIBS}
+        ../Parser/unittests/ParserPdbUnitTest.cpp \
+        ../Parser/unittests/ParserPdbUnitTest.hpp
+ParserPdbUnitTest_LDADD = ${PARSERLIBS}
 
 ParserTremoloUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ParserTremoloUnitTest.cpp \
-        ParserTremoloUnitTest.hpp
-ParserTremoloUnitTest_LDADD = ${ALLLIBS}
+        ../Parser/unittests/ParserTremoloUnitTest.cpp \
+        ../Parser/unittests/ParserTremoloUnitTest.hpp
+ParserTremoloUnitTest_LDADD = ${PARSERLIBS}
 
 ParserXyzUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ParserXyzUnitTest.cpp \
-        ParserXyzUnitTest.hpp
-ParserXyzUnitTest_LDADD = ${ALLLIBS}
+        ../Parser/unittests/ParserXyzUnitTest.cpp \
+        ../Parser/unittests/ParserXyzUnitTest.hpp
+ParserXyzUnitTest_LDADD = ${PARSERLIBS}