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

Timestamp:

Apr 8, 2008, 7:30:23 PM (16 years ago)

Author:

garnier

Message:

modif depuis que mon mac a plante : mise a jour des moc en mieux

File:

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

trunk/geant4/config/common.gmk

@@ -1 @@
-# $Id: common.gmk,v 1.50 2008/03/19 10:55:47 lgarnier Exp $
+# $Id: common.gmk,v 1.51 2008/04/04 10:35:20 gcosmo 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 15/2/08.
 
 ifndef G4LIBDIR
@@ -12 +11 @@
 G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name)
 
-moc_inc = $(shell grep -l "Q_OBJECT" include/*.hh )
-moc_files := $(patsubst include/%.hh, src/%_moc.cc, $(moc_inc))
-
-
-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
+sources := $(wildcard src/*.cc)
 
 ifneq ($(G4INTY_BUILD_QT),)
-  sources := $(wildcard src/*.cc)
-  sources += $(moc_files)
+  sources += $(moc_sources)
 endif
-
 
 objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
@@ -76 +65 @@
 endif
 
-###############################################################################
-#
-# 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
-#   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 $< ...
-        @if [ `$(QTHOME)/bin/moc -v 2>&1 | grep "Qt 3" | wc -l ` -gt 0 ]; then \
-        $(QTMOC) -o $@ $<;\
-        else $(QTMOC) $(MOC_MACRO) -o $@ $<; \
-        fi;
-endif
-
 
 ###############################################################################
@@ -114 +81 @@
 # .PHONY targets are executed regardless of time-stamp of any file of
 # same name.
-.PHONY: all moc_inc obj lib clean clean_libs includes
+.PHONY: all obj lib clean clean_libs includes
 
 obj: $(G4TMPDIR)/obj.last