Changeset 1045 for trunk/config/moc.gmk

Timestamp:

May 15, 2009, 12:28:43 PM (15 years ago)

Author:

garnier

Message:

maj en aussi sur CVS

File:

• trunk/config/moc.gmk (modified) (3 diffs)

trunk/config/moc.gmk

@@ -1 @@
-# $Id: moc.gmk,v 1.2 2008/11/24 14:19:44 lgarnier Exp $
+# $Id: moc.gmk,v 1.3 2008/12/03 13:35:36 gcosmo Exp $
 # ----------------------------------------------------------------
 # Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
@@ -13 +13 @@
 
 ifneq ($(G4INTY_BUILD_QT),)
-  moc_inc := $(shell (grep -l "Q_OBJECT" include/*.hh))
+  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))
@@ -46 +46 @@
         @echo Making moc file for $< ...
         @if [ ! -d moc ] ; then mkdir -p moc  ;fi
-        @if [ `$(QTMOC) -v 2>&1 | grep "Qt 3" | wc -l ` -gt 0 ]; then \
+        @if [ `$(QTMOC) -v 2>&1 | $(GREP) "Qt 3" | wc -l ` -gt 0 ]; then \
         $(QTMOC) -o $@ $<;\
         else $(QTMOC) $(MOC_MACRO) -o $@ $<; \