summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorKohei Yoshida <kyoshida@novell.com>2010-12-13 10:50:10 -0500
committerKohei Yoshida <kyoshida@novell.com>2010-12-13 10:50:10 -0500
commit521da7bbda27d7d6fc0d5c1eb9ea6aac75b56d3c (patch)
tree980409224d46d601d71c64481030ee52e86a9fa8 /solenv
parent59bd44d72993b654d05bb39bb3e98dd754f3e986 (diff)
Removed all references to soldep.
Diffstat (limited to 'solenv')
-rw-r--r--solenv/inc/libs.mk2
-rw-r--r--solenv/inc/unxgcc.mk3
-rw-r--r--solenv/inc/unxsoli4.mk3
-rw-r--r--solenv/inc/unxsols4.mk3
-rw-r--r--solenv/inc/unxsolu4.mk3
-rwxr-xr-xsolenv/inc/wntgcci.mk1
-rwxr-xr-xsolenv/inc/wntmsci10.mk3
-rwxr-xr-xsolenv/inc/wntmsci11.mk3
8 files changed, 6 insertions, 15 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 74355aca0bd7..f80f74b158af 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -115,7 +115,6 @@ RMCXTLIB=-lrmcxt
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
BTSTRPLIB=-lbtstrp
BTSTRPDTLIB=-lbootstrpdt$(DLLPOSTFIX)
-SOLDEPLIB=-lsoldep$(DLLPOSTFIX)
TRANSEXLIB=-ltransex
OTXLIB=-lotx_ind
OSXLIB=-losx
@@ -413,7 +412,6 @@ FWELIB=ifwe.lib
FWILIB=ifwi.lib
BTSTRPLIB=btstrp.lib
BTSTRPDTLIB=bootstrpdt.lib
-SOLDEPLIB=soldep.lib
TRANSEXLIB=transex.lib
ICOLIB=icom.lib
SVTOOLLIB=svtool.lib
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 5fce36e0e30d..3404962f39fb 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -148,8 +148,7 @@ CFLAGSWERRCC=-Werror
# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
# settings.mk):
MODULES_WITH_WARNINGS := \
- lotuswordpro \
- soldep
+ lotuswordpro
# switches for dynamic and static linking
STATIC = -Wl,-Bstatic
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index b1778a0edfde..3c7e477875ca 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -106,8 +106,7 @@ CFLAGSWERRCXX=-xwe
# Once all modules on this platform compile without warnings, set
# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
# settings.mk):
-MODULES_WITH_WARNINGS := \
- soldep
+MODULES_WITH_WARNINGS :=
STDOBJVCL=$(L)/salmain.o
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 4febb67d446a..dbe9a226f8b2 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -112,8 +112,7 @@ CFLAGSWERRCXX=-xwe
# Once all modules on this platform compile without warnings, set
# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
# settings.mk):
-MODULES_WITH_WARNINGS := \
- soldep
+MODULES_WITH_WARNINGS :=
STDOBJVCL=$(L)/salmain.o
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index c73d6fc37283..8ef4e7eba978 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -111,8 +111,7 @@ CFLAGSWERRCXX=-xwe
# Once all modules on this platform compile without warnings, set
# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
# settings.mk):
-MODULES_WITH_WARNINGS := \
- soldep
+MODULES_WITH_WARNINGS :=
STDOBJVCL=$(L)/salmain.o
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 043e0b24d321..e6d73b45d466 100755
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -98,7 +98,6 @@ MODULES_WITH_WARNINGS := \
extensions \
lingu \
r_tools \
- soldep \
starmath \
sw \
xmlsecurity
diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk
index 358394469b06..991a8f7a9560 100755
--- a/solenv/inc/wntmsci10.mk
+++ b/solenv/inc/wntmsci10.mk
@@ -200,8 +200,7 @@ CFLAGSWERRCC=-WX
# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
# settings.mk):
MODULES_WITH_WARNINGS := \
- lingucomponent \
- soldep
+ lingucomponent
CDEFS+=-DSTLPORT_VERSION=$(STLPORT_VER) -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index 8aac2798eb28..aff50001ca9d 100755
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -218,8 +218,7 @@ CFLAGSWERRCC=-WX
# Once all modules on this platform compile without warnings, set
# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
# settings.mk):
-MODULES_WITH_WARNINGS := \
- soldep
+MODULES_WITH_WARNINGS :=
CDEFS+=-DSTLPORT_VERSION=400 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
.IF "$(COMEX)" == "11"