X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=build%2Fmodule.tpl;h=d59485274b15c30929e1ce320a37c0ac31381472;hb=7b852582fdec1b20c2b113c407c37732570f35a7;hp=af14b18fc6d44a38ea1203c975de77869dcab56d;hpb=eb5bc777773dacacd425b3bd026f64da86c421f0;p=u%2Fmrichter%2FAliRoot.git

diff --git a/build/module.tpl b/build/module.tpl
index af14b18fc6d..d59485274b1 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 
@@ -117,7 +119,8 @@ endif
 @PACKAGE@CAPITFO:=$(patsubst %.F,$(MODDIRO)/%.o, $(filter %.F, $(FSRCS)))
 @PACKAGE@FO:=$(@PACKAGE@SMALLFO) $(@PACKAGE@CAPITFO)
 @PACKAGE@O:= $(@PACKAGE@CXXO) $(@PACKAGE@FO) $(@PACKAGE@CO)
-
+@PACKAGE@CHV:=$(patsubst %,$(MODDIRC)/%, $(SRCS:.cxx=.viol))
+@PACKAGE@SML:=$(sort $(patsubst %,$(MODDIRZ)/%, $(filter $(SRCS:.cxx=.smell),$(HDRS:.h=.smell))))
 
 
 ifdef WITHDICT
@@ -144,11 +147,13 @@ endif
 @PACKAGE@ALIB:=$(LIBPATH)/lib@PACKAGE@.$(AEXT)
 
 #Add this to the modules libs
+ifeq ($(TYPE),lib)
 @MODULE@LIBS += $(@PACKAGE@LIB)
 @MODULE@ALIBS += $(@PACKAGE@ALIB)
 ifneq ($(DYEXT),)
 @MODULE@DLIBS += $(@PACKAGE@DLIB)
 endif
+endif
 
 #The actual binary file
 
