[Libreoffice-commits] .: configmgr/qa desktop/qa shell/qa

[Caolán McNamara]

 configmgr/qa/unit/makefile.mk          |    4 ++--
 desktop/qa/deployment_misc/makefile.mk |    2 +-
 shell/qa/makefile.mk                   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 61a99a38bc88e34d8af1695884403ce8388ab80f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 24 20:45:39 2011 +0000

    remove empty TESTSHL2LIB

diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index 25035d7..fdb82f1 100644
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
@@ -42,8 +42,8 @@ SHL1STDLIBS = \
     $(CPPUHELPERLIB) \
     $(CPPULIB) \
     $(CPPUNITLIB) \
-    $(SALLIB) \
-    $(TESTSHL2LIB)
+    $(SALLIB)
+
 SHL1TARGET = unit
 SHL1VERSIONMAP = version.map
 DEF1NAME = $(SHL1TARGET)
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk
index 15faef0..e6b65d5 100644
--- a/desktop/qa/deployment_misc/makefile.mk
+++ b/desktop/qa/deployment_misc/makefile.mk
@@ -39,7 +39,7 @@ DLLPRE = # no leading "lib" on .so files
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_dp_version.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB) $(TESTSHL2LIB)
+SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
diff --git a/shell/qa/makefile.mk b/shell/qa/makefile.mk
index cc91a6b..30b0bd1 100755
--- a/shell/qa/makefile.mk
+++ b/shell/qa/makefile.mk
@@ -44,7 +44,7 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 SHL1OBJS=$(SLO)$/recent_docs.obj $(SLO)$/xml_parser.obj
 SHL1TARGET=recent_docs
-SHL1STDLIBS=$(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS=$(SALLIB) $(CPPUNITLIB)
 
 .IF "$(GUI)" == "UNX"
 ..$/unxsols4.pro$/slb$/libsysshell.a \