Changeset b37436


Ignore:
Timestamp:
Aug 5, 2010, 7:46:06 PM (15 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:
255971
Parents:
952f38
Message:

Converted libMolecuilderUI to shared lib via libtool.

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • src/Makefile.am

    r952f38 rb37436  
    231231molecuilder_SOURCES = builder.cpp
    232232molecuilder_LDADD = \
    233         UIElements/libMolecuilderUI.a \
     233        UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
    234234        Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
    235235        libmolecuilder.a \
    … …  
    249249molecuildergui_LDFLAGS = $(BOOST_LIB) ${QT_LDFLAGS} ${GLU_LDFLAGS}
    250250molecuildergui_LDADD = \
    251         UIElements/libMolecuilderUI.a \
     251        UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
    252252        Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
    253253        libmolecuilder.a \

  • src/UIElements/Makefile.am

    r952f38 rb37436  
    55AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl
    66AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
    7 
    8 noinst_LIBRARIES = libMolecuilderUI.a
    9 libMolecuilderUI_a_SOURCES = ${UISOURCE} ${UIHEADER}
    10 libMolecuilderUI_a_LIBADD = ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la
    117
    128VIEWSOURCE = \
    … …  
    7975  CommandLineUI/CommandLineWindow.hpp
    8076
     77lib_LTLIBRARIES = libMolecuilderUI-@MOLECUILDER_API_VERSION@.la
     78libMolecuilderUI_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/
     79libMolecuilderUI_LIBS = \
     80        Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la
    8181
     82nobase_libMolecuilderUI_include_HEADERS = ${UIHEADER}
     83
     84## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
     85## target.  Note that @MOLECUILDER_API_VERSION@ is not interpreted by Automake and
     86## will therefore be treated as if it were literally part of the target name,
     87## and the variable name derived from that.
     88## The file extension .cc is recognized by Automake, and makes it produce
     89## rules which invoke the C++ compiler to produce a libtool object file (.lo)
     90## from each source file.  Note that it is not necessary to list header files
     91## which are already listed elsewhere in a _HEADERS variable assignment.
     92libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_SOURCES = ${UISOURCE}
     93
     94## Instruct libtool to include ABI version information in the generated shared
     95## library file (.so).  The library ABI version is defined in configure.ac, so
     96## that all version information is kept in one place.
     97libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     98
     99## The generated configuration header is installed in its own subdirectory of
     100## $(libdir).  The reason for this is that the configuration information put
     101## into this header file describes the target platform the installed library
     102## has been built for.  Thus the file must not be installed into a location
     103## intended for architecture-independent files, as defined by the Filesystem
     104## Hierarchy Standard (FHS).
     105## The nodist_ prefix instructs Automake to not generate rules for including
     106## the listed files in the distribution on 'make dist'.  Files that are listed
     107## in _HEADERS variables are normally included in the distribution, but the
     108## configuration header file is generated at configure time and should not be
     109## shipped with the source tarball.
     110libMolecuilderUI_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
     111nodist_libMolecuilderUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
     112
     113## Install the generated pkg-config file (.pc) into the expected location for
     114## architecture-dependent package configuration information.  Occasionally,
     115## pkg-config files are also used for architecture-independent data packages,
     116## in which case the correct install location would be $(datadir)/pkgconfig.
     117pkgconfigdir = $(libdir)/pkgconfig
     118pkgconfig_DATA = $(top_builddir)/molecuilder-$(MOLECUILDER_API_VERSION).pc
     119

  • src/unittests/Makefile.am

    r952f38 rb37436  
    5656        ${BOOST_THREAD_LIB}
    5757ALLLIBS = \
    58         ../UIElements/libMolecuilderUI.a \
    5958        ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
    6059        ${PARSERLIBS} \
    … …  
    6261        ${GSLLIBS} \
    6362        ${BOOST_PROGRAM_OPTIONS_LIB}
    64 PARSERLIBS = ../Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la
     63PARSERLIBS = ../Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la
     64UILIBS = ../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la 
     65
    6566
    6667TESTSOURCES = \
    … …  
    129130  MoleculeDescriptorTest.hpp \
    130131  periodentafelTest.hpp \
     132  ParserUnitTest.hpp \
    131133  PlaneUnittest.hpp \
    132134  ObserverTest.hpp \
    … …  
    140142
    141143ActionSequenceTest_SOURCES = UnitTestMain.cpp ActionSequenceTest.cpp ActionSequenceTest.hpp
    142 ActionSequenceTest_LDADD = ../UIElements/libMolecuilderUI.a ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la ../libmolecuilder.a ../libparser.a ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la ../Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
     144ActionSequenceTest_LDADD = ${UILIBS} ${ALLLIBS}
    143145
    144146ActOnAllUnitTest_SOURCES = UnitTestMain.cpp ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
    … …  
    206208
    207209manipulateAtomsTest_SOURCES = UnitTestMain.cpp manipulateAtomsTest.cpp manipulateAtomsTest.hpp
    208 manipulateAtomsTest_LDADD = ../UIElements/libMolecuilderUI.a ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la ../libmolecuilder.a ../libparser.a ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la ../Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
     210manipulateAtomsTest_LDADD = ${UILIBS} ${ALLLIBS}
    209211
    210212MatrixUnittest_SOURCES = UnitTestMain.cpp MatrixUnittest.cpp MatrixUnittest.hpp
    … …  
    245247
    246248TestRunner_SOURCES = TestRunnerMain.cpp $(TESTSOURCES) $(TESTHEADERS)
    247 TestRunner_LDADD = ../UIElements/libMolecuilderUI.a ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la ../libmolecuilder.a ../libparser.a ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la ../Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la$(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
     249TestRunner_LDADD = ${UILIBS} ${ALLLIBS}
    248250
    249251VectorUnitTest_SOURCES = UnitTestMain.cpp vectorunittest.cpp vectorunittest.hpp
Note: See TracChangeset for help on using the changeset viewer.