@@ -209,14 +214,11 @@ $(@PACKAGE@LIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
 ifndef ALIQUIET
 	  @echo "***** Linking library $@ *****"
 endif
-	  $(MUTE)TMPDIR=/tmp/@MODULE@$$$$.`date +%M%S` ; \
-	  export TMPDIR; mkdir -p $$TMPDIR ; cd $$TMPDIR ; \
-	  find $(CURDIR)/@MODULE@/tgt_$(ALICE_TARGET) -name '*.o' -exec ln -s {} . \; ;\
-	  \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
+	  \rm -f "$(CURDIR)"/$@ ;\
+	  cd $(@MODULE@DIRO) ;\
+	  $(SHLD) $(@PACKAGE@SOFLAGS) -o "$(CURDIR)"/$@ $(patsubst $(@MODULE@DIRO)/%,%,$(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(SHLIB);\
+	  chmod a-w "$(CURDIR)"/$@ ;\
+	  cd $(ALICE_ROOT)
 endif
 
 ifneq ($(DYEXT),)
@@ -224,13 +226,11 @@ $(@PACKAGE@DLIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
 ifndef ALIQUIET
 	  @echo "***** Linking library $@ *****"
 endif
-	  $(MUTE)TMPDIR=/tmp/@MODULE@$$$$.`date +%M%S` ; \
-	  export TMPDIR; mkdir -p $$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);\
-	  chmod a-w $(CURDIR)/$@ ;\
-	  cd $(ALICE_ROOT) ; \rm -rf $$TMPDIR
+	  \rm -f "$(CURDIR)"/$@ ;\
+	  cd $(@MODULE@DIRO) ;\
+	  $(DYLD) $(@PACKAGE@DYFLAGS) -o "$(CURDIR)"/$@ $(patsubst $(@MODULE@DIRO)/%,%,$(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(DYLIB);\
+	  chmod a-w "$(CURDIR)"/$@ ;\
+	  cd $(ALICE_ROOT) 
 endif
 
 #------------------------------------------------------------------------
@@ -239,14 +239,10 @@ $(@PACKAGE@ALIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
 ifndef ALIQUIET
 	  @echo "***** Linking static library $@ *****"
 endif
-	  $(MUTE)TMPDIR=/tmp/@MODULE@$$$$.`date +%M%S` ; \
-	  export TMPDIR; mkdir -p $$TMPDIR ; cd $$TMPDIR ; \
-	  find $(CURDIR)/@MODULE@/tgt_$(ALICE_TARGET) -name '*.o' -exec ln -s {} . \; ;\
-	  \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
-	  $(MUTE)chmod a-w $@
+	  \rm -f "$(CURDIR)"/$@ ;\
+	  cd $(@MODULE@DIRO) ;\
+	  $(ALLD) $(ALFLAGS) "$(CURDIR)"/$@ $(patsubst $(@MODULE@DIRO)/%,%,$(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(ALLIB);\
+          cd $(ALICE_ROOT)
 
 
 $(@PACKAGE@BIN):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
@@ -259,21 +255,21 @@ else
 	  $(MUTE)$(LD) $(@PACKAGE@LDFLAGS) $(@PACKAGE@O) $(@PACKAGE@DO) $(BINLIBDIRS) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(@PACKAGE@BLIBS) $(EXEFLAGS) -o $@
 endif
 
-$(@PACKAGE@DAL): $(@PACKAGE@CINTHDRS) @MODULE@/module.mk @MODULE@/tgt_$(ALICE_TARGET)/@PACKAGE@_srcslist
+$(@PACKAGE@DAL): $(@PACKAGE@CINTHDRS) @MODULE@/module.mk
 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
+$(@PACKAGE@DS): $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) @MODULE@/module.mk
 ifndef ALIQUIET
 	 @echo "***** Creating $@ *****";
 endif
@@ -287,27 +283,19 @@ ifndef ALIQUIET
 endif
 		$(MUTE)$(CXX) $(@PACKAGE@DEFINE) -c $(@PACKAGE@INC)  -I$(ALICE_ROOT) $< -o $@ $(@PACKAGE@DCXXFLAGS)
 
-$(MODDIRO)/@PACKAGE@_srcslist: @MODULE@/@TYPE@@PACKAGE@.pkg
-	$(MUTE)if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi
-	$(MUTE)for i in $(@PACKAGE@CS) $(@PACKAGE@S) xyz; do echo $$i; done | sort > $@.new
-	$(MUTE)for j in `diff -w $@ $@.new 2>/dev/null | awk '/^\</{sub(".c.*",".",$$2); print $$2}' | $(XARGS) basename` ;\
-	do grep -l $$j `find */tgt_$(ALICE_TARGET) -name "*.d"` | $(XARGS) echo \rm -f ;\
-	(find @MODULE@/tgt_$(ALICE_TARGET) -name "$${j}d" ; find @MODULE@/tgt_$(ALICE_TARGET) -name "$${j}o") | $(XARGS) echo \rm -f ;\
-	done
-	$(MUTE)diff -q -w >/dev/null 2>&1 $@ $@.new ;\
-	if [ $$? -ne 0 ]; then \mv $@.new $@; else \rm $@.new; fi
 
 #Different targets for the module
 
 ifeq ($(TYPE),lib)
-all-@PACKAGE@: $(@PACKAGE@LIB)
+all-@MODULE@: $(@PACKAGE@LIB)
 ifneq ($(DYEXT),)
-all-@PACKAGE@: $(@PACKAGE@DLIB)
+all-@MODULE@: $(@PACKAGE@DLIB)
 endif
 else
-all-@PACKAGE@: $(@PACKAGE@BIN)
+all-@MODULE@: $(@PACKAGE@BIN)
 endif
 
+
 depend-@PACKAGE@: $(@PACKAGE@DEP)
 
 # determination of object files
@@ -378,54 +366,46 @@ 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))
-
-check-@MODULE@: $(@PACKAGE@CHECKS)
+check-@MODULE@: $(@PACKAGE@CHV)
 
 # IRST coding rule check 
-@MODULE@/check/%.i : @MODULE@/%.cxx @MODULE@/tgt_$(ALICE_TARGET)/%.d
+$(@PACKAGE@CHV:.viol=.i): $(MODDIRC)/%.i: $(MODDIR)/%.cxx $(MODDIRO)/%.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
-@MODULE@/check/%.viol : @MODULE@/check/%.i
+$(@PACKAGE@CHV): $(MODDIRC)/%.viol: $(MODDIRC)/%.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@CHV:.viol=.i) $(@PACKAGE@CHI:.viol=.ii)
 
-.SECONDARY: $(@PACKAGE@REVENGS) $(@PACKAGE@PREPROC)
-
-PACKREVENG += $(@PACKAGE@PREPROC)
+PACKREVENG += $(@PACKAGE@CHV:.viol=.ii)
 
 # IRST code smell checker
 
-@PACKAGE@SMELL := $(patsubst %.cxx,@MODULE@/smell/%.smell,$(SRCS))
-
-smell-@MODULE@: $(@PACKAGE@SMELL)
+smell-@MODULE@: $(@PACKAGE@SML)
 
-@MODULE@/smell/%_cxx.ml : @MODULE@/%.cxx
+$(@PACKAGE@SML:.smell=_cxx.ml) : $(MODDIRZ)/%_cxx.ml : $(MODDIR)/%.cxx
 	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
 	$(MUTE)src2srcml $< $@
 
-@MODULE@/smell/%_h.ml : @MODULE@/%.h 
+$(@PACKAGE@SML:.smell=_h.ml) : $(MODDIRZ)/%_h.ml : $(MODDIR)/%.h
 	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
 	$(MUTE)src2srcml $< $@
 
-@MODULE@/smell/%.smell : @MODULE@/smell/%_cxx.ml @MODULE@/smell/%_h.ml
+$(@PACKAGE@SML) : $(MODDIRZ)/%.smell : $(MODDIRZ)/%_cxx.ml $(MODDIRZ)/%_h.ml
 	$(MUTE)echo smelling $@
-	java -classpath $(SMELL_DETECTOR_DIR):$(SMELL_DETECTOR_DIR)/xom-1.1.jar -Xmx500m SmellDetector $? > $@
+	$(MUTE)java -classpath $(SMELL_DETECTOR_DIR):$(SMELL_DETECTOR_DIR)/xom-1.1.jar -Xmx500m SmellDetector $^ > $@
+	$(MUTE)[ -s $@ ] || touch $@
 
-.PRECIOUS: $(patsubst %.cxx,@MODULE@/smell/%_h.ml,$(SRCS)) $(patsubst %.cxx,@MODULE@/smell/%_cxx.ml,$(SRCS))
+.SECONDARY: $(@PACKAGE@SML:.smell=_cxx.ml) $(@PACKAGE@SML:.smell=_h.ml)
 
 # 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))
+@PACKAGE@.par: $(patsubst %,@MODULE@/@PACKAGE@/%,$(filter-out dict.%, $(HDRS) $(SRCS) $(DHDR) $(PKGFILE) $(FSRCS) Makefile Makefile.arch lib@PACKAGE@.pkg PROOF-INF))
 	@echo "Creating archive" $@ ...
-	@cd @MODULE@; tar cfzh ../$@ @PACKAGE@
+	@cd @MODULE@; (tar cfzh ../$@ @PACKAGE@ 2> /dev/null && echo "package" $@ "created in" $(PWD)/$@) || (tar cfzh /tmp/$@ @PACKAGE@ 2> /dev/null && echo "package" $@ "created in /tmp/"$@)
 	@rm -rf @MODULE@/@PACKAGE@
-	@echo "done"
 
 @MODULE@/@PACKAGE@/Makefile: @MODULE@/Makefile
 	@echo Copying $< to $@ with transformations
@@ -435,17 +415,17 @@ smell-@MODULE@: $(@PACKAGE@SMELL)
 @MODULE@/@PACKAGE@/Makefile.arch: $(ROOTSYS)/test/Makefile.arch
 	@echo Copying $< to $@
 	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	@cp -a $^ $@
+	@cp -pR $^ $@
 
 @MODULE@/@PACKAGE@/PROOF-INF: @MODULE@/PROOF-INF.@PACKAGE@
 	@echo Copying $< to $@
 	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	@cp -a $^ $@
+	@cp -pR $^ $@
 
 @MODULE@/@PACKAGE@/%: @MODULE@/%
 	@echo Copying $< to $@
 	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	@cp -a $< $@
+	@cp -pR $< $@
 
 test-@PACKAGE@.par: @PACKAGE@.par
 	@echo "INFO: The file $< is now tested, in case of an error check in par-tmp/@PACKAGE@."