Avoid to create the link inside a module pointing to the module itself

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

diff --git a/build/module.tpl b/build/module.tpl
index abe3fa00ec90bcbf74b0e0fd0eb2f24241ee645e..5bf0a24e024e603ea743f132cb56e4f89ad47949 100644 (file)
--- a/build/module.tpl
+++ b/build/module.tpl
@@ -33,6 +33,12 @@ else
 endif
 endif
 
+ifndef PACKLDFLAGS
+@PACKAGE@LDFLAGS:=$(LDFLAGS)
+else
+@PACKAGE@LDFLAGS:=$(PACKLDFLAGS)
+endif
+
 ifndef PACKDCXXFLAGS
 @PACKAGE@DCXXFLAGS:=$(CXXFLAGSNO)
 else
@@ -53,7 +59,7 @@ endif
 
 #Extra include,libs, defines etc.
 
-@PACKAGE@DEFINE:=$(EDEFINE)
+@PACKAGE@DEFINE:=$(EDEFINE) -D__MODULE__=\"@MODULE@\"
 
 @PACKAGE@INC:=$(patsubst %,-I%,$(EINCLUDE)) -I@MODULE@
 
@@ -222,14 +228,14 @@ endif
          $(MUTE)chmod a-w $@
 
 
-$(@PACKAGE@BIN):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk $(@PACKAGE@ELIBSDEP)
+$(@PACKAGE@BIN):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
 ifndef ALIQUIET
          @echo "***** Making executable $@ *****"
 endif
 ifeq ($(ALIPROFILE),YES)
-       $(MUTE)$(LD) $(LDFLAGS) $(@PACKAGE@O) $(ARLIBS) $(SHLIBS) $(LIBS) $(EXEFLAGS) -o $@
+       $(MUTE)$(LD) $(@PACKAGE@LDFLAGS) $(@PACKAGE@O) $(ARLIBS) $(SHLIBS) $(LIBS) $(EXEFLAGS) -o $@
 else
-         $(MUTE)$(LD) $(LDFLAGS) $(@PACKAGE@O) $(@PACKAGE@DO) $(BINLIBDIRS) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(LIBS) $(EXEFLAGS) -o $@
+         $(MUTE)$(LD) $(@PACKAGE@LDFLAGS) $(@PACKAGE@O) $(@PACKAGE@DO) $(BINLIBDIRS) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(LIBS) $(EXEFLAGS) -o $@
 endif
 
 $(@PACKAGE@DS): $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) @MODULE@/module.mk
@@ -329,19 +335,17 @@ endif
 check-@MODULE@: $(@PACKAGE@CHECKS)
 
 # IRST coding rule check 
-@MODULE@/check/%.i : @MODULE@/%.cxx
+@MODULE@/check/%.i : @MODULE@/%.cxx @MODULE@/%.h
        @[ -d $(dir $@) ] || mkdir -p $(dir $@)
-       $(MUTE)$(CXX) -E $(@PACKAGE@DEFINE) $(@PACKAGE@INC) $< > $@ $(@PACKAGE@CXXFLAGS)
+       $(MUTE)$(CXX) -E $(@PACKAGE@DEFINE) $(@PACKAGE@INC) -I. $< > $@ $(@PACKAGE@CXXFLAGS)
        @cd $(dir $@) ; $(IRST_INSTALLDIR)/patch/patch4alice.prl $(notdir $@)
 
 # IRST coding rule check
 @MODULE@/check/$(SUBDIR)/%.viol : @MODULE@/check/$(SUBDIR)/%.i
-       @cd @MODULE@ ; [ -r @MODULE@ ] || ln -s ../@MODULE@ @MODULE@
        $(MUTE)echo $@ ; $(CODE_CHECK) $< ./@MODULE@/$(@PACKAGE@SDIR) > $@
 
 # IRST coding rule check
 @MODULE@/check/%.viol : @MODULE@/check/%.i
-       @cd @MODULE@ ; [ -r @MODULE@ ] || ln -s ../@MODULE@ @MODULE@
        $(MUTE)echo $@ ; $(CODE_CHECK) $< ./@MODULE@ > $@
 
 @PACKAGE@PREPROC       = $(patsubst %.viol,%.i,$(@PACKAGE@CHECKS))