[Libreoffice-commits] core.git: external/cppunit RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk                       |    2 -
 external/cppunit/ExternalPackage_cppunit.mk |   50 ----------------------------
 external/cppunit/Module_cppunit.mk          |    1 
 3 files changed, 1 insertion(+), 52 deletions(-)

New commits:
commit 32a001d85baf2b72a37b4ab8475f9489b7364769
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Oct 23 23:41:58 2013 +0200

    cppunit: remove ExternalPackage
    
    The DllPlugInTester executable is apparently unused.
    
    Change-Id: I1d26aebe8aa67b037438bd21bb00496804c41125

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ebdc619..969f575 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -197,7 +197,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\
 ))
 
 define gb_LinkTarget__use_cppunit
-$(call gb_LinkTarget_use_package,$(1),cppunit)
+$(call gb_LinkTarget_use_external_project,$(1),cppunit)
 
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,cppunit/include)\
diff --git a/external/cppunit/ExternalPackage_cppunit.mk b/external/cppunit/ExternalPackage_cppunit.mk
deleted file mode 100644
index d900e22..0000000
--- a/external/cppunit/ExternalPackage_cppunit.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,cppunit,cppunit))
-$(eval $(call gb_ExternalPackage_use_external_project,cppunit,cppunit))
-
-ifeq ($(OS),WNT)
-ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/$(if $(MSVC_USE_DEBUG_RUNTIME),cppunitd_dll.dll,cppunit_dll.dll),src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll/cppunitd_dll.dll,ReleaseDll/cppunit_dll.dll)))
-$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/icppunit_dll.lib,src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll/cppunitd_dll.lib,ReleaseDll/cppunit_dll.lib)))
-$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester_dll.exe,src/DllPlugInTester/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll/DllPlugInTesterd_dll.exe,ReleaseDll/DllPlugInTester_dll.exe)))
-else
-$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1-13-0.dll,src/cppunit/.libs/libcppunit-1-13-0.dll))
-$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.dll.a,src/cppunit/.libs/libcppunit.dll.a))
-$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester.exe,src/DllPlugInTester/.libs/DllPlugInTester.exe))
-endif
-else
-ifneq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester,src/DllPlugInTester/.libs/DllPlugInTester))
-else
-ifneq ($(filter DESKTOP,$(BUILD_TYPE)),)
-$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester,src/DllPlugInTester/DllPlugInTester))
-endif
-endif
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.0.dylib,src/cppunit/.libs/libcppunit-1.13.0.dylib))
-$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.dylib,src/cppunit/.libs/libcppunit.dylib))
-else ifeq ($(OS),AIX)
-$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.a,src/cppunit/.libs/libcppunit-1.13.a))
-else ifeq ($(OS),OPENBSD)
-$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.so.0.0,src/cppunit/.libs/libcppunit-1.13.so.0.0))
-$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.so,src/cppunit/.libs/libcppunit-1.13.so.0.0))
-else ifeq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.a,src/cppunit/.libs/libcppunit.a))
-else ifeq ($(OS),ANDROID)
-$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.so,src/cppunit/.libs/libcppunit-1.13.so))
-$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.so,src/cppunit/.libs/libcppunit-1.13.so))
-else
-$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.so.0,src/cppunit/.libs/libcppunit-1.13.so.0.0.1))
-$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.so,src/cppunit/.libs/libcppunit-1.13.so.0.0.1))
-endif
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/cppunit/Module_cppunit.mk b/external/cppunit/Module_cppunit.mk
index f0af9e8..296feeb 100644
--- a/external/cppunit/Module_cppunit.mk
+++ b/external/cppunit/Module_cppunit.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,cppunit))
 
 $(eval $(call gb_Module_add_targets,cppunit,\
 	UnpackedTarball_cppunit \
-	ExternalPackage_cppunit \
 	ExternalProject_cppunit \
 ))