diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-16 10:38:23 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-16 10:38:23 +0000 |
| commit | 3f2c8e0322b1e14e6679af9e7a380cecc96a5bb8 (patch) | |
| tree | fca30cb6cf90d07b6c8e0b8cf70f29ebb2e725e1 /solenv/inc/tg_app.mk | |
| parent | c5a35b59f7558cbc6e203270049572205b903375 (diff) | |
INTEGRATION: CWS ause06 (1.43.4); FILE MERGED
2003/10/10 13:27:26 hjs 1.43.4.1: #112607# SHLnLINKRES and APPnLINKTYPEFLAG
Diffstat (limited to 'solenv/inc/tg_app.mk')
| -rw-r--r-- | solenv/inc/tg_app.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk index 5465f332364a..fd08cd134906 100644 --- a/solenv/inc/tg_app.mk +++ b/solenv/inc/tg_app.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_app.mk,v $ # -# $Revision: 1.43 $ +# $Revision: 1.44 $ # -# last change: $Author: kz $ $Date: 2003-08-25 14:46:52 $ +# last change: $Author: vg $ $Date: 2003-12-16 11:38:23 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -97,7 +97,7 @@ APP1 APP2 APP3 APP4 APP5 APP6 APP7 APP8 APP9 : .IF "$(APP$(TNR)LINKTYPE)" != "" #darf nur STATIC oder SHARED sein -APP_LINKTYPE=$(APPLINK$(APP$(TNR)LINKTYPE)) +APP$(TNR)LINKTYPEFLAG=$(APPLINK$(APP$(TNR)LINKTYPE)) .ENDIF .IF "$(APP$(TNR)STACK)" != "" @@ -163,7 +163,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ `cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \ `dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP$(TNR)STDLIBS) $(STDLIB) $(STDLIB$(TNR))` \ - $(APP_LINKTYPE) $(APP$(TNR)STDLIBS) $(STDLIB) $(STDLIB$(TNR)) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd + $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)STDLIBS) $(STDLIB) $(STDLIB$(TNR)) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @source $(MISC)$/$(@:b).cmd # Need to strip __objcInit symbol to avoid duplicate symbols when loading @@ -189,7 +189,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ $(APP$(TNR)OBJS:s/.obj/.o/) "\" > $(MISC)$/$(@:b).cmd @cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd - @+echo $(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(STDLIB) $(STDLIB$(TNR)) -o $@ >> $(MISC)$/$(@:b).cmd + @+echo $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(STDLIB) $(STDLIB$(TNR)) -o $@ >> $(MISC)$/$(@:b).cmd cat $(MISC)$/$(@:b).cmd @source $(MISC)$/$(@:b).cmd @ls -l $@ |