diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-23 15:52:08 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-23 15:52:08 +0000 |
| commit | 8034f570cbe5227a12a4cca420844f76d10dc623 (patch) | |
| tree | 5197805798cf466db87ea43a50084f6a61f5da38 /solenv/inc/tg_shl.mk | |
| parent | bc54cd7501259e237bbcf1edab5412cf6160b348 (diff) | |
CWS-TOOLING: integrate CWS ause100
2009-04-07 18:39:24 +0200 hjs r270608 : #i100932# add chmod to ease later removal
2009-04-03 19:18:44 +0200 hjs r270516 : #i100675# convert for now...
2009-04-03 17:40:55 +0200 hjs r270510 : #i100837# force use of GNU tar
2009-04-03 17:32:11 +0200 hjs r270508 : #i100837# clean tarballs and a readme
2009-04-03 17:29:35 +0200 hjs r270507 : #i100837# introduce $(TAR) and $(GNUTAR)
2009-04-03 12:22:47 +0200 hjs r270469 : #i100793# check for GNU tar
2009-03-30 17:30:20 +0200 hjs r270247 : #i100675# common comp_ver.mk for both windows shells
2009-03-30 13:49:55 +0200 hjs r270226 : #i100675# common comp_ver.mk for both windows shells
2009-03-30 13:36:00 +0200 hjs r270223 : #i100675# no backslash in dependencies
2009-03-30 13:34:14 +0200 hjs r270222 : #i100675# fix testhxx for cygwin
2009-03-27 16:34:33 +0100 hjs r270162 : #i98068# move that block where it makes sense
2009-03-27 16:16:41 +0100 hjs r270160 : #i92036# - two step move to have a simple rename in the shared dir
Diffstat (limited to 'solenv/inc/tg_shl.mk')
| -rw-r--r-- | solenv/inc/tg_shl.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 283b7bafd855..327e205c22f8 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -65,6 +65,14 @@ SHL$(TNR)LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL$(TNR)RPATH)) SHL$(TNR)DEF*=$(MISC)$/$(SHL$(TNR)TARGET).def .ENDIF # "$(SHL$(TNR)USE_EXPORTS)"=="" +EXTRALIBPATHS$(TNR)=$(EXTRALIBPATHS) +.IF "$(UPDATER)"=="YES" +.IF "$(SHL$(TNR)NOCHECK)"=="" +.IF "$(SOLAR_STLLIBPATH)"!="" +EXTRALIBPATHS$(TNR)+=-L$(SOLAR_STLLIBPATH) +.ENDIF +.ENDIF # "$(SHL$(TNR)NOCHECK)"!="" +.ENDIF #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ #+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -469,7 +477,7 @@ $(SHL$(TNR)TARGETN) : \ @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL$(TNR)NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL$(TNR)TARGETN) + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN) .ENDIF # "$(SHL$(TNR)NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" @@ -484,7 +492,7 @@ $(SHL$(TNR)TARGETN) : \ .IF "$(SHL$(TNR)NOCHECK)"=="" -$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) $(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) .ENDIF # "$(SHL$(TNR)NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" |