diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-11 16:59:27 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-11 17:00:14 +0200 |
| commit | e7d85cc078bd1d2757709789014233f4e9c1a23d (patch) | |
| tree | 119d81c5669183118c110f2f9abd6fab321b77be /liborcus | |
| parent | e9e996ed233e4ce1bd043b4e80dec2660005006e (diff) | |
orcus: use Package to deliver libraries
Manually copied files aren't cleaned
Change-Id: I35b08ed6f10b9405d569c06c624d0702f1f6e5fa
Diffstat (limited to 'liborcus')
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 3 | ||||
| -rw-r--r-- | liborcus/Module_liborcus.mk | 1 | ||||
| -rw-r--r-- | liborcus/Package_liborcus.mk | 20 |
3 files changed, 21 insertions, 3 deletions
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: |