diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-17 19:40:24 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-10-18 06:52:56 +0000 |
commit | 1a6264aa1230239006296247c5b6f098b80b6455 (patch) | |
tree | 9b79ee0e1972bceb9b2b1cfa31b976734a6f6c25 /libatomic_ops | |
parent | 3c61695a8235eec183de1470c42ce5d112ddaa49 (diff) |
fdo#70393: move libatomic_ops to a subdir of external
Change-Id: Ic79dddea1e366019f5a1d919ad0b9568b4d8cdf7
Reviewed-on: https://gerrit.libreoffice.org/6301
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'libatomic_ops')
-rw-r--r-- | libatomic_ops/ExternalPackage_libatomic_ops.mk | 20 | ||||
-rw-r--r-- | libatomic_ops/ExternalProject_libatomic_ops.mk | 26 | ||||
-rw-r--r-- | libatomic_ops/Makefile | 7 | ||||
-rw-r--r-- | libatomic_ops/Module_libatomic_ops.mk | 22 | ||||
-rw-r--r-- | libatomic_ops/README | 4 | ||||
-rw-r--r-- | libatomic_ops/UnpackedTarball_libatomic_ops.mk | 14 |
6 files changed, 0 insertions, 93 deletions
diff --git a/libatomic_ops/ExternalPackage_libatomic_ops.mk b/libatomic_ops/ExternalPackage_libatomic_ops.mk deleted file mode 100644 index a7615f6ca83b..000000000000 --- a/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/libatomic_ops/ExternalProject_libatomic_ops.mk b/libatomic_ops/ExternalProject_libatomic_ops.mk deleted file mode 100644 index 06ec521c615d..000000000000 --- a/libatomic_ops/ExternalProject_libatomic_ops.mk +++ /dev/null @@ -1,26 +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_ExternalProject_ExternalProject,libatomic_ops)) - -$(eval $(call gb_ExternalProject_use_autoconf,libatomic_ops,build)) - -$(eval $(call gb_ExternalProject_register_targets,libatomic_ops,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,libatomic_ops,build) : - $(call gb_ExternalProject_run,build,\ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \ - ./configure \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && $(MAKE) \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/libatomic_ops/Makefile b/libatomic_ops/Makefile deleted file mode 100644 index ccb1c85a04da..000000000000 --- a/libatomic_ops/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- - -module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) - -include $(module_directory)/../solenv/gbuild/partial_build.mk - -# vim: set noet sw=4 ts=4: diff --git a/libatomic_ops/Module_libatomic_ops.mk b/libatomic_ops/Module_libatomic_ops.mk deleted file mode 100644 index dbbf39bcd2f1..000000000000 --- a/libatomic_ops/Module_libatomic_ops.mk +++ /dev/null @@ -1,22 +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_Module_Module,libatomic_ops)) - -ifeq ($(SYSTEM_ATOMIC_OPS),NO) - -$(eval $(call gb_Module_add_targets,libatomic_ops,\ - ExternalProject_libatomic_ops \ - ExternalPackage_libatomic_ops \ - UnpackedTarball_libatomic_ops \ -)) - -endif - -# vim: set noet sw=4 ts=4: diff --git a/libatomic_ops/README b/libatomic_ops/README deleted file mode 100644 index 61255d7c8e05..000000000000 --- a/libatomic_ops/README +++ /dev/null @@ -1,4 +0,0 @@ -From [https://github.com/ivmai/libatomic_ops/]. - -Note that some files (linked into libatomic_ops_gpl) are GPL'd, the portion -needed for Firebird (ibatomic_ops) is however MIT licensed. diff --git a/libatomic_ops/UnpackedTarball_libatomic_ops.mk b/libatomic_ops/UnpackedTarball_libatomic_ops.mk deleted file mode 100644 index 602c483f3efc..000000000000 --- a/libatomic_ops/UnpackedTarball_libatomic_ops.mk +++ /dev/null @@ -1,14 +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_UnpackedTarball_UnpackedTarball,libatomic_ops)) - -$(eval $(call gb_UnpackedTarball_set_tarball,libatomic_ops,$(LIBATOMIC_OPS_TARBALL))) - -# vim: set noet sw=4 ts=4: |