Protection against deletion of Header.

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

diff --git a/build/module.tpl b/build/module.tpl
index 6f55d6742ad5682e3f36ec57448b0c605ac2f640..c5b00379c925fe1dc2938436116fe885c73edb64 100644 (file)
--- a/build/module.tpl
+++ b/build/module.tpl
@@ -96,7 +96,9 @@ ifndef CINTHDRS
 @PACKAGE@CINTHDRS:=$(@PACKAGE@H)
 else
 @PACKAGE@CINTHDRS:=$(CINTHDRS:%=@MODULE@/%)
+#@PACKAGE@CINTHDRS:=$(pathsubst %,@MODULE@/%,$(CINTHDRS))
 endif
+@PACKAGE@CINTCLASSES:=$(patsubst %.h,%,$(notdir $(@PACKAGE@CINTHDRS)))
 #############################################################################
 
 # Package Dictionary 
@@ -263,14 +265,14 @@ $(@PACKAGE@DAL): $(@PACKAGE@CINTHDRS) @MODULE@/module.mk @MODULE@/tgt_$(ALICE_TA
 ifndef ALIQUIET
         @echo "***** Creating $@ *****";
 endif
-       @echo '//automatically generated ROOT DICT definition' > $@
-       @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@
+       $(MUTE)echo '//automatically generated ROOT DICT definition' > $@
+       $(MUTE)echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@
        $(MUTE)echo '#ifdef __CINT__' >> $@
        $(MUTE)echo '#pragma link off all globals;' >> $@
        $(MUTE)echo '#pragma link off all classes;' >> $@
        $(MUTE)echo '#pragma link off all functions;' >> $@
-       $(MUTE)$(foreach i, $(@PACKAGE@CINTHDRS), \
-          echo "#pragma link C++ class `echo $(i) | sed -e "s|.*/||g" -e "s|\.h.*||"`;" >> $@ ;)
+       $(MUTE)$(foreach i, $(@PACKAGE@CINTCLASSES), \
+          echo "#pragma link C++ class $(i)+;" >> $@ ;)
        $(MUTE)echo '#endif' >> $@
 
 $(@PACKAGE@DS): $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) @MODULE@/module.mk @MODULE@/tgt_$(ALICE_TARGET)/@PACKAGE@_srcslist
@@ -426,8 +428,9 @@ smell-@MODULE@: $(@PACKAGE@SMELL)
 # targets to create .par archives (jgrosseo)
 @PACKAGE@.par: $(patsubst %,@MODULE@/@PACKAGE@/%,$(filter-out dict.%, $(HDRS) $(SRCS) $(DHDR) $(PKGFILE) Makefile Makefile.arch lib@PACKAGE@.pkg PROOF-INF))
        @echo "Creating archive" $@ ...
-       @cd @MODULE@; tar cfzh ../$@ @PACKAGE@
+       @cd @MODULE@; tar cfzh /tmp/$@ @PACKAGE@
        @rm -rf @MODULE@/@PACKAGE@
+       @echo "package" $@ "in /tmp/"$@
        @echo $@ "done"
 
 @MODULE@/@PACKAGE@/Makefile: @MODULE@/Makefile
@@ -453,6 +456,6 @@ smell-@MODULE@: $(@PACKAGE@SMELL)
 test-@PACKAGE@.par: @PACKAGE@.par
        @echo "INFO: The file $< is now tested, in case of an error check in par-tmp/@PACKAGE@."
        @mkdir -p par-tmp
-       @cd par-tmp; tar xfz ../$<;     cd $(subst .par,,$<); PROOF-INF/BUILD.sh
+       @cd par-tmp; tar xfz /tmp/$<;   cd $(subst .par,,$<); PROOF-INF/BUILD.sh
        @rm -rf par-tmp/@PACKAGE@
        @echo "INFO: Testing succeeded (already cleaned up)"