INTEGRATION: CWS sb71 (1.61.20); FILE MERGED

2007/07/18 11:57:41 sb 1.61.20.2: RESYNC: (1.61-1.62); FILE MERGED
2007/06/14 15:09:31 sb 1.61.20.1: #i75466# Replaced LINKFLAGSRUNPATH with more flexible APP|SHLnRPATH.

1 files changed, 40 insertions, 0 deletions

diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index 99aa85b81f6f..4a1695393998 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -16,6 +16,10 @@ APP1STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
 APP1LINKFLAGS+=$(LINKFLAGS)
 .ENDIF			# "$(APP1CODETYPE)"=="C"
 
+APP1RPATH*=OOO
+LINKFLAGSRUNPATH_$(APP1RPATH)*=/ERROR:/Bad_APP1RPATH_value
+APP1LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP1RPATH))
+
 .IF "$(APP1STACK)" != ""
 .IF "$(LINKFLAGSTACK)" != ""
 APP1STACKN=$(LINKFLAGSTACK)$(APP1STACK)
@@ -214,6 +218,10 @@ APP2STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
 APP2LINKFLAGS+=$(LINKFLAGS)
 .ENDIF			# "$(APP2CODETYPE)"=="C"
 
+APP2RPATH*=OOO
+LINKFLAGSRUNPATH_$(APP2RPATH)*=/ERROR:/Bad_APP2RPATH_value
+APP2LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP2RPATH))
+
 .IF "$(APP2STACK)" != ""
 .IF "$(LINKFLAGSTACK)" != ""
 APP2STACKN=$(LINKFLAGSTACK)$(APP2STACK)
@@ -412,6 +420,10 @@ APP3STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
 APP3LINKFLAGS+=$(LINKFLAGS)
 .ENDIF			# "$(APP3CODETYPE)"=="C"
 
+APP3RPATH*=OOO
+LINKFLAGSRUNPATH_$(APP3RPATH)*=/ERROR:/Bad_APP3RPATH_value
+APP3LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP3RPATH))
+
 .IF "$(APP3STACK)" != ""
 .IF "$(LINKFLAGSTACK)" != ""
 APP3STACKN=$(LINKFLAGSTACK)$(APP3STACK)
@@ -610,6 +622,10 @@ APP4STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
 APP4LINKFLAGS+=$(LINKFLAGS)
 .ENDIF			# "$(APP4CODETYPE)"=="C"
 
+APP4RPATH*=OOO
+LINKFLAGSRUNPATH_$(APP4RPATH)*=/ERROR:/Bad_APP4RPATH_value
+APP4LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP4RPATH))
+
 .IF "$(APP4STACK)" != ""
 .IF "$(LINKFLAGSTACK)" != ""
 APP4STACKN=$(LINKFLAGSTACK)$(APP4STACK)
@@ -808,6 +824,10 @@ APP5STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
 APP5LINKFLAGS+=$(LINKFLAGS)
 .ENDIF			# "$(APP5CODETYPE)"=="C"
 
+APP5RPATH*=OOO
+LINKFLAGSRUNPATH_$(APP5RPATH)*=/ERROR:/Bad_APP5RPATH_value
+APP5LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP5RPATH))
+
 .IF "$(APP5STACK)" != ""
 .IF "$(LINKFLAGSTACK)" != ""
 APP5STACKN=$(LINKFLAGSTACK)$(APP5STACK)
@@ -1006,6 +1026,10 @@ APP6STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
 APP6LINKFLAGS+=$(LINKFLAGS)
 .ENDIF			# "$(APP6CODETYPE)"=="C"
 
+APP6RPATH*=OOO
+LINKFLAGSRUNPATH_$(APP6RPATH)*=/ERROR:/Bad_APP6RPATH_value
+APP6LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP6RPATH))
+
 .IF "$(APP6STACK)" != ""
 .IF "$(LINKFLAGSTACK)" != ""
 APP6STACKN=$(LINKFLAGSTACK)$(APP6STACK)
@@ -1204,6 +1228,10 @@ APP7STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
 APP7LINKFLAGS+=$(LINKFLAGS)
 .ENDIF			# "$(APP7CODETYPE)"=="C"
 
+APP7RPATH*=OOO
+LINKFLAGSRUNPATH_$(APP7RPATH)*=/ERROR:/Bad_APP7RPATH_value
+APP7LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP7RPATH))
+
 .IF "$(APP7STACK)" != ""
 .IF "$(LINKFLAGSTACK)" != ""
 APP7STACKN=$(LINKFLAGSTACK)$(APP7STACK)
@@ -1402,6 +1430,10 @@ APP8STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
 APP8LINKFLAGS+=$(LINKFLAGS)
 .ENDIF			# "$(APP8CODETYPE)"=="C"
 
+APP8RPATH*=OOO
+LINKFLAGSRUNPATH_$(APP8RPATH)*=/ERROR:/Bad_APP8RPATH_value
+APP8LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP8RPATH))
+
 .IF "$(APP8STACK)" != ""
 .IF "$(LINKFLAGSTACK)" != ""
 APP8STACKN=$(LINKFLAGSTACK)$(APP8STACK)
@@ -1600,6 +1632,10 @@ APP9STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
 APP9LINKFLAGS+=$(LINKFLAGS)
 .ENDIF			# "$(APP9CODETYPE)"=="C"
 
+APP9RPATH*=OOO
+LINKFLAGSRUNPATH_$(APP9RPATH)*=/ERROR:/Bad_APP9RPATH_value
+APP9LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP9RPATH))
+
 .IF "$(APP9STACK)" != ""
 .IF "$(LINKFLAGSTACK)" != ""
 APP9STACKN=$(LINKFLAGSTACK)$(APP9STACK)
@@ -1798,6 +1834,10 @@ APP10STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
 APP10LINKFLAGS+=$(LINKFLAGS)
 .ENDIF			# "$(APP10CODETYPE)"=="C"
 
+APP10RPATH*=OOO
+LINKFLAGSRUNPATH_$(APP10RPATH)*=/ERROR:/Bad_APP10RPATH_value
+APP10LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP10RPATH))
+
 .IF "$(APP10STACK)" != ""
 .IF "$(LINKFLAGSTACK)" != ""
 APP10STACKN=$(LINKFLAGSTACK)$(APP10STACK)