add global trigger info in FillESD, correct filling of ESD

[u/mrichter/AliRoot.git] / build / module.tpl

diff --git a/build/module.tpl b/build/module.tpl
index e549cc559964fe063ddf9d2ca9be2ecb1070eb79..326429c1451d418b3515002742c6117424a872d1 100644 (file)
--- a/build/module.tpl
+++ b/build/module.tpl
@@ -18,6 +18,20 @@ else
 @PACKAGE@CXXFLAGS:=$(PACKCXXFLAGS)
 endif
 
+ifndef PACKSOFLAGS
+@PACKAGE@SOFLAGS:=$(SOFLAGS)
+else
+@PACKAGE@SOFLAGS:=$(PACKSOFLAGS)
+endif
+
+ifdef DYEXT
+ifndef PACKDYFLAGS
+@PACKAGE@DYFLAGS:=$(DYFLAGS)
+else
+@PACKAGE@DYFLAGS:=$(PACKDYFLAGS)
+endif
+endif
+
 ifndef PACKDCXXFLAGS
 ifeq ($(PLATFORM),linuxicc)
 @PACKAGE@DCXXFLAGS:=$(filter-out -O%,$(CXXFLAGS)) -O0
@@ -61,6 +75,9 @@ endif
 @PACKAGE@S:=$(patsubst %,$(MODDIR)/%,$(SRCS))
 @PACKAGE@H:=$(patsubst %,$(MODDIR)/%,$(HDRS)) $(EHDRS)
 
+#c++ source subdirectories
+@PACKAGE@SDIR:=$(SUBDIR)
+
 #############################################################################
 #
 #            If special rootcint headerfiles is specified use them
@@ -162,6 +179,8 @@ endif
          @cp $^ $@     
 endif
 
