diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-09-11 11:51:21 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-09-11 11:51:21 +0000 |
| commit | 894c68061f47ac5df084e29d329a6d0a6c885477 (patch) | |
| tree | ed2ffdde65e78795bce57de0efbee189352bbb7f | |
| parent | 2ab9986bdffa397bb45a5e71a55eb52073d84ec4 (diff) | |
CWS-TOOLING: integrate CWS dv14
2009-09-10 15:16:32 +0200 sg r276035 : #160513# updated wfs scheme to accept ports
2009-09-10 07:41:47 +0200 dv r276019 : #i104942# Better renaming algorithmen
2009-08-31 13:41:11 +0200 dv r275604 : #160505# Setting APP1PRODUCTNAME must not overwrite APP1PRODUCTDEF
| -rw-r--r-- | solenv/inc/_tg_app.mk | 20 | ||||
| -rw-r--r-- | solenv/inc/tg_app.mk | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk index 22e23fcbdcfc..cdb592d2f36e 100644 --- a/solenv/inc/_tg_app.mk +++ b/solenv/inc/_tg_app.mk @@ -55,7 +55,7 @@ USE_APP1DEF= .IF "$(APP1TARGETN)"!="" .IF "$(APP1PRODUCTNAME)"!="" -APP1PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\" +APP1PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\" .ENDIF # "$(APP1PRODUCTNAME)"!="" .IF "$(linkinc)"!="" @@ -329,7 +329,7 @@ USE_APP2DEF= .IF "$(APP2TARGETN)"!="" .IF "$(APP2PRODUCTNAME)"!="" -APP2PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\" +APP2PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\" .ENDIF # "$(APP2PRODUCTNAME)"!="" .IF "$(linkinc)"!="" @@ -603,7 +603,7 @@ USE_APP3DEF= .IF "$(APP3TARGETN)"!="" .IF "$(APP3PRODUCTNAME)"!="" -APP3PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\" +APP3PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\" .ENDIF # "$(APP3PRODUCTNAME)"!="" .IF "$(linkinc)"!="" @@ -877,7 +877,7 @@ USE_APP4DEF= .IF "$(APP4TARGETN)"!="" .IF "$(APP4PRODUCTNAME)"!="" -APP4PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\" +APP4PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\" .ENDIF # "$(APP4PRODUCTNAME)"!="" .IF "$(linkinc)"!="" @@ -1151,7 +1151,7 @@ USE_APP5DEF= .IF "$(APP5TARGETN)"!="" .IF "$(APP5PRODUCTNAME)"!="" -APP5PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\" +APP5PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\" .ENDIF # "$(APP5PRODUCTNAME)"!="" .IF "$(linkinc)"!="" @@ -1425,7 +1425,7 @@ USE_APP6DEF= .IF "$(APP6TARGETN)"!="" .IF "$(APP6PRODUCTNAME)"!="" -APP6PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\" +APP6PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\" .ENDIF # "$(APP6PRODUCTNAME)"!="" .IF "$(linkinc)"!="" @@ -1699,7 +1699,7 @@ USE_APP7DEF= .IF "$(APP7TARGETN)"!="" .IF "$(APP7PRODUCTNAME)"!="" -APP7PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\" +APP7PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\" .ENDIF # "$(APP7PRODUCTNAME)"!="" .IF "$(linkinc)"!="" @@ -1973,7 +1973,7 @@ USE_APP8DEF= .IF "$(APP8TARGETN)"!="" .IF "$(APP8PRODUCTNAME)"!="" -APP8PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\" +APP8PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\" .ENDIF # "$(APP8PRODUCTNAME)"!="" .IF "$(linkinc)"!="" @@ -2247,7 +2247,7 @@ USE_APP9DEF= .IF "$(APP9TARGETN)"!="" .IF "$(APP9PRODUCTNAME)"!="" -APP9PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\" +APP9PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\" .ENDIF # "$(APP9PRODUCTNAME)"!="" .IF "$(linkinc)"!="" @@ -2521,7 +2521,7 @@ USE_APP10DEF= .IF "$(APP10TARGETN)"!="" .IF "$(APP10PRODUCTNAME)"!="" -APP10PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\" +APP10PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\" .ENDIF # "$(APP10PRODUCTNAME)"!="" .IF "$(linkinc)"!="" diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk index 423b73b99530..fc0b3d351ad1 100644 --- a/solenv/inc/tg_app.mk +++ b/solenv/inc/tg_app.mk @@ -88,7 +88,7 @@ USE_APP$(TNR)DEF= .IF "$(APP$(TNR)TARGETN)"!="" .IF "$(APP$(TNR)PRODUCTNAME)"!="" -APP$(TNR)PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\" +APP$(TNR)PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\" .ENDIF # "$(APP$(TNR)PRODUCTNAME)"!="" .IF "$(linkinc)"!="" |