Changeset 780 for trunk

Timestamp:

Apr 21, 2008, 5:15:00 PM (16 years ago)

Author:

garnier

Message:

r798@wl-72126: garnier | 2008-04-21 17:15:02 +0200
ca marche

Location:

trunk/geant4/config

Files:

• moc.gmk (modified) (3 diffs)
• sys/Darwin-g++.gmk (modified) (1 diff)

trunk/geant4/config/moc.gmk

@@ -13 +13 @@
 
 ifneq ($(G4INTY_BUILD_QT),)
-#  moc_inc := $(shell (grep -l "Q_OBJECT" ../OpenGL/include/*.hh))
-#  moc_sources := $(patsubst ../OpenGL/include/%.hh, moc/%_moc.cc, $(moc_inc))
-#  moc_tst := $(shell ls -al $(moc_sources) >/Users/garnier/tst)
 
   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_objects := $(patsubst moc/%.cc,$(G4TMPDIR)/%.o,$(moc_sources))
-  moc_dependencies := $(patsubst moc/%.cc,$(G4TMPDIR)/%.d,$(moc_sources))
+  moc_objects := $(patsubst moc/%_moc.cc,$(G4TMPDIR)/%_moc.o,$(moc_sources))
+  moc_dependencies := $(patsubst moc/%_moc.cc,$(G4TMPDIR)/%_moc.d,$(moc_sources))
 endif
 
@@ -40 +37 @@
 
 ifneq ($(G4INTY_BUILD_QT),)
-$(G4TMPDIR)/%.d: moc/%.cc
+$(G4TMPDIR)/%_moc.d: moc/%_moc.cc
         @echo Making dependency for moc file $< ...
         @if [ ! -d $(G4TMPDIR) ] ; then mkdir -p $(G4TMPDIR)  ;fi
@@ -58 +55 @@
         @echo Making moc file for $< ... END
 
-$(G4TMPDIR)/%.o: moc/%_moc.cc
+$(G4TMPDIR)/%_moc.o: moc/%_moc.cc
         @echo Compiling $*.cc ...
 ifdef CPPVERBOSE

trunk/geant4/config/sys/Darwin-g++.gmk

@@ -94 +94 @@
     @libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMPDIR); \
-     echo $(INTYLIBS); \
      g++ -dynamiclib -single_module -undefined dynamic_lookup \
          -o $$libdir/$(@F) $(INTYLIBS) *.o