Changeset 781 for trunk/geant4/config/common.gmk

Timestamp:

Apr 22, 2008, 6:00:13 PM (16 years ago)

Author:

garnier

Message:

r800@wl-72126: garnier | 2008-04-21 18:28:15 +0200
en mieux

File:

• trunk/geant4/config/common.gmk (modified) (1 diff)

trunk/geant4/config/common.gmk

@@ -11 +11 @@
 G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name)
 
-sources := $(wildcard src/*.cc)
+ifneq ($(G4INTY_BUILD_QT),)
+  dependencies := $(moc_dependencies)
+endif
+dependencies += $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
 
-objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
-
-dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
-
-#ifneq ($(G4INTY_BUILD_QT),)
-  sources += $(moc_sources)
-  objects += $(moc_objects)
-  dependencies += $(moc_dependencies)
-#endif
+ifneq ($(G4INTY_BUILD_QT),)
+  objects := $(moc_objects)
+endif
+sources += $(wildcard src/*.cc)
+objects += $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
 
    g4libraries_to_build :=