Changeset 861874 for src/Makefile.am

Timestamp:

Aug 5, 2010, 3:48:55 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:

6a86ce

Parents:

0632c5

git-author:

Frederik Heber <heber@…> (08/05/10 15:46:45)

git-committer:

Frederik Heber <heber@…> (08/05/10 15:48:55)

Message:

libMolecuilderAction is now a shared lib via libtool.

This is all taken from the example available at ​http://www.openismus.com/documents/linux/building_libraries/building_libraries/building_libraries.shtml.

Necessary changes:

• ValueStorage is now part of Actions, not of UIElements anymore (which is actually as it should have been right away, only Dialog uses ValueStorage and for all Actions ValueStorage is the simple adapter pattern to MapOfActions needed the relax (compilation) dependencies).
• new files:
  • config/ltmain.sh (scipt for libtool)
  • libmolecuilder_config.h.in (extra config.h which is copied along with lib to contain how it has been compiled)
  • molecuilder.pc.in (package config information
• BUGFIX: m4/gwqt4.m4 added -L$X_libraries, however $X_libraries was nowhere set and libtool admonished the empty "-L"
• libMolecuilderUI now depends on libMolecuilderAction
• all unit tests now have libMolecuilderAction and libMolecuilderUI due to non-interactive calls of actions

File:

• src/Makefile.am (modified) (4 diffs)

src/Makefile.am

@@ -2 +2 @@
 # Also indentation by a single tab
 
-SUBDIRS = Actions UIElements
+SUBDIRS = Actions Parser UIElements
 
 # this includes source files that need to be present at multiple points
@@ -98 +98 @@
   Exceptions/SkewException.hpp \
   Exceptions/ZeroVectorException.hpp
-
-PARSERSOURCE = \
-  Parser/ChangeTracker.cpp \
-  Parser/FormatParser.cpp \
-  Parser/FormatParserStorage.cpp \
-  Parser/MpqcParser.cpp \
-  Parser/PcpParser.cpp \
-  Parser/TremoloParser.cpp \
-  Parser/XyzParser.cpp
-
-PARSERHEADER = \
-  Parser/ChangeTracker.hpp \
-  Parser/FormatParser.hpp \
-  Parser/FormatParserStorage.hpp \
-  Parser/MpqcParser.hpp \
-  Parser/PcpParser.hpp \
-  Parser/TremoloParser.hpp \
-  Parser/XyzParser.hpp
 
 PATTERNSOURCE = \
@@ -296 +278 @@
 INCLUDES = -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements
 
-noinst_LIBRARIES = libmolecuilder.a libgslwrapper.a libmenu.a libparser.a
+noinst_LIBRARIES = libmolecuilder.a libgslwrapper.a libmenu.a
 bin_PROGRAMS = molecuilder molecuildergui joiner analyzer
 
 molecuilderdir = ${bindir}
 
-libmolecuilder_a_SOURCES = ${SOURCE} ${HEADER}
+libmolecuilder_a_SOURCES = ${SOURCE} ${HEADER} $(srcdir)/version.c
 
 libmenu_a_SOURCES = ${UISOURCE} ${UIHEADER} 
-libparser_a_SOURCES = ${PARSERSOURCE} ${PARSERHEADER}
 libgslwrapper_a_SOURCES = ${LINALGSOURCE} ${LINALGHEADER}
 
@@ -312 +293 @@
 #molecuilder_CXXFLAGS += -DNO_CACHING
 molecuilder_LDFLAGS = $(BOOST_LIB)
-molecuilder_SOURCES = ${LEGACYSOURCE} builder.cpp
-molecuilder_SOURCES += $(srcdir)/version.c
-molecuilder_LDADD = UIElements/libMolecuilderUI.a Actions/libMolecuilderActions.a libmolecuilder.a libparser.a libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
+molecuilder_SOURCES = builder.cpp
+molecuilder_LDADD = UIElements/libMolecuilderUI.a Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la libmolecuilder.a Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
 
 #Stuff for building the GUI using QT
-molecuildergui_SOURCES = ${QTUISOURCE} ${LEGACYSOURCE} builder.cpp
+molecuildergui_SOURCES = ${QTUISOURCE} builder.cpp
 molecuildergui_SOURCES += $(srcdir)/version.c
 molecuildergui_CXXFLAGS = ${QT_CXXFLAGS} ${GLU_CXXFLAGS} -DUSE_GUI_QT
 molecuildergui_LDFLAGS = $(BOOST_LIB) ${QT_LDFLAGS} ${GLU_LDFLAGS}
-molecuildergui_LDADD = UIElements/libMolecuilderUI.a Actions/libMolecuilderActions.a libmolecuilder.a libparser.a libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}  ${GUI_LIBS}
+molecuildergui_LDADD = UIElements/libMolecuilderUI.a Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la libmolecuilder.a Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}  ${GUI_LIBS}
 
 joiner_SOURCES = joiner.cpp datacreator.cpp parser.cpp datacreator.hpp helpers.hpp parser.hpp periodentafel.hpp