From: hristov Date: Sun, 20 Jun 2004 11:35:35 +0000 (+0000) Subject: Adding dependence between the executable and the shared libraries. Correcting spelling. X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=87c71321867500eff6939e3b0bb56a584cb738fc Adding dependence between the executable and the shared libraries. Correcting spelling. --- diff --git a/build/module.tpl b/build/module.tpl index eb4752f9194..57504183b0a 100644 --- a/build/module.tpl +++ b/build/module.tpl @@ -58,6 +58,7 @@ endif @PACKAGE@INC:=$(patsubst %,-I%,$(EINCLUDE)) -I@MODULE@ @PACKAGE@ELIBS:=$(patsubst %,-l%,$(ELIBS)) +@PACKAGE@ELIBSDEP:=$(patsubst %,lib/tgt_$(ALICE_TARGET)/lib%.$(SOEXT),$(ELIBS)) @PACKAGE@ELIBSDIR:=$(patsubst %,-L%,$(ELIBSDIR)) #c sources and headers @@ -156,7 +157,7 @@ else @PACKAGE@LIB := $(@PACKAGE@LIB) endif -# include all dependency files +# include all dependence files INCLUDEFILES +=$(@PACKAGE@DEP) EXPORTFILES += $(@PACKAGE@EXPORTDEST) @@ -221,7 +222,7 @@ endif $(MUTE)chmod a-w $@ -$(@PACKAGE@BIN):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk +$(@PACKAGE@BIN):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk $(@PACKAGE@ELIBSDEP) ifndef ALIQUIET @echo "***** Making executable $@ *****" endif @@ -289,32 +290,32 @@ endif $(@PACKAGE@DDEP): $(@PACKAGE@DS) ifndef ALIQUIET - @echo "***** Making dependencies for $< *****"; + @echo "***** Making dependences for $< *****"; endif @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;) @share/alibtool depend "$(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC) $<" > $@ $(MODDIRO)/%.d: $(MODDIRS)/%.cxx ifndef ALIQUIET - @echo "***** Making dependencies for $< *****"; + @echo "***** Making dependences for $< *****"; endif @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;) @share/alibtool depend "$(@PACKAGE@DEFINE) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC) $<" > $@ $(MODDIRO)/%.d: $(MODDIRS)/%.f ifndef ALIQUIET - @echo "***** Making dependencies for $< *****"; + @echo "***** Making dependences for $< *****"; endif @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;) @share/alibtool dependF "$(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC) $<" > $@ $(MODDIRO)/%.d: $(MODDIRS)/%.F ifndef ALIQUIET - @echo "***** Making dependencies for $< *****"; + @echo "***** Making dependences for $< *****"; endif @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;) $(MUTE)share/alibtool dependF "$(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC) $<" > $@ $(MODDIRO)/%.d: $(MODDIRS)/%.c ifndef ALIQUIET - @echo "***** Making dependencies for $< *****"; + @echo "***** Making dependences for $< *****"; endif @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;) @share/alibtool depend "$(@PACKAGE@DEFINE) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC) $<" > $@