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

Timestamp:

Apr 21, 2008, 11:30:16 AM (16 years ago)

Author:

garnier

Message:

r792@wl-72126: garnier | 2008-04-17 18:09:44 +0200
modif pour test sur un dossier moc

File:

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

trunk/geant4/config/common.gmk

@@ -13 +13 @@
 sources := $(wildcard src/*.cc)
 
+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
-
-objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
-moc_tst := $(shell ls -al * >/Users/garnier/tst)
-
-dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
 
    g4libraries_to_build :=
@@ -48 +49 @@
 $(G4LIBDIR)/lib$(name).$(SHEXT): $(G4TMPDIR)/obj.last
         @if [ ! -d $(G4LIBDIR) ] ; then mkdir $(G4LIBDIR) ;fi
-        @echo Creating shared library $@ ...
+        @echo Creating shared library $@ ... $(objects)
         @$(RM) $@
 #      use architecture specific macro defined in sys/$(G4SYSTEM).gmk