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

Timestamp:

Apr 30, 2008, 6:30:42 PM (16 years ago)

Author:

garnier

Message:

r818@wl-72126: garnier | 2008-04-30 12:42:00 +0200
modif mise a jour sur le cvs

File:

• trunk/geant4/config/common.gmk (modified) (2 diffs)

trunk/geant4/config/common.gmk

@@ -1 @@
-# $Id: common.gmk,v 1.51 2008/04/04 10:35:20 gcosmo Exp $
+# $Id: common.gmk,v 1.52 2008/04/30 10:40:12 lgarnier Exp $
 # ----------------------------------------------------------------
 # Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
@@ -12 +12 @@
 G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name)
 
-ifneq ($(G4INTY_BUILD_QT),)
-  dependencies := $(moc_dependencies)
-endif
-dependencies += $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
+sources      := $(wildcard src/*.cc)
+dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
+objects      := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
 
 ifneq ($(G4INTY_BUILD_QT),)
-  objects := $(moc_objects)
+ sources      += $(moc_sources)
+ dependencies += $(moc_dependencies)
+ objects      += $(moc_objects)
 endif
-sources += $(wildcard src/*.cc)
-
-objects += $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
 
    g4libraries_to_build :=