RepositoryModule_host.mk | 1
external/Module_external.mk | 1
external/libatomic_ops/ExternalPackage_libatomic_ops.mk | 20 ++++++++++++
external/libatomic_ops/ExternalProject_libatomic_ops.mk | 26 ++++++++++++++++
external/libatomic_ops/Makefile | 7 ++++
external/libatomic_ops/Module_libatomic_ops.mk | 18 +++++++++++
external/libatomic_ops/README | 4 ++
external/libatomic_ops/UnpackedTarball_libatomic_ops.mk | 14 ++++++++
libatomic_ops/ExternalPackage_libatomic_ops.mk | 20 ------------
libatomic_ops/ExternalProject_libatomic_ops.mk | 26 ----------------
libatomic_ops/Makefile | 7 ----
libatomic_ops/Module_libatomic_ops.mk | 22 -------------
libatomic_ops/README | 4 --
libatomic_ops/UnpackedTarball_libatomic_ops.mk | 14 --------
14 files changed, 90 insertions(+), 94 deletions(-)
New commits:
commit 1a6264aa1230239006296247c5b6f098b80b6455
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Thu Oct 17 19:40:24 2013 +0200
fdo#70393: move libatomic_ops to a subdir of external
Change-Id: Ic79dddea1e366019f5a1d919ad0b9568b4d8cdf7
Reviewed-on: https://gerrit.libreoffice.org/6301
Tested-by: David Tardon <dtar...@redhat.com>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 5e7257b..7b6cb07 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
extras \
fileaccess \
filter \
- $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
$(call gb_Helper_optional,FIREBIRD,firebird) \
$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
$(call gb_Helper_optional,DBCONNECTIVITY,forms) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 24c2b55..db245e5 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,EPM,epm) \
$(call gb_Helper_optional,EXPAT,expat) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
+ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
$(call gb_Helper_optional,LIBPNG,libpng) \
))
diff --git a/libatomic_ops/ExternalPackage_libatomic_ops.mk
b/external/libatomic_ops/ExternalPackage_libatomic_ops.mk
similarity index 100%
rename from libatomic_ops/ExternalPackage_libatomic_ops.mk
rename to external/libatomic_ops/ExternalPackage_libatomic_ops.mk
diff --git a/libatomic_ops/ExternalProject_libatomic_ops.mk
b/external/libatomic_ops/ExternalProject_libatomic_ops.mk
similarity index 100%
rename from libatomic_ops/ExternalProject_libatomic_ops.mk
rename to external/libatomic_ops/ExternalProject_libatomic_ops.mk
diff --git a/libatomic_ops/Makefile b/external/libatomic_ops/Makefile
similarity index 100%
rename from libatomic_ops/Makefile
rename to external/libatomic_ops/Makefile
diff --git a/libatomic_ops/Module_libatomic_ops.mk
b/external/libatomic_ops/Module_libatomic_ops.mk
similarity index 93%
rename from libatomic_ops/Module_libatomic_ops.mk
rename to external/libatomic_ops/Module_libatomic_ops.mk
index dbbf39b..7e1b5ee 100644
--- a/libatomic_ops/Module_libatomic_ops.mk
+++ b/external/libatomic_ops/Module_libatomic_ops.mk
@@ -9,14 +9,10 @@
$(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/external/libatomic_ops/README
similarity index 100%
rename from libatomic_ops/README
rename to external/libatomic_ops/README
diff --git a/libatomic_ops/UnpackedTarball_libatomic_ops.mk
b/external/libatomic_ops/UnpackedTarball_libatomic_ops.mk
similarity index 100%
rename from libatomic_ops/UnpackedTarball_libatomic_ops.mk
rename to external/libatomic_ops/UnpackedTarball_libatomic_ops.mk
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
