Changeset d193a2 for src

Timestamp:

Aug 4, 2010, 12:37:50 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

10d290

Parents:

ca275d

Message:

Simplyfied building of QT4 mocfiles needed for GUI

File:

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

src/Makefile.am

@@ -137 +137 @@
   Shapes/Shape.hpp \
   Shapes/ShapeOps.hpp
+
   
-
-QTUIMOC_HEADER = UIElements/QT4/QTDialog.hpp \
-        UIElements/QT4/QTMainWindow.hpp \
-        UIElements/Menu/QT4/QTMenu.hpp \
-        UIElements/Views/QT4/QTWorldView.hpp \
-        UIElements/Views/QT4/GLMoleculeView.hpp \
-        UIElements/Views/QT4/QTMoleculeView.hpp \
-        UIElements/Views/QT4/QTStatusBar.hpp
- 
-QTUIMOC_TARGETS = QTMainWindow.moc.cpp \
-        QTMenu.moc.cpp\
-        QTDialog.moc.cpp \
-        QTWorldView.moc.cpp \
-        GLMoleculeView.moc.cpp \
-        QTMoleculeView.moc.cpp \
-        QTStatusBar.moc.cpp
-
 DESCRIPTORSOURCE = Descriptors/AtomDescriptor.cpp \
   Descriptors/AtomIdDescriptor.cpp \
@@ -177 +161 @@
   Descriptors/MoleculePtrDescriptor.hpp \
   Descriptors/MoleculeSelectionDescriptor.cpp
+
+
+QTUIMOC_HEADER = UIElements/QT4/QTDialog.hpp \
+        UIElements/QT4/QTMainWindow.hpp \
+        UIElements/Menu/QT4/QTMenu.hpp \
+        UIElements/Views/QT4/QTWorldView.hpp \
+        UIElements/Views/QT4/GLMoleculeView.hpp \
+        UIElements/Views/QT4/QTMoleculeView.hpp \
+        UIElements/Views/QT4/QTStatusBar.hpp
                                   
-QTUISOURCE = ${QTUIMOC_TARGETS} \
+QTUISOURCE = allmocs.moc.cpp \
         UIElements/QT4/QTMainWindow.cpp \
         UIElements/QT4/QTDialog.cpp \
@@ -337 +330 @@
 # Therfore `%'-rules do not seem to work
 #Quick fix to get it done otherwise
-${QTUIMOC_TARGETS}: ${QTUIMOC_HEADER}
+allmocs.moc.cpp: ${QTUIMOC_HEADER}
+        echo "" > allmocs.moc.cpp;\
         list='$(QTUIMOC_HEADER)'; for header in $$list; do \
         echo "Making mocfile for $$header"; \
@@ -343 +337 @@
         $(MOC) $(srcdir)/$$header -o $$target \
         || eval $$failcom; \
+        echo "#include \"$$target\"" >> allmocs.moc.cpp; \
         done;
 
-MOSTLYCLEANFILES = ${QTUIMOC_TARGETS}
+
+
+MOSTLYCLEANFILES = allmocs.moc.cpp
         
 #EXTRA_DIST = ${molecuilder_DATA}