Changed Print() to take into account the case where merging was used (AliRunDigitizer)

[u/mrichter/AliRoot.git] / conf / GeneralMacros

diff --git a/conf/GeneralMacros b/conf/GeneralMacros
index 31841a9ac44374f313670a739779eb78ce37d71c..afa796bf68d3565df08727867b6adca7da17647f 100644 (file)
--- a/conf/GeneralMacros
+++ b/conf/GeneralMacros
@@ -26,16 +26,24 @@ $(PROGRAM):
                @echo "Generating $@"
                @[ -d $(dir $@) ] || mkdir $(dir $@)
                @rm -f $@
+ifeq ($(CXXVERBOSE),)
                @$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+else
+               $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+endif
  
 headers:       $(patsubst %,$(ALICE_ROOT)/include/%,$(HEADERS))
 
 $(DICT):
                @echo "Generating $@"
-               @rootcint -f $@ -c -I$(ALICE_ROOT)/include $^
+ifeq ($(CXXVERBOSE),)
+               @rootcint -f $@ -c $(filter -I%,$(CXXFLAGS)) $^
+else
+               rootcint -f $@ -c $(filter -I%,$(CXXFLAGS)) $^
+endif
  
 depend:
-               @$(MAKEDEPEND) -ftgt_$(ALICE_TARGET)/Make-depend -ptgt_$(ALICE_TARGET)/ -- $(CXXFLAGS) $(DEPINC) -- $^
+               -@$(MAKEDEPEND) -ftgt_$(ALICE_TARGET)/Make-depend -ptgt_$(ALICE_TARGET)/ -- $(CXXFLAGS) $(DEPINC) -- $^ 2>/dev/null
 
 tgt_$(ALICE_TARGET)/Make-depend:
                @[ -d $(dir $@) ] || mkdir $(dir $@)
@@ -51,15 +59,19 @@ macroclean:
 
 check:         $(CHECKS)
 
+PREPROC       = $(patsubst %.viol,%.i,$(CHECKS))
+
 REVENGS       = $(patsubst %.viol,%.ii,$(CHECKS))
 
-.SECONDARY: $(REVENGS)
+.SECONDARY: $(REVENGS) $(PREPROC)
 
 reveng:                check/classDiagram.dot
 
-check/classDiagram.dot:        $(REVENGS)
+check/classDiagram.dot:        $(PREPROC)
        @$(REV_ENG) $^
        @-mv classDiagram.dot $@
 
 revdisp:       reveng
        @$(IRST_INSTALLDIR)/scripts/revEngInterface.sh check/classDiagram.dot
+
+