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 | |
| 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>
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/libatomic_ops/ExternalPackage_libatomic_ops.mk (renamed from libatomic_ops/ExternalPackage_libatomic_ops.mk) | 0 | ||||
| -rw-r--r-- | external/libatomic_ops/ExternalProject_libatomic_ops.mk (renamed from libatomic_ops/ExternalProject_libatomic_ops.mk) | 0 | ||||
| -rw-r--r-- | external/libatomic_ops/Makefile (renamed from libatomic_ops/Makefile) | 0 | ||||
| -rw-r--r-- | external/libatomic_ops/Module_libatomic_ops.mk (renamed from libatomic_ops/Module_libatomic_ops.mk) | 4 | ||||
| -rw-r--r-- | external/libatomic_ops/README (renamed from libatomic_ops/README) | 0 | ||||
| -rw-r--r-- | external/libatomic_ops/UnpackedTarball_libatomic_ops.mk (renamed from libatomic_ops/UnpackedTarball_libatomic_ops.mk) | 0 |
8 files changed, 1 insertions, 5 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 5e7257bfb83f..7b6cb0792b91 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 24c2b552a8bd..db245e5b0bfe 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 index a7615f6ca83b..a7615f6ca83b 100644 --- a/libatomic_ops/ExternalPackage_libatomic_ops.mk +++ b/external/libatomic_ops/ExternalPackage_libatomic_ops.mk diff --git a/libatomic_ops/ExternalProject_libatomic_ops.mk b/external/libatomic_ops/ExternalProject_libatomic_ops.mk index 06ec521c615d..06ec521c615d 100644 --- a/libatomic_ops/ExternalProject_libatomic_ops.mk +++ b/external/libatomic_ops/ExternalProject_libatomic_ops.mk diff --git a/libatomic_ops/Makefile b/external/libatomic_ops/Makefile index ccb1c85a04da..ccb1c85a04da 100644 --- a/libatomic_ops/Makefile +++ b/external/libatomic_ops/Makefile diff --git a/libatomic_ops/Module_libatomic_ops.mk b/external/libatomic_ops/Module_libatomic_ops.mk index dbbf39bcd2f1..7e1b5eef9626 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 index 61255d7c8e05..61255d7c8e05 100644 --- a/libatomic_ops/README +++ b/external/libatomic_ops/README diff --git a/libatomic_ops/UnpackedTarball_libatomic_ops.mk b/external/libatomic_ops/UnpackedTarball_libatomic_ops.mk index 602c483f3efc..602c483f3efc 100644 --- a/libatomic_ops/UnpackedTarball_libatomic_ops.mk +++ b/external/libatomic_ops/UnpackedTarball_libatomic_ops.mk |