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

Timestamp:

Mar 19, 2008, 11:59:41 AM (16 years ago)

Author:

garnier

Message:

QT moc remove before compiling

File:

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

trunk/geant4/config/common.gmk

@@ -1 @@
-# $Id: common.gmk,v 1.44 2008/01/15 11:14:58 lgarnier Exp $
+# $Id: common.gmk,v 1.50 2008/03/19 10:55:47 lgarnier Exp $
 # ----------------------------------------------------------------
 # Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
@@ -5 +5 @@
 # Libraries are created according to G4SYSTEM. G.Cosmo, 11/6/96.
 # Introduced G4LIBDIR and G4TMPDIR. G.Cosmo, 23/6/98.
-# Introduced QT moc rule,L. Garnier 12/6/07.
+# Introduced Qt moc rule, L.Garnier 15/2/08.
 
 ifndef G4LIBDIR
@@ -14 +14 @@
 moc_inc = $(shell grep -l "Q_OBJECT" include/*.hh )
 moc_files := $(patsubst include/%.hh, src/%_moc.cc, $(moc_inc))
-sources := $(wildcard src/*.cc)
-sources += $(moc_files)
+
+
+ifeq ($(G4INTY_BUILD_QT),)
+  # not so beautiful. In therory we should only remove theses files from sources 
+  sources := $(shell rm -f $(moc_files))
+  sources := $(wildcard src/*.cc)
+endif
+
+ifneq ($(G4INTY_BUILD_QT),)
+  sources := $(wildcard src/*.cc)
+  sources += $(moc_files)
+endif
+
+
 objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
 dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
@@ -66 +78 @@
 ###############################################################################
 #
-# Actual moc files for qt files
+# Actual moc files for Qt files
 #
 # moc sources and headers: used for Qt signal/slot 
 # - all headers which use signals/slots have the macro "Q_OBJECT" present
-#  in the class definitions; these all need to be processed by the
-#  "meta object compiler (moc)" which generates extra source code to
-#  implement the signal/slots, i.e., if "foo.h" contains the token "Q_OBJECT"
-#  it will be used by moc to generate the file "foo_moc.cpp" (the _moc. is
+#   in the class definitions; these all need to be processed by the
+#   "meta object compiler (moc)" which generates extra source code to
+#   implement the signal/slots, i.e., if "foo.h" contains the token "Q_OBJECT"
+#   it will be used by moc to generate the file "foo_moc.cpp" (the _moc. is
 #   just an arbitrary extension to make it easier to identify sources
 #   generated by moc).
 
+ifneq ($(G4INTY_BUILD_QT),)
 src/%_moc.cc: include/%.hh
         @echo Making moc file for $< ...
@@ -83 +96 @@
         else $(QTMOC) $(MOC_MACRO) -o $@ $<; \
         fi;
+endif
+
 
 ###############################################################################