Changeset 781 for trunk/geant4/config

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

Location:

trunk/geant4/config

Files:

• common.gmk (modified) (1 diff)
• moc.gmk (modified) (4 diffs)

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 :=

trunk/geant4/config/moc.gmk

@@ -13 +13 @@
 
 ifneq ($(G4INTY_BUILD_QT),)
-
-  moc_dir_name := OpenGL
-  moc_inc := $(shell (grep -l "Q_OBJECT" ../$(moc_dir_name)/include/*.hh))
-  moc_sources := $(patsubst ../$(moc_dir_name)/include/%.hh, moc/%_moc.cc, $(moc_inc))
+  moc_inc := $(shell (grep -l "Q_OBJECT" include/*.hh))
+  moc_sources := $(patsubst include/%.hh, moc/%_moc.cc, $(moc_inc))
   moc_objects := $(patsubst moc/%_moc.cc,$(G4TMPDIR)/%_moc.o,$(moc_sources))
   moc_dependencies := $(patsubst moc/%_moc.cc,$(G4TMPDIR)/%_moc.d,$(moc_sources))
@@ -44 +42 @@
         sed 's!$*\.o!$(G4TMPDIR)/& $@!' >$@;\
         [ -s $@ ] || rm -f $@
-        @echo Making dependency for moc file $< ... END
 
 moc/%_moc.cc: include/%.hh
@@ -53 +50 @@
         else $(QTMOC) $(MOC_MACRO) -o $@ $<; \
         fi;
-        @echo Making moc file for $< ... END
 
+# could be better if we not duplicate this rule from common.gmk...
 $(G4TMPDIR)/%_moc.o: moc/%_moc.cc
         @echo Compiling $*.cc ...
@@ -61 +58 @@
         $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F)_moc.o moc/$*_moc.cc
 else
-        @echo Compiling moc file $*.cc ...
-        @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F)_moc.o moc/$*_moc.cc
+        $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F)_moc.o moc/$*_moc.cc
 endif
 endif