CXXVERBOSE applies now to link and DICT generation

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

diff --git a/conf/GeneralMacros b/conf/GeneralMacros
index a9c746debbec502589a59ed079d526381673d20a..67de8a4a762e4251424e0966bfc535e7de6d26aa 100644 (file)
--- a/conf/GeneralMacros
+++ b/conf/GeneralMacros
@@ -1,8 +1,10 @@
+# $Id$
+ 
 ########################## General Macros #####################################
 
 $(SLIBRARY):
-               @echo "Generating $@ for $(PACKAGE)..."
-               @[ -d $(dir $@) ] || mkdir $(dir $@)
+               @echo "Generating $@"
+               @[ -d $(dir $@) ] || mkdir -p $(dir $@)
                @rm -f $@
                 ifeq ($(PLATFORM),aix)
                   @cd tgt_$(ALICE_TARGET) ;\
@@ -12,29 +14,33 @@ $(SLIBRARY):
                   $(SHLD) $(SOFLAGS) $(LDFLAGS) $(patsubst tgt_$(ALICE_TARGET)/%,%,$(filter-out dirs,$^)) $(SHLIB) -o $@
                 endif
                @chmod 555 $@
-               @echo "$@ done"
 
 
 $(ALIBRARY):   
-               @echo "Generating $@ for $(PACKAGE)..."
-               @[ -d $(dir $@) ] || mkdir $(dir $@)
+               @echo "Generating $@"
+               @[ -d $(dir $@) ] || mkdir -p $(dir $@)
                @rm -f $@
                @ar rv $@ $^
-               @echo "$@ done"
  
 $(PROGRAM):    
-               @echo "Generating $@ for $(PACKAGE)..."
+               @echo "Generating $@"
                @[ -d $(dir $@) ] || mkdir $(dir $@)
                @rm -f $@
+ifeq ($(CXXVERBOSE),)
                @$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-               @echo "$@ done"
+else
+               $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+endif
  
 headers:       $(patsubst %,$(ALICE_ROOT)/include/%,$(HEADERS))
 
 $(DICT):
-               @echo "Generating $@ for $(PACKAGE)..."
-               @rootcint -f $@ -c -I$(ALICE_ROOT)/include $^
-               @echo "$@ done"
+               @echo "Generating $@"
+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) -- $^
@@ -46,3 +52,24 @@ tgt_$(ALICE_TARGET)/Make-depend:
 macroclean:
                @rm -f $(TOCLEAN) *~ \#*
 
+
+### Target check creates violation reports (.viol), which depend on
+### stripped files (.ii), which in turn depend on preprocessed
+### files (.i). Dependences are in GeneralDef.
+
+check:         $(CHECKS)
+
+PREPROC       = $(patsubst %.viol,%.i,$(CHECKS))
+
+REVENGS       = $(patsubst %.viol,%.ii,$(CHECKS))
+
+.SECONDARY: $(REVENGS) $(PREPROC)
+
+reveng:                check/classDiagram.dot
+
+check/classDiagram.dot:        $(REVENGS)
+       @$(REV_ENG) $^
+       @-mv classDiagram.dot $@
+
+revdisp:       reveng
+       @$(IRST_INSTALLDIR)/scripts/revEngInterface.sh check/classDiagram.dot