Changeset acbe1b


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.
Files:
1 added
1 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • configure.ac

    rdc031c racbe1b  
    2929# refer to the libtool manual, section "Updating library version information":
    3030# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
    31 AC_SUBST([MOLECUILDER_SO_VERSION], [1:2:0])
     31AC_SUBST([MOLECUILDER_SO_VERSION], [1:0:0])
    3232AC_SUBST([MOLECUILDER_API_VERSION], [1.0])
    3333
    … …  
    211211        doc/molecuilder.xml])
    212212AC_CONFIG_FILES([
    213   molecuilder-${MOLECUILDER_API_VERSION}.pc:molecuilder.pc.in])
     213  MoleCuilder.pc:MoleCuilder.pc.in])
    214214AC_CONFIG_FILES([
    215215        Makefile

  • src/Actions/Makefile.am

    rdc031c racbe1b  
    216216
    217217
    218 lib_LTLIBRARIES = libMolecuilderActions-@MOLECUILDER_API_VERSION@.la
    219 libMolecuilderActions_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/
     218lib_LTLIBRARIES = libMolecuilderActions.la
     219libMolecuilderActions_includedir = $(includedir)/MoleCuilder/Actions/
    220220libMolecuilderActions_libs = \
    221         ../Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la \
    222         ../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la
     221        ../Parser/libMolecuilderParser.la \
     222        ../UIElements/libMolecuilderUI.la
    223223nobase_libMolecuilderActions_include_HEADERS = ${ACTIONSHEADER}
    224224
    … …  
    231231## from each source file.  Note that it is not necessary to list header files
    232232## which are already listed elsewhere in a _HEADERS variable assignment.
    233 libMolecuilderActions_@MOLECUILDER_API_VERSION@_la_SOURCES = ${ACTIONSSOURCE}
     233libMolecuilderActions_la_SOURCES = ${ACTIONSSOURCE}
    234234
    235235## Instruct libtool to include ABI version information in the generated shared
    236236## library file (.so).  The library ABI version is defined in configure.ac, so
    237237## that all version information is kept in one place.
    238 libMolecuilderActions_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     238libMolecuilderActions_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    239239
    240240## The generated configuration header is installed in its own subdirectory of
    … …  
    249249## configuration header file is generated at configure time and should not be
    250250## shipped with the source tarball.
    251 libMolecuilderActions_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
    252 nodist_libMolecuilderActions_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
     251#libMolecuilderActions_libincludedir = $(libdir)/MoleCuilder/include
     252#nodist_libMolecuilderActions_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
    253253
    254254## Install the generated pkg-config file (.pc) into the expected location for
    … …  
    256256## pkg-config files are also used for architecture-independent data packages,
    257257## in which case the correct install location would be $(datadir)/pkgconfig.
    258 pkgconfigdir = $(libdir)/pkgconfig
    259 pkgconfig_DATA = $(top_builddir)/molecuilder-$(MOLECUILDER_API_VERSION).pc
     258#pkgconfigdir = $(libdir)/pkgconfig
     259#pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
    260260
    261261unity.cpp:

  • src/Actions/unittests/Makefile.am

    rdc031c racbe1b  
    1818BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    1919GSLLIBS = \
    20         ../../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    21         ../../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
     20        ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
     21        ../../Exceptions/libMolecuilderExceptions.la \
    2222        ${CodePatterns_LIBS} \
    2323        $(BOOST_LIB)
    2424ALLLIBS = \
    25         ../../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
    26         ../../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
     25        ../../UIElements/libMolecuilderUI.la \
     26        ../../Actions/libMolecuilderActions.la \
    2727        ${PARSERLIBS} \
    28         ../../libMolecuilder-@MOLECUILDER_API_VERSION@.la \
     28        ../../libMolecuilder.la \
    2929        ${GSLLIBS}
    3030
    31 PARSERLIBS = ../../Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la
    32 UILIBS = ../../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la 
     31PARSERLIBS = ../../Parser/libMolecuilderParser.la
     32UILIBS = ../../UIElements/libMolecuilderUI.la 
    3333
    3434

  • src/Descriptors/unittests/Makefile.am

    rdc031c racbe1b  
    1616BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    1717GSLLIBS = \
    18         ../../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    19         ../../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
     18        ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
     19        ../../Exceptions/libMolecuilderExceptions.la \
    2020        ${CodePatterns_LIBS} \
    2121        $(BOOST_LIB)
    2222ALLLIBS = \
    23         ../../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
    24         ../../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
     23        ../../UIElements/libMolecuilderUI.la \
     24        ../../Actions/libMolecuilderActions.la \
    2525        ${PARSERLIBS} \
    26         ../../libMolecuilder-@MOLECUILDER_API_VERSION@.la \
     26        ../../libMolecuilder.la \
    2727        ${GSLLIBS}
    2828
    29 PARSERLIBS = ../../Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la
    30 UILIBS = ../../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la 
     29PARSERLIBS = ../../Parser/libMolecuilderParser.la
     30UILIBS = ../../UIElements/libMolecuilderUI.la 
    3131
    3232

  • src/Exceptions/Makefile.am

    rdc031c racbe1b  
    3636
    3737
    38 lib_LTLIBRARIES = libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la
    39 libMolecuilderExceptions_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Exceptions/
     38lib_LTLIBRARIES = libMolecuilderExceptions.la
     39libMolecuilderExceptions_includedir = $(includedir)/MoleCuilder/Exceptions/
    4040nobase_libMolecuilderExceptions_include_HEADERS = ${EXCEPTIONHEADER}
    4141
    … …  
    4848## from each source file.  Note that it is not necessary to list header files
    4949## which are already listed elsewhere in a _HEADERS variable assignment.
    50 libMolecuilderExceptions_@MOLECUILDER_API_VERSION@_la_SOURCES = ${EXCEPTIONSOURCE}
     50libMolecuilderExceptions_la_SOURCES = ${EXCEPTIONSOURCE}
    5151
    5252## Instruct libtool to include ABI version information in the generated shared
    5353## library file (.so).  The library ABI version is defined in configure.ac, so
    5454## that all version information is kept in one place.
    55 libMolecuilderExceptions_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     55libMolecuilderExceptions_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    5656
    5757## The generated configuration header is installed in its own subdirectory of
    … …  
    6666## configuration header file is generated at configure time and should not be
    6767## shipped with the source tarball.
    68 libMolecuilderExceptions_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
    69 nodist_libMolecuilderExceptions_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
     68#libMolecuilderExceptions_libincludedir = $(libdir)/MoleCuilder/include
     69#nodist_libMolecuilderExceptions_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
    7070
    7171## Install the generated pkg-config file (.pc) into the expected location for
    … …  
    7373## pkg-config files are also used for architecture-independent data packages,
    7474## in which case the correct install location would be $(datadir)/pkgconfig.
    75 pkgconfigdir = $(libdir)/pkgconfig
    76 pkgconfig_DATA = $(top_builddir)/molecuilder-$(MOLECUILDER_API_VERSION).pc
     75#pkgconfigdir = $(libdir)/pkgconfig
     76#pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
    7777
    7878unity.cpp:

  • src/LinearAlgebra/Makefile.am

    rdc031c racbe1b  
    5151
    5252
    53 lib_LTLIBRARIES = libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la
    54 libMolecuilderLinearAlgebra_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/
    55 libMolecuilderLinearAlgebra_libs = ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la $(GSL_LIBS)
     53lib_LTLIBRARIES = libMolecuilderLinearAlgebra.la
     54libMolecuilderLinearAlgebra_includedir = $(includedir)/MoleCuilder/LinearAlgebra/
     55libMolecuilderLinearAlgebra_libs = ../Exceptions/libMolecuilderExceptions.la $(GSL_LIBS)
    5656nobase_libMolecuilderLinearAlgebra_include_HEADERS = ${LINALGHEADER}
    5757
    … …  
    6464## from each source file.  Note that it is not necessary to list header files
    6565## which are already listed elsewhere in a _HEADERS variable assignment.
    66 libMolecuilderLinearAlgebra_@MOLECUILDER_API_VERSION@_la_SOURCES = ${LINALGSOURCE}
     66libMolecuilderLinearAlgebra_la_SOURCES = ${LINALGSOURCE}
    6767
    6868## Instruct libtool to include ABI version information in the generated shared
    6969## library file (.so).  The library ABI version is defined in configure.ac, so
    7070## that all version information is kept in one place.
    71 libMolecuilderLinearAlgebra_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     71libMolecuilderLinearAlgebra_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    7272
    7373## The generated configuration header is installed in its own subdirectory of
    … …  
    8282## configuration header file is generated at configure time and should not be
    8383## shipped with the source tarball.
    84 libMolecuilderLinearAlgebra_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
    85 nodist_libMolecuilderLinearAlgebra_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
     84#libMolecuilderLinearAlgebra_libincludedir = $(libdir)/MoleCuilder/include
     85#nodist_libMolecuilderLinearAlgebra_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
    8686
    8787## Install the generated pkg-config file (.pc) into the expected location for
    … …  
    8989## pkg-config files are also used for architecture-independent data packages,
    9090## in which case the correct install location would be $(datadir)/pkgconfig.
    91 pkgconfigdir = $(libdir)/pkgconfig
    92 pkgconfig_DATA = $(top_builddir)/molecuilder-$(MOLECUILDER_API_VERSION).pc
     91#pkgconfigdir = $(libdir)/pkgconfig
     92#pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
    9393
    9494unity.cpp:

  • src/LinearAlgebra/unittests/Makefile.am

    rdc031c racbe1b  
    2323BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    2424GSLLIBS = \
    25         ../../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    26         ../../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
     25        ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
     26        ../../Exceptions/libMolecuilderExceptions.la \
    2727        ${CodePatterns_LIBS} \
    2828        $(BOOST_LIB)

  • 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)

  • src/Parser/Makefile.am

    rdc031c racbe1b  
    3434
    3535
    36 lib_LTLIBRARIES = libMolecuilderParser-@MOLECUILDER_API_VERSION@.la
    37 libMolecuilderParser_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/
     36lib_LTLIBRARIES = libMolecuilderParser.la
     37libMolecuilderParser_includedir = $(includedir)/MoleCuilder/Parser/
    3838nobase_libMolecuilderParser_include_HEADERS = ${PARSERHEADER}
    3939
    … …  
    4646## from each source file.  Note that it is not necessary to list header files
    4747## which are already listed elsewhere in a _HEADERS variable assignment.
    48 libMolecuilderParser_@MOLECUILDER_API_VERSION@_la_SOURCES = ${PARSERSOURCE}
     48libMolecuilderParser_la_SOURCES = ${PARSERSOURCE}
    4949
    5050## Instruct libtool to include ABI version information in the generated shared
    5151## library file (.so).  The library ABI version is defined in configure.ac, so
    5252## that all version information is kept in one place.
    53 libMolecuilderParser_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     53libMolecuilderParser_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    5454
    5555## The generated configuration header is installed in its own subdirectory of
    … …  
    6464## configuration header file is generated at configure time and should not be
    6565## shipped with the source tarball.
    66 libMolecuilderParser_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
    67 nodist_libMolecuilderParser_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
     66#libMolecuilderParser_libincludedir = $(libdir)/MoleCuilder/include
     67#nodist_libMolecuilderParser_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
    6868
    6969## Install the generated pkg-config file (.pc) into the expected location for
    … …  
    7171## pkg-config files are also used for architecture-independent data packages,
    7272## in which case the correct install location would be $(datadir)/pkgconfig.
    73 pkgconfigdir = $(libdir)/pkgconfig
    74 pkgconfig_DATA = $(top_builddir)/molecuilder-$(MOLECUILDER_API_VERSION).pc
     73#pkgconfigdir = $(libdir)/pkgconfig
     74#pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
    7575
    7676unity.cpp:

  • src/Parser/unittests/Makefile.am

    rdc031c racbe1b  
    1717BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    1818GSLLIBS = \
    19         ../../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    20         ../../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
     19        ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
     20        ../../Exceptions/libMolecuilderExceptions.la \
    2121        ${CodePatterns_LIBS} \
    2222        $(BOOST_LIB)
    2323
    2424ALLLIBS = \
    25         ../../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
    26         ../../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
     25        ../../UIElements/libMolecuilderUI.la \
     26        ../../Actions/libMolecuilderActions.la \
    2727        ${PARSERLIBS} \
    28         ../../libMolecuilder-@MOLECUILDER_API_VERSION@.la \
     28        ../../libMolecuilder.la \
    2929        ${GSLLIBS}
    3030
    31 PARSERLIBS = ../../Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la
    32 UILIBS = ../../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la 
     31PARSERLIBS = ../../Parser/libMolecuilderParser.la
     32UILIBS = ../../UIElements/libMolecuilderUI.la 
    3333
    3434ParserCommonUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \

  • src/UIElements/Makefile.am

    rdc031c racbe1b  
    230230
    231231
    232 lib_LTLIBRARIES = libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
    233         libMolecuilderQtUI-@MOLECUILDER_API_VERSION@.la
    234 libMolecuilderUI_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/
    235 libMolecuilderQtUI_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/
    236 libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_LIBS = \
    237         Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la
    238 libMolecuilderQtUI_@MOLECUILDER_API_VERSION@_la_LIBS = \
    239         Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la
    240 
    241 libMolecuilderQtUI_@MOLECUILDER_API_VERSION@_la_LIBADD = ${QT_LIB_GUI} -lQtOpenGL ${GLU_LIBS} ${QT_LDADD}
     232lib_LTLIBRARIES = libMolecuilderUI.la \
     233        libMolecuilderQtUI.la
     234libMolecuilderUI_includedir = $(includedir)/MoleCuilder/UIElements/
     235libMolecuilderQtUI_includedir = $(includedir)/MoleCuilder/UIElements/
     236libMolecuilderUI_la_LIBS = \
     237        Actions/libMolecuilderActions.la
     238libMolecuilderQtUI_la_LIBS = \
     239        Actions/libMolecuilderActions.la
     240
     241libMolecuilderQtUI_la_LIBADD = ${QT_LIB_GUI} -lQtOpenGL ${GLU_LIBS} ${QT_LDADD}
    242242
    243243nobase_libMolecuilderUI_include_HEADERS = ${UIHEADER}
    … …  
    252252## from each source file.  Note that it is not necessary to list header files
    253253## which are already listed elsewhere in a _HEADERS variable assignment.
    254 libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_SOURCES = ${UISOURCE}
    255 libMolecuilderQtUI_@MOLECUILDER_API_VERSION@_la_SOURCES = ${QTUISOURCE}
     254libMolecuilderUI_la_SOURCES = ${UISOURCE}
     255libMolecuilderQtUI_la_SOURCES = ${QTUISOURCE}
    256256
    257257## Instruct libtool to include ABI version information in the generated shared
    258258## library file (.so).  The library ABI version is defined in configure.ac, so
    259259## that all version information is kept in one place.
    260 libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    261 libMolecuilderQtUI_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     260libMolecuilderUI_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     261libMolecuilderQtUI_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    262262
    263263## The generated configuration header is installed in its own subdirectory of
    … …  
    272272## configuration header file is generated at configure time and should not be
    273273## shipped with the source tarball.
    274 libMolecuilderUI_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
    275 libMolecuilderQtUI_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
    276 nodist_libMolecuilderUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
    277 nodist_libMolecuilderQtUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
     274#libMolecuilderUI_libincludedir = $(libdir)/MoleCuilder/include
     275#libMolecuilderQtUI_libincludedir = $(libdir)/MoleCuilder/include
     276#nodist_libMolecuilderUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
     277#nodist_libMolecuilderQtUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
    278278
    279279## Install the generated pkg-config file (.pc) into the expected location for
    … …  
    281281## pkg-config files are also used for architecture-independent data packages,
    282282## in which case the correct install location would be $(datadir)/pkgconfig.
    283 pkgconfigdir = $(libdir)/pkgconfig
    284 pkgconfig_DATA = $(top_builddir)/molecuilder-$(MOLECUILDER_API_VERSION).pc
     283#pkgconfigdir = $(libdir)/pkgconfig
     284#pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
    285285
    286286unity.cpp:

  • src/unittests/Makefile.am

    rdc031c racbe1b  
    3737BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    3838GSLLIBS = \
    39         ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    40         ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
     39        ../LinearAlgebra/libMolecuilderLinearAlgebra.la \
     40        ../Exceptions/libMolecuilderExceptions.la \
    4141        $(BOOST_LIB)
    4242ALLLIBS = \
    43         ../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
    44         ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
     43        ../UIElements/libMolecuilderUI.la \
     44        ../Actions/libMolecuilderActions.la \
    4545        ${PARSERLIBS} \
    46         ../libMolecuilder-@MOLECUILDER_API_VERSION@.la \
     46        ../libMolecuilder.la \
    4747        ${GSLLIBS}
    4848
    49 PARSERLIBS = ../Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la
    50 UILIBS = ../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la 
     49PARSERLIBS = ../Parser/libMolecuilderParser.la
     50UILIBS = ../UIElements/libMolecuilderUI.la
    5151
    5252TESTSOURCES = \
Note: See TracChangeset for help on using the changeset viewer.