Changeset 781 for trunk/geant4
- Timestamp:
- Apr 22, 2008, 6:00:13 PM (16 years ago)
- Location:
- trunk/geant4/config
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/config/common.gmk
r777 r781 11 11 G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name) 12 12 13 sources := $(wildcard src/*.cc) 13 ifneq ($(G4INTY_BUILD_QT),) 14 dependencies := $(moc_dependencies) 15 endif 16 dependencies += $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources)) 14 17 15 objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources)) 16 17 dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources)) 18 19 #ifneq ($(G4INTY_BUILD_QT),) 20 sources += $(moc_sources) 21 objects += $(moc_objects) 22 dependencies += $(moc_dependencies) 23 #endif 18 ifneq ($(G4INTY_BUILD_QT),) 19 objects := $(moc_objects) 20 endif 21 sources += $(wildcard src/*.cc) 22 objects += $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources)) 24 23 25 24 g4libraries_to_build := -
trunk/geant4/config/moc.gmk
r780 r781 13 13 14 14 ifneq ($(G4INTY_BUILD_QT),) 15 16 moc_dir_name := OpenGL 17 moc_inc := $(shell (grep -l "Q_OBJECT" ../$(moc_dir_name)/include/*.hh)) 18 moc_sources := $(patsubst ../$(moc_dir_name)/include/%.hh, moc/%_moc.cc, $(moc_inc)) 15 moc_inc := $(shell (grep -l "Q_OBJECT" include/*.hh)) 16 moc_sources := $(patsubst include/%.hh, moc/%_moc.cc, $(moc_inc)) 19 17 moc_objects := $(patsubst moc/%_moc.cc,$(G4TMPDIR)/%_moc.o,$(moc_sources)) 20 18 moc_dependencies := $(patsubst moc/%_moc.cc,$(G4TMPDIR)/%_moc.d,$(moc_sources)) … … 44 42 sed 's!$*\.o!$(G4TMPDIR)/& $@!' >$@;\ 45 43 [ -s $@ ] || rm -f $@ 46 @echo Making dependency for moc file $< ... END47 44 48 45 moc/%_moc.cc: include/%.hh … … 53 50 else $(QTMOC) $(MOC_MACRO) -o $@ $<; \ 54 51 fi; 55 @echo Making moc file for $< ... END56 52 53 # could be better if we not duplicate this rule from common.gmk... 57 54 $(G4TMPDIR)/%_moc.o: moc/%_moc.cc 58 55 @echo Compiling $*.cc ... … … 61 58 $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F)_moc.o moc/$*_moc.cc 62 59 else 63 @echo Compiling moc file $*.cc ... 64 @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F)_moc.o moc/$*_moc.cc 60 $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F)_moc.o moc/$*_moc.cc 65 61 endif 66 62 endif
Note: See TracChangeset
for help on using the changeset viewer.