Changeset 214240


Ignore:
Timestamp:
Apr 16, 2013, 6:30:39 AM (12 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:
a676f9
Parents:
a3fc46
git-author:
Frederik Heber <heber@…> (04/15/13 19:30:35)
git-committer:
Frederik Heber <heber@…> (04/16/13 06:30:39)
Message:

FIX: Most of the includedirs were wrongly set.

Location:
src
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/Makefile.am

    ra3fc46 r214240  
    543543libMolecuilderActionPrototypes_la_CPPFLAGS += $(JobMarket_CFLAGS)
    544544endif
    545 libMolecuilderActions_la_includedir = $(includedir)/MoleCuilder/Actions/
    546 libMolecuilderActionPrototypes_la_includedir = $(includedir)/MoleCuilder/Actions/
    547 #libMolecuilderActionPython_la_includedir = $(includedir)/MoleCuilder/Actions/
     545libMolecuilderActions_la_includedir = $(includedir)/MoleCuilder/
     546libMolecuilderActionPrototypes_la_includedir = $(includedir)/MoleCuilder/
     547#libMolecuilderActionPython_la_includedir = $(includedir)/MoleCuilder/
    548548
    549549BUILT_SOURCES += AllActionHeaders.hpp

  • src/Analysis/Makefile.am

    ra3fc46 r214240  
    1212
    1313noinst_LTLIBRARIES += libMolecuilderAnalysis.la
    14 libMolecuilderAnalysis_la_includedir = $(includedir)/MoleCuilder/Analysis/
     14libMolecuilderAnalysis_la_includedir = $(includedir)/MoleCuilder/
    1515
    1616nobase_libMolecuilderAnalysis_la_include_HEADERS = ${ANALYSISHEADER}

  • src/Atom/Makefile.am

    ra3fc46 r214240  
    4040
    4141noinst_LTLIBRARIES += libMolecuilderAtom.la
    42 libMolecuilderAtom_la_includedir = $(includedir)/MoleCuilder/Atom/
     42libMolecuilderAtom_la_includedir = $(includedir)/MoleCuilder/
    4343
    4444nobase_libMolecuilderAtom_la_include_HEADERS = $(ATOMHEADER) $(COPYATOMSHEADER)

  • src/Element/Makefile.am

    ra3fc46 r214240  
    1414
    1515noinst_LTLIBRARIES += libMolecuilderElement.la
    16 libMolecuilderElement_la_includedir = $(includedir)/MoleCuilder/Element/
     16libMolecuilderElement_la_includedir = $(includedir)/MoleCuilder/
    1717
    1818nobase_libMolecuilderElement_la_include_HEADERS = ${ELEMENTHEADER}

  • src/Filling/Makefile.am

    ra3fc46 r214240  
    4848
    4949noinst_LTLIBRARIES += libMolecuilderFilling.la
    50 libMolecuilderFilling_la_includedir = $(includedir)/MoleCuilder/Filling/
     50libMolecuilderFilling_la_includedir = $(includedir)/MoleCuilder/
    5151
    5252nobase_libMolecuilderFilling_la_include_HEADERS = ${FILLINGHEADER}

  • src/Fragmentation/Automation/Makefile.am

    ra3fc46 r214240  
    2626
    2727noinst_LTLIBRARIES += libMolecuilderFragmentationAutomation.la
    28 libMolecuilderFragmentationAutomation_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Automation/
     28libMolecuilderFragmentationAutomation_la_includedir = $(includedir)/MoleCuilder/
    2929libMolecuilderFragmentationAutomation_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS)
    3030libMolecuilderFragmentationAutomation_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}

  • src/Fragmentation/Makefile.am

    ra3fc46 r214240  
    6969        libMolecuilderFragmentation_getFromKeyset.la \
    7070        libMolecuilderFragmentation_getFromKeysetStub.la
    71 libMolecuilderFragmentation_la_includedir = $(includedir)/MoleCuilder/Fragmentation/
    72 libMolecuilderFragmentation_KeysetsContainer_la_includedir = $(includedir)/MoleCuilder/Fragmentation/
    73 libMolecuilderFragmentation_getFromKeyset_la_includedir = $(includedir)/MoleCuilder/Fragmentation/
    74 libMolecuilderFragmentation_getFromKeysetStub_la_includedir = $(includedir)/MoleCuilder/Fragmentation/
     71libMolecuilderFragmentation_la_includedir = $(includedir)/MoleCuilder/
     72libMolecuilderFragmentation_KeysetsContainer_la_includedir = $(includedir)/MoleCuilder/
     73libMolecuilderFragmentation_getFromKeyset_la_includedir = $(includedir)/MoleCuilder/
     74libMolecuilderFragmentation_getFromKeysetStub_la_includedir = $(includedir)/MoleCuilder/
    7575libMolecuilderFragmentation_la_CPPFLAGS = $(AM_CPPFLAGS)
    7676libMolecuilderFragmentation_la_LDFLAGS = $(AM_LDFLAGS)

  • src/Fragmentation/Summation/Containers/Makefile.am

    ra3fc46 r214240  
    3636
    3737noinst_LTLIBRARIES += libMolecuilderFragmentationContainers.la
    38 libMolecuilderFragmentationContainers_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Summation/Containers/
     38libMolecuilderFragmentationContainers_la_includedir = $(includedir)/MoleCuilder/
    3939libMolecuilderFragmentationContainers_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS)
    4040libMolecuilderFragmentationContainers_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}

  • src/Fragmentation/Summation/Converter/Makefile.am

    ra3fc46 r214240  
    99
    1010noinst_LTLIBRARIES += libMolecuilderFragmentationConverter.la
    11 libMolecuilderFragmentationConverter_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Summation/Converter/
     11libMolecuilderFragmentationConverter_la_includedir = $(includedir)/MoleCuilder/
    1212libMolecuilderFragmentationConverter_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    1313libMolecuilderFragmentationConverter_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}

  • src/Fragmentation/Summation/Makefile.am

    ra3fc46 r214240  
    3232
    3333lib_LTLIBRARIES += libMolecuilderFragmentationSummation.la
    34 libMolecuilderFragmentationSummation_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Summation/
     34libMolecuilderFragmentationSummation_la_includedir = $(includedir)/MoleCuilder/
    3535libMolecuilderFragmentationSummation_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    3636libMolecuilderFragmentationSummation_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}

  • src/Fragmentation/Summation/SetValues/Makefile.am

    ra3fc46 r214240  
    2020
    2121noinst_LTLIBRARIES += libMolecuilderFragmentationSetValues.la
    22 libMolecuilderFragmentationSetValues_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Summation/SetValues/
     22libMolecuilderFragmentationSetValues_la_includedir = $(includedir)/MoleCuilder/
    2323libMolecuilderFragmentationSetValues_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    2424libMolecuilderFragmentationSetValues_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}

  • src/FunctionApproximation/Makefile.am

    ra3fc46 r214240  
    2222
    2323noinst_LTLIBRARIES += libMolecuilderFunctionApproximation.la
    24 libMolecuilderFunctionApproximation_la_includedir = $(includedir)/MoleCuilder/FunctionApproximation/
     24libMolecuilderFunctionApproximation_la_includedir = $(includedir)/MoleCuilder/
    2525libMolecuilderFunctionApproximation_la_CPPFLAGS = $(AM_CPPFLAGS)
    2626libMolecuilderFunctionApproximation_la_LDFLAGS = $(AM_LDFLAGS)

  • src/Graph/Makefile.am

    ra3fc46 r214240  
    2323
    2424noinst_LTLIBRARIES += libMolecuilderGraph.la
    25 libMolecuilderGraph_la_includedir = $(includedir)/MoleCuilder/Graph/
     25libMolecuilderGraph_la_includedir = $(includedir)/MoleCuilder/
    2626
    2727nobase_libMolecuilderGraph_la_include_HEADERS = ${GRAPHHEADER}

  • src/Helpers/Makefile.am

    ra3fc46 r214240  
    1212
    1313noinst_LTLIBRARIES += libMolecuilderHelpers.la
    14 libMolecuilderHelpers_la_includedir = $(includedir)/MoleCuilder/Helpers/
     14libMolecuilderHelpers_la_includedir = $(includedir)/MoleCuilder/
    1515
    1616nobase_libMolecuilderHelpers_la_include_HEADERS = ${HELPERSHEADER}

  • src/LinkedCell/Makefile.am

    ra3fc46 r214240  
    3131
    3232noinst_LTLIBRARIES += libMolecuilderLinkedCell.la
    33 libMolecuilderLinkedCell_la_includedir = $(includedir)/MoleCuilder/LinkedCell/
     33libMolecuilderLinkedCell_la_includedir = $(includedir)/MoleCuilder/
    3434
    3535nobase_libMolecuilderLinkedCell_la_include_HEADERS = ${LINKEDCELLHEADER}

  • src/Parameters/Makefile.am

    ra3fc46 r214240  
    7777
    7878noinst_LTLIBRARIES += libMolecuilderParameters.la
    79 libMolecuilderParameters_la_includedir = $(includedir)/MoleCuilder/Parameters/
     79libMolecuilderParameters_la_includedir = $(includedir)/MoleCuilder/
    8080
    8181nobase_libMolecuilderParameters_la_include_HEADERS = ${PARAMETERHEADER}

  • src/Parser/Makefile.am

    ra3fc46 r214240  
    8484
    8585noinst_LTLIBRARIES += libMolecuilderParser.la
    86 libMolecuilderParser_la_includedir = $(includedir)/MoleCuilder/Parser/
     86libMolecuilderParser_la_includedir = $(includedir)/MoleCuilder/
    8787
    8888nobase_libMolecuilderParser_la_include_HEADERS = ${PARSERHEADER} ${PARSERPARAMETERSHEADER} $(PUGIXMLHEADER)

  • src/Potentials/Makefile.am

    ra3fc46 r214240  
    2929
    3030noinst_LTLIBRARIES += libMolecuilderPotentials.la
    31 libMolecuilderPotentials_la_includedir = $(includedir)/MoleCuilder/Potentials/
     31libMolecuilderPotentials_la_includedir = $(includedir)/MoleCuilder/
    3232
    3333nobase_libMolecuilderPotentials_la_include_HEADERS = ${POTENTIALSHEADER}

  • src/RandomNumbers/Makefile.am

    ra3fc46 r214240  
    4242
    4343lib_LTLIBRARIES += libMolecuilderRandomNumbers.la
    44 libMolecuilderRandomNumbers_includedir = $(includedir)/MoleCuilder/RandomNumbers/
     44libMolecuilderRandomNumbers_includedir = $(includedir)/MoleCuilder/
    4545nobase_libMolecuilderRandomNumbers_include_HEADERS = ${RANDOMHEADER} ${RANDOMDEFS}
    4646

  • src/Shapes/Makefile.am

    ra3fc46 r214240  
    2222
    2323lib_LTLIBRARIES += libMolecuilderShapes.la
    24 libMolecuilderShapes_la_includedir = $(includedir)/MoleCuilder/Shapes/
     24libMolecuilderShapes_la_includedir = $(includedir)/MoleCuilder/
    2525nobase_libMolecuilderShapes_la_include_HEADERS = ${SHAPEHEADER}
    2626

  • src/UIElements/Makefile.am

    ra3fc46 r214240  
    212212
    213213lib_LTLIBRARIES += libMolecuilderUI.la
    214 libMolecuilderUI_la_includedir = $(includedir)/MoleCuilder/UIElements/
     214libMolecuilderUI_la_includedir = $(includedir)/MoleCuilder/
    215215libMolecuilderUI_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    216216if CONDJOBMARKET
    … …  
    306306lib_LTLIBRARIES += libMolecuilderQtUI.la
    307307
    308 libMolecuilderQtUI_la_includedir = $(includedir)/MoleCuilder/UIElements/
     308libMolecuilderQtUI_la_includedir = $(includedir)/MoleCuilder/
    309309libMolecuilderQtUI_la_CPPFLAGS = ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}  ${JobMarket_CFLAGS}
    310310libMolecuilderQtUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
Note: See TracChangeset for help on using the changeset viewer.