diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-24 12:22:58 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-24 13:10:39 +0200 |
| commit | b308526fbc07753aca7186ab84e92ae8d56d7652 (patch) | |
| tree | 32a557867e5f74acc78bc117e1592b27db673520 | |
| parent | b242cee828704e136a47165fb473513b9b909b27 (diff) | |
libatomic_ops: use libraries from WORKDIR
Change-Id: I9d1267d6fc14a3149fb92a486bee3023a531e574
| -rw-r--r-- | RepositoryExternal.mk | 14 | ||||
| -rw-r--r-- | external/libatomic_ops/ExternalPackage_libatomic_ops.mk | 20 | ||||
| -rw-r--r-- | external/libatomic_ops/Module_libatomic_ops.mk | 1 |
3 files changed, 10 insertions, 25 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 38fb47055b87..9a138b53e51a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -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 diff --git a/external/libatomic_ops/ExternalPackage_libatomic_ops.mk b/external/libatomic_ops/ExternalPackage_libatomic_ops.mk deleted file mode 100644 index a7615f6ca83b..000000000000 --- a/external/libatomic_ops/ExternalPackage_libatomic_ops.mk +++ /dev/null @@ -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: diff --git a/external/libatomic_ops/Module_libatomic_ops.mk b/external/libatomic_ops/Module_libatomic_ops.mk index 7e1b5eef9626..7dca6703c868 100644 --- a/external/libatomic_ops/Module_libatomic_ops.mk +++ b/external/libatomic_ops/Module_libatomic_ops.mk @@ -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 \ )) |