summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-19 11:42:47 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-19 11:42:47 +0000
commit10c3d329759c113a474e1331ea2eadbdddd59599 (patch)
tree1b6ed155c473577924afa9073b7e3bb840921369
parentac961c6a5751cae44c6e132a9d10738462bac477 (diff)
CWS-TOOLING: integrate CWS sb104
2009-01-27 13:09:06 +0100 sb r266986 : #i97992# cws rebase: merged cws/sb104/config_office/set_soenv.in with moved tags/DEV300_m40/set_soenv.in 2009-01-27 10:56:40 +0100 sb r266966 : CWS-TOOLING: rebase CWS sb104 to trunk@266944 (milestone: DEV300:m40) 2009-01-20 14:37:00 +0100 sb r266581 : #i97992# missing treatment of Solaris-only adjustvisibility as build-internal tool 2009-01-20 09:32:38 +0100 sb r266554 : CWS-TOOLING: rebase CWS sb104 to trunk@266428 (milestone: DEV300:m39) 2009-01-14 13:40:45 +0100 sb r266296 : #i97992# do not pass comment lines to shell 2009-01-14 12:50:34 +0100 sb r266290 : #i97992# avoid problems with checkdll not finding AWTLIB and its dependents 2009-01-14 12:49:20 +0100 sb r266289 : #i97992# on Linux and Solaris, regxpcom apparently needs to be called with the libxpcom.so directory on the LD_LIBRARY_PATH 2009-01-13 09:41:37 +0100 sb r266196 : #i97992# fixed AUGMENT_LIBRARY_PATH definitions 2009-01-12 18:02:03 +0100 sb r266177 : #i97992# get rid of LD_LIBRARY_PATH in build environment
Diffstat
-rw-r--r--basebmp/test/makefile.mk2
-rw-r--r--basegfx/test/makefile.mk2
-rw-r--r--dtrans/source/aqua/makefile.mk2
-rw-r--r--goodies/source/inv/makefile.mk2
-rw-r--r--i18npool/source/breakiterator/data/makefile.mk2
-rw-r--r--i18npool/source/breakiterator/makefile.mk7
-rw-r--r--i18npool/source/collator/data/makefile.mk2
-rw-r--r--i18npool/source/collator/makefile.mk1
-rw-r--r--i18npool/source/indexentry/data/makefile.mk2
-rw-r--r--i18npool/source/indexentry/makefile.mk1
-rw-r--r--i18npool/source/localedata/data/makefile.mk2
-rw-r--r--i18npool/source/localedata/makefile.mk1
-rw-r--r--i18npool/source/textconversion/data/makefile.mk2
-rw-r--r--i18npool/source/textconversion/makefile.mk1
-rw-r--r--o3tl/qa/makefile.mk2
-rw-r--r--rsc/source/prj/makefile.mk2
-rw-r--r--tools/bootstrp/makefile.mk1
-rw-r--r--transex3/source/makefile.mk3
-rw-r--r--vcl/workben/makefile.mk2
19 files changed, 25 insertions, 14 deletions
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index 1412a7602161..43165b831a64 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -132,6 +132,6 @@ unittest : $(SHL1TARGETN)
@echo ----------------------------------------------------------
@echo - start unit test on library $(SHL1TARGETN)
@echo ----------------------------------------------------------
- testshl2 -sf $(mktmp ) $(SHL1TARGETN)
+ $(AUGMENT_LIBRARY_PATH) testshl2 -sf $(mktmp ) $(SHL1TARGETN)
ALLTAR : unittest
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index 5bf0d8aa0b59..d0fbfaf9e7c6 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -89,7 +89,7 @@ $(MISC)$/unittest_succeeded : $(SHL1TARGETN)
@echo ----------------------------------------------------------
@echo - start unit test on library $(SHL1TARGETN)
@echo ----------------------------------------------------------
- testshl2 -sf $(mktmp ) -forward $(BIN)$/ $(SHL1TARGETN)
+ $(AUGMENT_LIBRARY_PATH) testshl2 -sf $(mktmp ) -forward $(BIN)$/ $(SHL1TARGETN)
$(TOUCH) $@
ALLTAR : $(MISC)$/unittest_succeeded
diff --git a/dtrans/source/aqua/makefile.mk b/dtrans/source/aqua/makefile.mk
index 0d3f7d2b9b35..e0b4eecf6db4 100644
--- a/dtrans/source/aqua/makefile.mk
+++ b/dtrans/source/aqua/makefile.mk
@@ -97,7 +97,7 @@ SHL1OBJS= $(SLOFILES)
# --- Targets ------------------------------------------------------
ALL : ALLTAR
- +cd $(LB) && regcomp -register -r ../bin/$(COMP1TYPELIST).rdb -c $(SHL1TARGET)
+ +cd $(LB) && $(REGCOMP) -register -r ../bin/$(COMP1TYPELIST).rdb -c $(SHL1TARGET)
.INCLUDE : target.mk
diff --git a/goodies/source/inv/makefile.mk b/goodies/source/inv/makefile.mk
index 7b7d6fabdd1e..359aab167008 100644
--- a/goodies/source/inv/makefile.mk
+++ b/goodies/source/inv/makefile.mk
@@ -114,7 +114,7 @@ $(BIN)$/applicat.rdb : makefile.mk $(SOLARBINDIR)$/types.rdb
rm -f $@
$(GNUCOPY) $(SOLARBINDIR)$/types.rdb $@
cd $(BIN) && \
- regcomp -register -r applicat.rdb \
+ $(REGCOMP) -register -r applicat.rdb \
-c i18npool.uno$(DLLPOST)
# --- Def-File ---
diff --git a/i18npool/source/breakiterator/data/makefile.mk b/i18npool/source/breakiterator/data/makefile.mk
index 7faf1a068701..ba380babb279 100644
--- a/i18npool/source/breakiterator/data/makefile.mk
+++ b/i18npool/source/breakiterator/data/makefile.mk
@@ -81,7 +81,7 @@ DEPOBJFILES= \
.INCLUDE : target.mk
$(MISC)$/dict_%.cxx : %.dic
- $(BIN)$/gendict $< $@
+ $(AUGMENT_LIBRARY_PATH) $(BIN)$/gendict $< $@
# ugly - is this dependency really required here?
$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gendict$(EXECPOST)
diff --git a/i18npool/source/breakiterator/makefile.mk b/i18npool/source/breakiterator/makefile.mk
index 2db7d3c7d73b..7ba9cd3e753d 100644
--- a/i18npool/source/breakiterator/makefile.mk
+++ b/i18npool/source/breakiterator/makefile.mk
@@ -64,6 +64,7 @@ SLOFILES= \
OBJFILES = $(OBJ)$/gendict.obj
APP1TARGET = gendict
+APP1RPATH = NONE
DEPOBJFILES = $(OBJ)$/gendict.obj
APP1OBJS = $(DEPOBJFILES)
@@ -77,9 +78,9 @@ GENCMN:=$(SYSTEM_GENCMN)
GENBRK:=$(SYSTEM_GENBRK)
GENCCODE:=$(SYSTEM_GENCCODE)
.ELSE
-GENCMN:=$(SOLARBINDIR)$/gencmn
-GENBRK:=$(SOLARBINDIR)$/genbrk
-GENCCODE:=$(SOLARBINDIR)$/genccode
+GENCMN:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/gencmn
+GENBRK:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/genbrk
+GENCCODE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/genccode
.ENDIF
$(MISC)$/%.brk : data/%.txt
diff --git a/i18npool/source/collator/data/makefile.mk b/i18npool/source/collator/data/makefile.mk
index 18e610c7a996..bdf802adc94d 100644
--- a/i18npool/source/collator/data/makefile.mk
+++ b/i18npool/source/collator/data/makefile.mk
@@ -61,7 +61,7 @@ SHL1OBJS=$(SLOFILES)
.INCLUDE : target.mk
$(MISC)$/collator_%.cxx : %.txt
- $(BIN)$/gencoll_rule $< $@ $*
+ $(AUGMENT_LIBRARY_PATH) $(BIN)$/gencoll_rule $< $@ $*
# ugly - is this dependency really required here?
$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gencoll_rule$(EXECPOST)
diff --git a/i18npool/source/collator/makefile.mk b/i18npool/source/collator/makefile.mk
index b1e2791f873b..bca1c00aa419 100644
--- a/i18npool/source/collator/makefile.mk
+++ b/i18npool/source/collator/makefile.mk
@@ -54,6 +54,7 @@ SLOFILES= \
$(rules_obj)
APP1TARGET = gencoll_rule
+APP1RPATH = NONE
APP1OBJS = $(OBJ)$/gencoll_rule.obj
diff --git a/i18npool/source/indexentry/data/makefile.mk b/i18npool/source/indexentry/data/makefile.mk
index e58b0b7c2c90..6149bbd8b12a 100644
--- a/i18npool/source/indexentry/data/makefile.mk
+++ b/i18npool/source/indexentry/data/makefile.mk
@@ -64,7 +64,7 @@ LIB1OBJFILES=$(SHL1OBJS)
.INCLUDE : target.mk
$(MISC)$/%.cxx : %.txt
- $(BIN)$/genindex_data $< $@ $*
+ $(AUGMENT_LIBRARY_PATH) $(BIN)$/genindex_data $< $@ $*
# ugly - is this dependency really required here?
$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genindex_data$(EXECPOST)
diff --git a/i18npool/source/indexentry/makefile.mk b/i18npool/source/indexentry/makefile.mk
index e10f05e920ed..770fe062c688 100644
--- a/i18npool/source/indexentry/makefile.mk
+++ b/i18npool/source/indexentry/makefile.mk
@@ -54,6 +54,7 @@ SLOFILES= \
OBJFILES = $(OBJ)$/genindex_data.obj
APP1TARGET = genindex_data
+APP1RPATH = NONE
DEPOBJFILES = $(OBJ)$/genindex_data.obj
APP1OBJS = $(DEPOBJFILES)
diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk
index b288275a386e..3eca889e7ccc 100644
--- a/i18npool/source/localedata/data/makefile.mk
+++ b/i18npool/source/localedata/data/makefile.mk
@@ -495,6 +495,6 @@ DEPOBJFILES= \
$(MY_MISC_CXXFILES) : $(BIN)$/saxparser$(EXECPOST)
$(MISC)$/localedata_%.cxx : %.xml
- $(WRAPCMD) $(BIN)$/saxparser $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARBINDIR)$/types.rdb
+ $(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(BIN)$/saxparser $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARBINDIR)$/types.rdb
$(RM) $(BIN)$/$(@:b).rdb
diff --git a/i18npool/source/localedata/makefile.mk b/i18npool/source/localedata/makefile.mk
index 847d1df7240b..e1bd0ac1a6ce 100644
--- a/i18npool/source/localedata/makefile.mk
+++ b/i18npool/source/localedata/makefile.mk
@@ -68,6 +68,7 @@ OBJFILES = \
$(OBJ)$/filewriter.obj
APP1TARGET = saxparser
+APP1RPATH = NONE
APP1OBJS = $(OBJFILES)
diff --git a/i18npool/source/textconversion/data/makefile.mk b/i18npool/source/textconversion/data/makefile.mk
index f1e2652c23cc..37569e1f3fd7 100644
--- a/i18npool/source/textconversion/data/makefile.mk
+++ b/i18npool/source/textconversion/data/makefile.mk
@@ -65,7 +65,7 @@ LIB1OBJFILES=$(SHL1OBJS)
APP1TARGET = genconv_dict
$(MISC)$/%.cxx : %.dic
- $(BIN)$/genconv_dict $* $< $@
+ $(AUGMENT_LIBRARY_PATH) $(BIN)$/genconv_dict $* $< $@
# ugly - is this dependency really required here?
$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genconv_dict$(EXECPOST)
diff --git a/i18npool/source/textconversion/makefile.mk b/i18npool/source/textconversion/makefile.mk
index e271205ed010..431abb1b513f 100644
--- a/i18npool/source/textconversion/makefile.mk
+++ b/i18npool/source/textconversion/makefile.mk
@@ -51,6 +51,7 @@ SLOFILES= \
OBJFILES = $(OBJ)$/genconv_dict.obj
APP1TARGET = genconv_dict
+APP1RPATH = NONE
APP1OBJS = $(OBJ)$/genconv_dict.obj
diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk
index 5a71a7821325..563f4e2d3bf2 100644
--- a/o3tl/qa/makefile.mk
+++ b/o3tl/qa/makefile.mk
@@ -75,6 +75,6 @@ unittest : $(SHL1TARGETN)
@echo ----------------------------------------------------------
@echo - start unit test on library $(SHL1TARGETN)
@echo ----------------------------------------------------------
- testshl2 -sf $(mktmp ) $(SHL1TARGETN)
+ $(AUGMENT_LIBRARY_PATH) testshl2 -sf $(mktmp ) $(SHL1TARGETN)
ALLTAR : unittest
diff --git a/rsc/source/prj/makefile.mk b/rsc/source/prj/makefile.mk
index a82a593dfacb..f2a588702a4e 100644
--- a/rsc/source/prj/makefile.mk
+++ b/rsc/source/prj/makefile.mk
@@ -54,6 +54,7 @@ APP1OBJS= $(OBJ)$/start.obj
APP1STACK=64000
#APP1STACK=32768
.ENDIF
+APP1RPATH=NONE
APP2TARGET= rsc2
.IF "$(OS)"=="SCO"
@@ -74,6 +75,7 @@ APP2OBJS= $(OBJ)$/gui.obj
APP2STACK=64000
#APP2STACK=32768
.ENDIF
+APP2RPATH=NONE
# --- Targets ------------------------------------------------------------
diff --git a/tools/bootstrp/makefile.mk b/tools/bootstrp/makefile.mk
index 33f161cf30a3..d0adff1278e4 100644
--- a/tools/bootstrp/makefile.mk
+++ b/tools/bootstrp/makefile.mk
@@ -87,6 +87,7 @@ APP2TARGET= rscdep
APP2OBJS= $(OBJ)$/rscdep.obj
APP2LIBS= $(LB)$/$(TARGET).lib $(LB)$/$(TARGET1).lib
APP2STDLIBS= $(SALLIB) $(VOSLIB) $(TOOLSLIB)
+APP2RPATH= NONE
APP3TARGET= so_checksum
APP3OBJS= $(OBJ)$/md5.obj \
diff --git a/transex3/source/makefile.mk b/transex3/source/makefile.mk
index 8c7a486e7381..68b94a5b58fa 100644
--- a/transex3/source/makefile.mk
+++ b/transex3/source/makefile.mk
@@ -97,6 +97,7 @@ APP1DEPN= $(OBJ)$/src_yy_wrapper.obj $(LB)$/$(TARGET).lib
APP2TARGET= helpex
APP2OBJS= $(OBJ)$/helpmerge.obj $(OBJ)$/xmlparse.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj $(OBJ)$/merge.obj $(OBJ)$/helpex.obj $(OBJ)$/hw2fw.obj
+APP2RPATH= NONE
.IF "$(OS)"!="MACOSX"
.ENDIF
@@ -110,6 +111,7 @@ APP2STDLIBS+=$(SALLIB) $(EXPATASCII3RDLIB) $(TOOLSLIB) $(VOSLIB)
# extractor and merger for *.lng and *.lng
APP3TARGET= ulfex
APP3OBJS= $(OBJ)$/lngmerge.obj $(OBJ)$/hw2fw.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/lngex.obj $(OBJ)$/utf8conv.obj
+APP3RPATH= NONE
.IF "$(OS)"!="MACOSX"
#APP3STDLIBS+= $(BTSTRPLIB)
@@ -158,6 +160,7 @@ APP6STDLIBS+= \
# extractor and merger for *.xrm
APP7TARGET= xrmex
APP7OBJS= $(OBJ)$/xrmmerge.obj $(OBJ)$/xrm_yy_wrapper.obj $(OBJ)$/hw2fw.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj
+APP7RPATH= NONE
.IF "$(OS)"!="MACOSX"
.ENDIF
diff --git a/vcl/workben/makefile.mk b/vcl/workben/makefile.mk
index 82edf8617891..83abbbf4e6bf 100644
--- a/vcl/workben/makefile.mk
+++ b/vcl/workben/makefile.mk
@@ -147,7 +147,7 @@ $(BIN)$/applicat.rdb : makefile.mk $(UNOUCRRDB)
rm -f $@
$(GNUCOPY) $(UNOUCRRDB) $@
cd $(BIN) && \
- regcomp -register -r applicat.rdb \
+ $(REGCOMP) -register -r applicat.rdb \
-c i18nsearch.uno$(DLLPOST) \
-c i18npool.uno$(DLLPOST)
generated by cgit (git 2.34.1) at 2024-06-23 20:08:47 +0000