summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2010-10-21 16:02:40 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-10-25 19:55:34 -0500
commit1df23c08d442cc3e5d3714b54b8d5ab73327b954 (patch)
treef8a92489802a454e2d3d4e5a5bcd9e47884ad294 /framework
parent119873328acd70ca3569c21a0b1fe36277e8bf4c (diff)
Finally, gut the vos module out of the build
Diffstat (limited to 'framework')
-rw-r--r--framework/test/makefile.mk3
-rw-r--r--framework/test/threadtest/makefile.mk11
-rw-r--r--framework/test/typecfg/makefile.mk1
-rw-r--r--framework/util/guiapps/makefile.mk1
-rw-r--r--framework/util/makefile.mk2
5 files changed, 6 insertions, 12 deletions
diff --git a/framework/test/makefile.mk b/framework/test/makefile.mk
index 6764af8dd091..1059cbca443b 100644
--- a/framework/test/makefile.mk
+++ b/framework/test/makefile.mk
@@ -49,7 +49,7 @@ USE_DEFFILE= TRUE
#APP1STDLIBS= $(CPPULIB) \
# $(CPPUHELPERLIB) \
# $(SALLIB) \
-# $(VOSLIB) \
+# \
# $(TOOLSLIB) \
# $(SVTOOLLIB) \
# $(TKLIB) \
@@ -77,7 +77,6 @@ DEPOBJFILES+= $(APP2OBJS)
APP2STDLIBS= $(CPPULIB) \
$(CPPUHELPERLIB) \
$(SALLIB) \
- $(VOSLIB) \
$(VCLLIB)
APP2DEPN= $(SLO)$/fairrwlock.obj \
diff --git a/framework/test/threadtest/makefile.mk b/framework/test/threadtest/makefile.mk
index 833c328dc8a8..467f628890d6 100644
--- a/framework/test/threadtest/makefile.mk
+++ b/framework/test/threadtest/makefile.mk
@@ -40,20 +40,19 @@ USE_DEFFILE= TRUE
APP1TARGET= threadtest
-APP1OBJS= $(SLO)$/threadtest.obj \
+APP1OBJS= $(SLO)$/threadtest.obj \
$(SLO)$/lockhelper.obj
DEPOBJFILES=$(APP1OBJS)
# [ed] 6/16/02 Add the transaction manager library on OS X
-APP1STDLIBS= $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB) \
- $(VOSLIB) \
+APP1STDLIBS= $(CPPULIB) \
+ $(CPPUHELPERLIB) \
+ $(SALLIB) \
$(VCLLIB)
-APP1DEPN= $(INC)$/threadhelp$/threadhelpbase.hxx \
+APP1DEPN= $(INC)$/threadhelp$/threadhelpbase.hxx \
$(INC)$/threadhelp$/transactionbase.hxx \
$(INC)$/threadhelp$/transactionmanager.hxx \
$(INC)$/threadhelp$/transactionguard.hxx \
diff --git a/framework/test/typecfg/makefile.mk b/framework/test/typecfg/makefile.mk
index 83782fdc4d74..730febefdd8a 100644
--- a/framework/test/typecfg/makefile.mk
+++ b/framework/test/typecfg/makefile.mk
@@ -53,7 +53,6 @@ DEPOBJFILES=$(APP2OBJS)
APP2STDLIBS= $(CPPULIB) \
$(CPPUHELPERLIB) \
$(SALLIB) \
- $(VOSLIB) \
$(TOOLSLIB) \
$(SVTOOLLIB) \
$(TKLIB) \
diff --git a/framework/util/guiapps/makefile.mk b/framework/util/guiapps/makefile.mk
index efa5fc3fd88e..c5f77714f282 100644
--- a/framework/util/guiapps/makefile.mk
+++ b/framework/util/guiapps/makefile.mk
@@ -52,7 +52,6 @@ DEPOBJFILES=$(APP1OBJS)
APP1STDLIBS= $(CPPULIB) \
$(CPPUHELPERLIB) \
$(SALLIB) \
- $(VOSLIB) \
$(TOOLSLIB) \
$(SVTOOLLIB) \
$(TKLIB) \
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 85dff0aab67e..78c680f5adc2 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -116,7 +116,6 @@ SHL1STDLIBS= \
$(SVTOOLLIB) \
$(SVLLIB) \
$(I18NISOLANGLIB) \
- $(VOSLIB) \
$(VCLLIB) \
$(TKLIB) \
$(CPPULIB) \
@@ -156,7 +155,6 @@ SHL2STDLIBS= \
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB)
SHL2DEF= $(MISC)$/$(SHL2TARGET).def