X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=build%2Fmodule.tpl;h=9a1730ab408028b6e7d368082255383cce90f65f;hp=2816dd0e85f9861e27461bc3877a702587819f67;hb=1e7f65890bd4605c0ca034fca4595562409906b8;hpb=65f3a2f14781129f144ab25c6e1cc1af9824d0f2

diff --git a/build/module.tpl b/build/module.tpl
index 2816dd0e85f..9a1730ab408 100644
--- 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
@@ -378,22 +380,27 @@ endif
 .PRECIOUS: $(patsubst %.c,$(MODDIRO)/%.d,$(CSRCS))
 .PRECIOUS: $(patsubst %.F,$(MODDIRO)/%.d,$(patsubst %.f,$(MODDIRO)/%.d,$(FSRCS)))
 
-@PACKAGE@CHECKS  := $(patsubst %.cxx,@MODULE@/check/%.viol,$(SRCS))
-@PACKAGE@PREPROC := $(patsubst %.viol,%.i,$(@PACKAGE@CHECKS))
-@PACKAGE@REVENGS := $(patsubst %.viol,%.ii,$(@PACKAGE@CHECKS))
+@PACKAGE@CHECKS := $(patsubst %.cxx,@MODULE@/check/%.viol,$(SRCS))
+@PACKAGE@SRCDIR := $(dir $(word 1,$(patsubst %.cxx,@MODULE@/%.cxx,$(SRCS))))
+@PACKAGE@CHKDIR := $(dir $(word 1,$(@PACKAGE@CHECKS)))
+@PACKAGE@OBJDIR := $(dir $(word 1,$(patsubst %.cxx,@MODULE@/tgt_$(ALICE_TARGET)/%.cxx,$(SRCS))))
 
 check-@MODULE@: $(@PACKAGE@CHECKS)
 
 # IRST coding rule check 
-$(@PACKAGE@PREPROC): $(patsubst %.cxx, $(MODDIR)/%.cxx, $(SRCS)) $(@PACKAGE@DEP)
+$(@PACKAGE@CHKDIR)%.i : $(@PACKAGE@SRCDIR)%.cxx $(@PACKAGE@OBJDIR)%.d
 	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
 	$(MUTE)$(CXX) -E $(@PACKAGE@DEFINE) $(@PACKAGE@INC) -I. $< > $@ $(@PACKAGE@CXXFLAGS)
 	@cd $(dir $@) ; $(IRST_INSTALLDIR)/patch/patch4alice.prl $(notdir $@)
 
 # IRST coding rule check
-$(@PACKAGE@CHECKS) : $(@PACKAGE@PREPROC)
+@MODULE@/check/%.viol : @MODULE@/check/%.i
 	$(MUTE)echo $@ ; $(CODE_CHECK) $< $(shell echo $(dir $<) | sed -e 's:/check::') > $@
 
+@PACKAGE@PREPROC       = $(patsubst %.viol,%.i,$(@PACKAGE@CHECKS))
+
+@PACKAGE@REVENGS       = $(patsubst %.viol,%.ii,$(@PACKAGE@CHECKS))
+
 .SECONDARY: $(@PACKAGE@REVENGS) $(@PACKAGE@PREPROC)
 
 PACKREVENG += $(@PACKAGE@PREPROC)
@@ -421,9 +428,10 @@ 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 "done"
+	@echo "package" $@ "in /tmp/"$@
+	@echo $@ "done"
 
 @MODULE@/@PACKAGE@/Makefile: @MODULE@/Makefile
 	@echo Copying $< to $@ with transformations
@@ -448,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)"