+#------------------------------------------------------------------------
+
 $(@PACKAGE@LIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
 ifndef ALIQUIET
          @echo "***** Linking library $@ *****"
@@ -169,10 +188,11 @@ endif
          $(MUTE)TMPDIR=/tmp/@MODULE@$$$$.`date +%M%S` ; \
          export TMPDIR; mkdir $$TMPDIR ; cd $$TMPDIR ; \
          find $(CURDIR)/@MODULE@/tgt_$(ALICE_TARGET) -name '*.o' -exec ln -s {} . \; ;\
-      rm -f $(CURDIR)/$@ ;\
-         $(SHLD) $(SOFLAGS) -o $(CURDIR)/$@ $(notdir $(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(SHLIB);\
-      cd $(CURDIR) ; rm -rf $$TMPDIR
-         $(MUTE)chmod a-w $@
+         \rm -f $(CURDIR)/$@ ;\
+         TMPLIB=$(notdir $(@PACKAGE@LIB)); export TMPLIB;\
+         $(SHLD) $(@PACKAGE@SOFLAGS) -o $(CURDIR)/$@ $(notdir $(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(SHLIB);\
+         chmod a-w $(CURDIR)/$@ ;\
+         cd $(ALICE_ROOT) ; \rm -rf $$TMPDIR
 
 ifneq ($(DYEXT),)
 $(@PACKAGE@DLIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
@@ -182,12 +202,14 @@ endif
          $(MUTE)TMPDIR=/tmp/@MODULE@$$$$.`date +%M%S` ; \
          export TMPDIR; mkdir $$TMPDIR ; cd $$TMPDIR ; \
          find $(CURDIR)/@MODULE@/tgt_$(ALICE_TARGET) -name '*.o' -exec ln -s {} . \; ;\
-         rm -f $(CURDIR)/$@ ;\
-         $(DYLD) $(@PACKAGE@DYFLAGS) -o $(CURDIR)/$@ $(notdir $(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(DYLIB);
-         $(MUTE)chmod a-w $(CURDIR)/$@ ;\
-         rm -rf $$TMPDIR
+         \rm -f $(CURDIR)/$@ ;\
+         $(DYLD) $(@PACKAGE@DYFLAGS) -o $(CURDIR)/$@ $(notdir $(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(DYLIB);\
+         chmod a-w $(CURDIR)/$@ ;\
+         cd $(ALICE_ROOT) ; \rm -rf $$TMPDIR
 endif
 
+#------------------------------------------------------------------------
+
 $(@PACKAGE@ALIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
 ifndef ALIQUIET
          @echo "***** Linking static library $@ *****"
@@ -195,9 +217,10 @@ endif
          $(MUTE)TMPDIR=/tmp/@MODULE@$$$$.`date +%M%S` ; \
          export TMPDIR; mkdir $$TMPDIR ; cd $$TMPDIR ; \
          find $(CURDIR)/@MODULE@/tgt_$(ALICE_TARGET) -name '*.o' -exec ln -s {} . \; ;\
-      rm -f $(CURDIR)/$@ ;\
+         \rm -f $(CURDIR)/$@ ;\
+         TMPLIB=$(notdir $(@PACKAGE@LIB)); export TMPLIB;\
          $(ALLD) $(ALFLAGS) $(CURDIR)/$@ $(notdir $(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(ALLIB);\
-      cd $(CURDIR) ; rm -rf $$TMPDIR
+      cd $(CURDIR) ; \rm -rf $$TMPDIR
          $(MUTE)chmod a-w $@
 
 
@@ -216,7 +239,7 @@ ifndef ALIQUIET
         @echo "***** Creating $@ *****";       
 endif
         @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
-        @rm -f $(patsubst %.cxx,%.d, $@)
+        @\rm -f $(patsubst %.cxx,%.d, $@)
         $(MUTE)rootcint -f $@ -c $(@PACKAGE@DEFINE) $(CINTFLAGS) $(@PACKAGE@INC) $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) 
 
 $(@PACKAGE@DO): $(@PACKAGE@DS)
@@ -306,20 +329,25 @@ endif
                @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
                @share/alibtool depend "$(@PACKAGE@DEFINE) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC) $<" > $@
 
-@PACKAGE@CHECKS := $(patsubst %.cxx,@PACKAGE@/check/%.viol,$(SRCS))
+@PACKAGE@CHECKS := $(patsubst %.cxx,@MODULE@/check/%.viol,$(SRCS))
 
-check-@PACKAGE@: $(@PACKAGE@CHECKS)
+check-@MODULE@: $(@PACKAGE@CHECKS)
 
 # IRST coding rule check 
-@PACKAGE@/check/%.i : @PACKAGE@/%.cxx
+@MODULE@/check/%.i : @MODULE@/%.cxx
        @[ -d $(dir $@) ] || mkdir -p $(dir $@)
        $(MUTE)$(CXX) -E $(@PACKAGE@DEFINE) $(@PACKAGE@INC) $< > $@ $(@PACKAGE@CXXFLAGS)
        @cd $(dir $@) ; $(IRST_INSTALLDIR)/patch/patch4alice.prl $(notdir $@)
 
 # IRST coding rule check
-@PACKAGE@/check/%.viol : @PACKAGE@/check/%.i
-       @cd @PACKAGE@ ; [ -r @PACKAGE@ ] || ln -s ../@PACKAGE@ @PACKAGE@
-       -@echo $@ ; $(CODE_CHECK) $< ./@PACKAGE@ > $@
+@MODULE@/check/$(SUBDIR)/%.viol : @MODULE@/check/$(SUBDIR)/%.i
+       @cd @MODULE@ ; [ -r @MODULE@ ] || ln -s ../@MODULE@ @MODULE@
+       -@echo $@ ; $(CODE_CHECK) $< ./@MODULE@/$(@PACKAGE@SDIR) > $@
+
+# IRST coding rule check
+@MODULE@/check/%.viol : @MODULE@/check/%.i
+       @cd @MODULE@ ; [ -r @MODULE@ ] || ln -s ../@MODULE@ @MODULE@
+       -@echo $@ ; $(CODE_CHECK) $< ./@MODULE@ > $@
 
 @PACKAGE@PREPROC       = $(patsubst %.viol,%.i,$(@PACKAGE@CHECKS))