diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-11-08 09:46:23 +0000 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-11-08 09:46:23 +0000 |
commit | ce6b7674c6d9390a981756b511a4ea44ad4800d0 (patch) | |
tree | 36ddfcc3def712bf80610b94ffa2d635887c6d5b | |
parent | a600479cbedad0ba47ebbafe7aeb6ea08dfe25cb (diff) |
#i34902# stop windows build if linking failed
-rw-r--r-- | solenv/inc/_tg_shl.mk | 20 | ||||
-rw-r--r-- | solenv/inc/tg_shl.mk | 6 |
2 files changed, 24 insertions, 2 deletions
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index d8df4051c248..f1d92ba506f5 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -281,6 +281,7 @@ $(SHL1TARGETN) : \ $(STDSHL) $(STDSHL1) \ $(SHL1LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -295,6 +296,7 @@ $(SHL1TARGETN) : \ $(STDSHL) $(STDSHL1) \ $(SHL1LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" .ELSE # "$(SHL1USE_EXPORTS)"!="name" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -679,6 +681,7 @@ $(SHL2TARGETN) : \ $(STDSHL) $(STDSHL2) \ $(SHL2LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -693,6 +696,7 @@ $(SHL2TARGETN) : \ $(STDSHL) $(STDSHL2) \ $(SHL2LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" .ELSE # "$(SHL2USE_EXPORTS)"!="name" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -1077,6 +1081,7 @@ $(SHL3TARGETN) : \ $(STDSHL) $(STDSHL3) \ $(SHL3LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -1091,6 +1096,7 @@ $(SHL3TARGETN) : \ $(STDSHL) $(STDSHL3) \ $(SHL3LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" .ELSE # "$(SHL3USE_EXPORTS)"!="name" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -1475,6 +1481,7 @@ $(SHL4TARGETN) : \ $(STDSHL) $(STDSHL4) \ $(SHL4LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -1489,6 +1496,7 @@ $(SHL4TARGETN) : \ $(STDSHL) $(STDSHL4) \ $(SHL4LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" .ELSE # "$(SHL4USE_EXPORTS)"!="name" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -1873,6 +1881,7 @@ $(SHL5TARGETN) : \ $(STDSHL) $(STDSHL5) \ $(SHL5LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -1887,6 +1896,7 @@ $(SHL5TARGETN) : \ $(STDSHL) $(STDSHL5) \ $(SHL5LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" .ELSE # "$(SHL5USE_EXPORTS)"!="name" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -2271,6 +2281,7 @@ $(SHL6TARGETN) : \ $(STDSHL) $(STDSHL6) \ $(SHL6LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -2285,6 +2296,7 @@ $(SHL6TARGETN) : \ $(STDSHL) $(STDSHL6) \ $(SHL6LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" .ELSE # "$(SHL6USE_EXPORTS)"!="name" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -2669,6 +2681,7 @@ $(SHL7TARGETN) : \ $(STDSHL) $(STDSHL7) \ $(SHL7LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -2683,6 +2696,7 @@ $(SHL7TARGETN) : \ $(STDSHL) $(STDSHL7) \ $(SHL7LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" .ELSE # "$(SHL7USE_EXPORTS)"!="name" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -3067,6 +3081,7 @@ $(SHL8TARGETN) : \ $(STDSHL) $(STDSHL8) \ $(SHL8LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -3081,6 +3096,7 @@ $(SHL8TARGETN) : \ $(STDSHL) $(STDSHL8) \ $(SHL8LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" .ELSE # "$(SHL8USE_EXPORTS)"!="name" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -3465,6 +3481,7 @@ $(SHL9TARGETN) : \ $(STDSHL) $(STDSHL9) \ $(SHL9LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -3479,6 +3496,7 @@ $(SHL9TARGETN) : \ $(STDSHL) $(STDSHL9) \ $(SHL9LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" .ELSE # "$(SHL9USE_EXPORTS)"!="name" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -3863,6 +3881,7 @@ $(SHL10TARGETN) : \ $(STDSHL) $(STDSHL10) \ $(SHL10LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -3877,6 +3896,7 @@ $(SHL10TARGETN) : \ $(STDSHL) $(STDSHL10) \ $(SHL10LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" .ELSE # "$(SHL10USE_EXPORTS)"!="name" $(LINK) @$(mktmp $(LINKFLAGS) \ diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 650b435170ed..836e1b3322ce 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_shl.mk,v $ # -# $Revision: 1.86 $ +# $Revision: 1.87 $ # -# last change: $Author: pjunck $ $Date: 2004-11-03 08:58:13 $ +# last change: $Author: hjs $ $Date: 2004-11-08 10:46:23 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -381,6 +381,7 @@ $(SHL$(TNR)TARGETN) : \ $(STDSHL) $(STDSHL$(TNR)) \ $(SHL$(TNR)LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ @@ -395,6 +396,7 @@ $(SHL$(TNR)TARGETN) : \ $(STDSHL) $(STDSHL$(TNR)) \ $(SHL$(TNR)LINKRES) \ ) $(LINKOUTPUTFILTER) + @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" .ELSE # "$(SHL$(TNR)USE_EXPORTS)"!="name" $(LINK) @$(mktmp $(LINKFLAGS) \ |