strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libatomic_ops: use libraries from WORKDIR

Browse source 
Change-Id: I9d1267d6fc14a3149fb92a486bee3023a531e574
This commit is contained in:
Michael Stahl 2013-10-24 12:22:58 +02:00
parent b242cee828
commit b308526fbc
3 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
RepositoryExternal.mk
View file

@ -688,17 +688,23 @@ $(LIBATOMIC_OPS_CFLAGS) \
$$(INCLUDE) \
$(LIBATOMIC_OPS_CFLAGS) \
)
$(call gb_LinkTarget_use_package,$(1),\
$(call gb_LinkTarget_use_external_project,$(1),\
libatomic_ops \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
libatomic_ops \
ifeq ($(COM),MSC)
$(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs/libatomic_ops-7.2d.lib \
)
else
$(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs -latomic_ops-7.2d \
)
endif
endef
define gb_ExternalProject__use_libatomic_ops
$(call gb_ExternalProject_use_package,$(1),libatomic_ops)
$(call gb_ExternalProject_use_external_project,$(1),libatomic_ops)
endef

20
external/libatomic_ops/ExternalPackage_libatomic_ops.mk vendored
View file

@ -1,20 +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,libatomic_ops,libatomic_ops))
$(eval $(call gb_ExternalPackage_use_external_project,libatomic_ops,libatomic_ops))
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_ExternalPackage_add_file,libatomic_ops,lib/atomic_ops-7.2d.lib,src/lib/.libs/libatomic_ops-7.2d.lib))
else
$(eval $(call gb_ExternalPackage_add_file,libatomic_ops,lib/libatomic_ops-7.2d.a,src/lib/.libs/libatomic_ops-7.2d.a))
endif
# vim: set noet sw=4 ts=4:

1
external/libatomic_ops/Module_libatomic_ops.mk vendored
View file

@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,libatomic_ops))
$(eval $(call gb_Module_add_targets,libatomic_ops,\
ExternalProject_libatomic_ops \
ExternalPackage_libatomic_ops \
UnpackedTarball_libatomic_ops \
))