Changeset acbe1b for src/Makefile.am


Ignore:
Timestamp:
Dec 23, 2010, 5:41:54 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:
6d2207
Parents:
dc031c
git-author:
Frederik Heber <heber@…> (12/23/10 16:35:16)
git-committer:
Frederik Heber <heber@…> (12/23/10 17:41:54)
Message:

All libraries don't have version in name anymore.

  • we used gained knowledge from CodePatterns library for .pc file and and the generated libs to finalize their use (for SubspaceFactorizer soon the factored out into independent project).
  • .pc now contains all libs and named correctly.

Makefile.am's

  • include_HEADERs corrected
  • pkgconfig_.. thrown out except in src/, it's always the same file
    • at a later point we might have specialized .pc files for specific libraries such as Shapes,LinearAlgebra and Exceptions, ...
  • no more version attached, only via -version-info, as .pc file checks for version anyway.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Makefile.am

    rdc031c racbe1b  
    237237  World.hpp
    238238
    239 lib_LTLIBRARIES = libMolecuilder-@MOLECUILDER_API_VERSION@.la
    240 libMolecuilder_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/
     239lib_LTLIBRARIES = libMolecuilder.la
     240libMolecuilder_includedir = $(includedir)/MoleCuilder/
    241241libMolecuilder_LIBS = \
    242         LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
     242        LinearAlgebra/libMolecuilderLinearAlgebra.la \
    243243        ${CodePatterns_LIBS} \
    244244        ${BOOST_PROGRAM_OPTIONS_LIB}
    245 
    246 #       UIElements/libMolecuilderUI.a \
    247         Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
    248         Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la \
    249         Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
    250         Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
    251         $(BOOST_LIB) \
    252         ${BOOST_THREAD_LIB}
    253245
    254246nobase_libMolecuilder_include_HEADERS = ${MOLECUILDERHEADER}
    … …  
    262254## from each source file.  Note that it is not necessary to list header files
    263255## which are already listed elsewhere in a _HEADERS variable assignment.
    264 libMolecuilder_@MOLECUILDER_API_VERSION@_la_SOURCES = ${MOLECUILDERSOURCE} $(srcdir)/version.c
     256libMolecuilder_la_SOURCES = ${MOLECUILDERSOURCE} $(srcdir)/version.c
    265257
    266258## Instruct libtool to include ABI version information in the generated shared
    267259## library file (.so).  The library ABI version is defined in configure.ac, so
    268260## that all version information is kept in one place.
    269 libMolecuilder_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     261libMolecuilder_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    270262
    271263## The generated configuration header is installed in its own subdirectory of
    … …  
    280272## configuration header file is generated at configure time and should not be
    281273## shipped with the source tarball.
    282 libMolecuilder_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
     274libMolecuilder_libincludedir = $(libdir)/MoleCuilder/include
    283275nodist_libMolecuilder_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
    284276
    … …  
    288280## in which case the correct install location would be $(datadir)/pkgconfig.
    289281pkgconfigdir = $(libdir)/pkgconfig
    290 pkgconfig_DATA = $(top_builddir)/molecuilder-$(MOLECUILDER_API_VERSION).pc
     282pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
    291283
    292284
    … …  
    307299SubspaceFactorizer_SOURCES = SubspaceFactorizer.cpp Helpers/defs.cpp Helpers/defs.hpp Helpers/helpers.cpp Helpers/helpers.hpp
    308300SubspaceFactorizer_LDADD = \
    309         LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    310         Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
     301        LinearAlgebra/libMolecuilderLinearAlgebra.la \
     302        Exceptions/libMolecuilderExceptions.la \
    311303        ${CodePatterns_LIBS} \
    312304        $(GSLLIB) \
    … …  
    318310molecuilder_SOURCES = builder.cpp builder_init.cpp builder_init.hpp
    319311molecuilder_LDADD = \
    320         UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
    321         Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
    322         libMolecuilder-@MOLECUILDER_API_VERSION@.la \
    323         Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la \
    324         LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    325         Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
     312        UIElements/libMolecuilderUI.la \
     313        Actions/libMolecuilderActions.la \
     314        libMolecuilder.la \
     315        Parser/libMolecuilderParser.la \
     316        LinearAlgebra/libMolecuilderLinearAlgebra.la \
     317        Exceptions/libMolecuilderExceptions.la \
    326318        ${CodePatterns_LIBS} \
    327319        $(BOOST_LIB)
    … …  
    336328
    337329molecuildergui_LDADD = \
    338         UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
    339         UIElements/libMolecuilderQtUI-@MOLECUILDER_API_VERSION@.la \
    340         Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
    341         libMolecuilder-@MOLECUILDER_API_VERSION@.la \
    342         Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la \
    343         LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    344         Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
     330        UIElements/libMolecuilderUI.la \
     331        UIElements/libMolecuilderQtUI.la \
     332        Actions/libMolecuilderActions.la \
     333        libMolecuilder.la \
     334        Parser/libMolecuilderParser.la \
     335        LinearAlgebra/libMolecuilderLinearAlgebra.la \
     336        Exceptions/libMolecuilderExceptions.la \
    345337        ${CodePatterns_LIBS} \
    346338        $(BOOST_LIB) \
    … …  
    349341joiner_SOURCES = joiner.cpp datacreator.cpp datacreator.hpp periodentafel.hpp
    350342joiner_LDADD = \
    351         UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
    352         Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
    353         libMolecuilder-@MOLECUILDER_API_VERSION@.la \
    354         Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la \
    355         LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    356         Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
     343        UIElements/libMolecuilderUI.la \
     344        Actions/libMolecuilderActions.la \
     345        libMolecuilder.la \
     346        Parser/libMolecuilderParser.la \
     347        LinearAlgebra/libMolecuilderLinearAlgebra.la \
     348        Exceptions/libMolecuilderExceptions.la \
    357349        ${CodePatterns_LIBS} \
    358350        $(BOOST_LIB)
    … …  
    360352analyzer_SOURCES = analyzer.cpp datacreator.cpp periodentafel.hpp datacreator.hpp
    361353analyzer_LDADD = \
    362         UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
    363         Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
    364         libMolecuilder-@MOLECUILDER_API_VERSION@.la \
    365         Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la \
    366         LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    367         Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
     354        UIElements/libMolecuilderUI.la \
     355        Actions/libMolecuilderActions.la \
     356        libMolecuilder.la \
     357        Parser/libMolecuilderParser.la \
     358        LinearAlgebra/libMolecuilderLinearAlgebra.la \
     359        Exceptions/libMolecuilderExceptions.la \
    368360        ${CodePatterns_LIBS} \
    369361        $(BOOST_LIB)
Note: See TracChangeset for help on using the changeset viewer.