From e7d85cc078bd1d2757709789014233f4e9c1a23d Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Tue, 11 Sep 2012 16:59:27 +0200
Subject: orcus: use Package to deliver libraries

Manually copied files aren't cleaned

Change-Id: I35b08ed6f10b9405d569c06c624d0702f1f6e5fa
---
 liborcus/ExternalProject_liborcus.mk |  3 ---
 liborcus/Module_liborcus.mk          |  1 +
 liborcus/Package_liborcus.mk         | 20 ++++++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 liborcus/Package_liborcus.mk

(limited to 'liborcus')

diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index 8cac314c0dff..f67b48c64063 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -22,7 +22,6 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
 	&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export BOOST_LIB_DIR=$(OUTDIR)/lib \
 	&& $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \
-	&& cp Release/orcus.lib $(OUTDIR)/lib \
 	&& touch $@
 
 else
@@ -40,8 +39,6 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
 		$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \
 		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 	&& $(GNUMAKE) \
-	&& cp src/liborcus/.libs/liborcus-0.2.a $(OUTDIR)/lib \
-	&& ln -s liborcus-0.2.a $(OUTDIR)/lib/liborcus.a \
 	&& touch $@
 
 endif
diff --git a/liborcus/Module_liborcus.mk b/liborcus/Module_liborcus.mk
index f8c0ed0a4a65..440d1b526372 100644
--- a/liborcus/Module_liborcus.mk
+++ b/liborcus/Module_liborcus.mk
@@ -13,6 +13,7 @@ ifeq ($(SYSTEM_LIBORCUS),NO)
 
 $(eval $(call gb_Module_add_targets,liborcus,\
 	ExternalProject_liborcus \
+	Package_liborcus \
 	UnpackedTarball_orcus \
 ))
 
diff --git a/liborcus/Package_liborcus.mk b/liborcus/Package_liborcus.mk
new file mode 100644
index 000000000000..57e5ea9b8d7b
--- /dev/null
+++ b/liborcus/Package_liborcus.mk
@@ -0,0 +1,20 @@
+# -*- 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_Package_Package,liborcus,$(call gb_UnpackedTarball_get_dir,orcus)))
+
+$(eval $(call gb_Package_use_external_project,liborcus,liborcus))
+
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call gb_Package_add_file,liborcus,lib/orcus.lib,vsprojects/liborcus-static-nozip/Release/orcus.lib))
+else
+$(eval $(call gb_Package_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.2.a))
+endif
+
+# vim: set noet sw=4 ts=4:
-- 
cgit