Changeset 644 for trunk/geant4/config

Timestamp:

Dec 7, 2007, 3:33:51 PM (17 years ago)

Author:

garnier

Message:

deuxieme version de la correction du ticket #99

File:

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

trunk/geant4/config/common.gmk

@@ -10 +10 @@
 endif
 G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name)
+MOC_HDRS = $(shell grep -l "Q_OBJECT" include/*.hh )
 
-all : moc ;
-moc : lib ;
+moc_files := $(patsubst include/%.hh, src/%_moc.cc, $(MOC_HDRS))
 sources := $(wildcard src/*.cc)
+sources += $(moc_files)
 objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
 dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
@@ -35 +36 @@
 # Actual gmake targets.
 #
-lib: $(g4libraries_to_build)
+
+lib: $(g4libraries_to_build) $(moc_files)
 
 ifeq ($(G4LIB_NO_SHARED),)
@@ -74 +76 @@
 #   generated by moc). Use 'grep -l' to list all the files containing the token
 
-MOC_HDRS = $(shell grep -l "Q_OBJECT" include/*.hh )
-MOC_SRCS = $(patsubst include/%.hh, src/%_moc_tmp.cc, $(MOC_HDRS))
-moc : $(MOC_SRCS)
-
-MOC = $(QTHOME)/bin/moc
-
-src/%_moc_tmp.cc: include/%.hh
+src/%_moc.cc: include/%.hh
         @echo Making moc file for $< ...
-        @if [ `$(QTHOME)/bin/moc -v 2>&1 | grep "Qt 4" | wc -l ` -gt 0 ]; then \
+        @if [ `$(QTHOME)/bin/moc -v 2>&1 | grep "Qt 3" | wc -l ` -gt 0 ]; then \
         $(MOC) -o $@ $<;\
         else $(MOC) $(MOC_MACRO) -o $@ $<; \
         fi;
-
-#       @echo Making moc file for $< ...
-#       @if [ `$(QTHOME)/bin/moc -v 2>&1 | grep "Qt 3" | wc -l ` -gt 0 ]; then \
-#       @$(MOC) -o $@ $<;\
-#       else @$(MOC) $(MOC_MACRO) -o $@ $<;
-#       fi;
 
 ###############################################################################
@@ -108 +98 @@
 # .PHONY targets are executed regardless of time-stamp of any file of
 # same name.
-.PHONY: all obj lib clean clean_libs includes
+.PHONY: all moc_files obj lib clean clean_libs includes
 
 obj: $(G4TMPDIR)/obj.last