Changeset acbe1b for src/UIElements

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:

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

src/UIElements/Makefile.am

@@ -230 +230 @@
 
 
-lib_LTLIBRARIES = libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
-        libMolecuilderQtUI-@MOLECUILDER_API_VERSION@.la
-libMolecuilderUI_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/
-libMolecuilderQtUI_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/ 
-libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_LIBS = \
-        Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la
-libMolecuilderQtUI_@MOLECUILDER_API_VERSION@_la_LIBS = \
-        Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la
-
-libMolecuilderQtUI_@MOLECUILDER_API_VERSION@_la_LIBADD = ${QT_LIB_GUI} -lQtOpenGL ${GLU_LIBS} ${QT_LDADD}
+lib_LTLIBRARIES = libMolecuilderUI.la \
+        libMolecuilderQtUI.la
+libMolecuilderUI_includedir = $(includedir)/MoleCuilder/UIElements/
+libMolecuilderQtUI_includedir = $(includedir)/MoleCuilder/UIElements/ 
+libMolecuilderUI_la_LIBS = \
+        Actions/libMolecuilderActions.la
+libMolecuilderQtUI_la_LIBS = \
+        Actions/libMolecuilderActions.la
+
+libMolecuilderQtUI_la_LIBADD = ${QT_LIB_GUI} -lQtOpenGL ${GLU_LIBS} ${QT_LDADD}
 
 nobase_libMolecuilderUI_include_HEADERS = ${UIHEADER}
@@ -252 +252 @@
 ## from each source file.  Note that it is not necessary to list header files
 ## which are already listed elsewhere in a _HEADERS variable assignment.
-libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_SOURCES = ${UISOURCE}
-libMolecuilderQtUI_@MOLECUILDER_API_VERSION@_la_SOURCES = ${QTUISOURCE}
+libMolecuilderUI_la_SOURCES = ${UISOURCE}
+libMolecuilderQtUI_la_SOURCES = ${QTUISOURCE}
 
 ## Instruct libtool to include ABI version information in the generated shared
 ## library file (.so).  The library ABI version is defined in configure.ac, so
 ## that all version information is kept in one place.
-libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
-libMolecuilderQtUI_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
+libMolecuilderUI_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
+libMolecuilderQtUI_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
 
 ## The generated configuration header is installed in its own subdirectory of
@@ -272 +272 @@
 ## configuration header file is generated at configure time and should not be
 ## shipped with the source tarball.
-libMolecuilderUI_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
-libMolecuilderQtUI_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
-nodist_libMolecuilderUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
-nodist_libMolecuilderQtUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
+#libMolecuilderUI_libincludedir = $(libdir)/MoleCuilder/include
+#libMolecuilderQtUI_libincludedir = $(libdir)/MoleCuilder/include
+#nodist_libMolecuilderUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
+#nodist_libMolecuilderQtUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
 
 ## Install the generated pkg-config file (.pc) into the expected location for
@@ -281 +281 @@
 ## pkg-config files are also used for architecture-independent data packages,
 ## in which case the correct install location would be $(datadir)/pkgconfig.
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(top_builddir)/molecuilder-$(MOLECUILDER_API_VERSION).pc
+#pkgconfigdir = $(libdir)/pkgconfig
+#pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
 
 unity.cpp: