[Libreoffice-commits] .: 2 commits - smoketestoo_native/makefile.mk test/source

[Caolán McNamara]

 smoketestoo_native/makefile.mk                    |    7 -------
 test/source/cpp/makefile.mk                       |    3 ---
 test/source/cpp/unoexceptionprotector/makefile.mk |    3 ---
 3 files changed, 13 deletions(-)

New commits:
commit e6cb05fe747bfff69435eb7e7a6f64f49f1f7c19
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 5 11:54:17 2011 +0100

    remove ADAPT_EXT_STL

diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk
index 2073f15..cae88e0 100644
--- a/test/source/cpp/makefile.mk
+++ b/test/source/cpp/makefile.mk
@@ -35,9 +35,6 @@ VISIBILITY_HIDDEN = TRUE
 CDEFS += -DOOO_DLLIMPLEMENTATION_TEST
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
-.IF "$(USE_SYSTEM_STL)" != "YES" && "$(SYSTEM_CPPUNIT)" == "YES"
-CFLAGSCXX += -DADAPT_EXT_STL
-.END
 
 SLOFILES = \
     $(SLO)/getargument.obj \
diff --git a/test/source/cpp/unoexceptionprotector/makefile.mk b/test/source/cpp/unoexceptionprotector/makefile.mk
index 7f62199..86c8bc6 100644
--- a/test/source/cpp/unoexceptionprotector/makefile.mk
+++ b/test/source/cpp/unoexceptionprotector/makefile.mk
@@ -35,9 +35,6 @@ VISIBILITY_HIDDEN = TRUE
 DLLPRE =
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
-.IF "$(USE_SYSTEM_STL)" != "YES" && "$(SYSTEM_CPPUNIT)" == "YES"
-CFLAGSCXX += -DADAPT_EXT_STL
-.END
 
 SLOFILES = $(SLO)/unoexceptionprotector.obj
 
commit 119af1574e9e683654af7fbca7352a384c1bd2cc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 5 11:47:33 2011 +0100

    remove ADAPT_EXT_STL

diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index 195ef40..31d67d7 100755
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -35,13 +35,6 @@ ABORT_ON_ASSERTION = TRUE
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
 SLOFILES = $(SHL1OBJS)
 
 SHL1TARGET = smoketest