From 168bd09c6bf2e27b108325899c995bc330f7f640 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 10 Oct 2012 10:02:29 +0100
Subject: try and make mingw32 build

Change-Id: I64c884b6d14c7112a88c7741ef7688108ec80ffe
---
 salhelper/CppunitTest_salhelper_testapi.mk |  2 +-
 salhelper/qa/makefile.mk                   | 43 ------------------------------
 salhelper/qa/version.map                   | 24 -----------------
 3 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 salhelper/qa/makefile.mk
 delete mode 100644 salhelper/qa/version.map

(limited to 'salhelper')

diff --git a/salhelper/CppunitTest_salhelper_testapi.mk b/salhelper/CppunitTest_salhelper_testapi.mk
index ae8004264285..606827a868d7 100644
--- a/salhelper/CppunitTest_salhelper_testapi.mk
+++ b/salhelper/CppunitTest_salhelper_testapi.mk
@@ -27,7 +27,7 @@ $(eval $(call gb_CppunitTest_set_include,salhelper_testapi,\
 $(eval $(call gb_CppunitTest_use_libraries,salhelper_testapi,\
     salhelper \
     sal \
-    $(gb_STDLIBS) \
+    $(gb_UWINAPI) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/salhelper/qa/makefile.mk b/salhelper/qa/makefile.mk
deleted file mode 100644
index c359a4603eed..000000000000
--- a/salhelper/qa/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ := ..
-PRJNAME := salhelper
-TARGET := qa
-
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_api.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB)
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1VERSIONMAP = version.map
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
-
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-    cd $(SHL1TARGETN:d) && $(TESTSHL2) $(SHL1TARGETN:f)
diff --git a/salhelper/qa/version.map b/salhelper/qa/version.map
deleted file mode 100644
index 878fdc5ee97f..000000000000
--- a/salhelper/qa/version.map
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-UDK_3_0_0 {
-    global:
-        registerAllTestFunction;
-    local:
-        *;
-};
-- 
cgit