diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-17 19:38:07 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-18 06:52:15 +0000 |
| commit | 3c61695a8235eec183de1470c42ce5d112ddaa49 (patch) | |
| tree | a5c6588930e701ae7b4b16a0f8871c7815f34d11 | |
| parent | 86c32b4196d178955f6f9ef5254b6c6a1ee3c944 (diff) | |
fdo#70393: move expat to a subdir of external
Change-Id: I4735c3b10081ac62b4620ff5180f12c30b077627
Reviewed-on: https://gerrit.libreoffice.org/6300
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-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/expat/ExternalProject_expat.mk (renamed from expat/ExternalProject_expat.mk) | 0 | ||||
| -rw-r--r-- | external/expat/Makefile (renamed from expat/Makefile) | 0 | ||||
| -rw-r--r-- | external/expat/Module_expat.mk (renamed from expat/Module_expat.mk) | 4 | ||||
| -rw-r--r-- | external/expat/README (renamed from expat/README) | 0 | ||||
| -rw-r--r-- | external/expat/StaticLibrary_expat.mk (renamed from expat/StaticLibrary_expat.mk) | 0 | ||||
| -rw-r--r-- | external/expat/StaticLibrary_expat_x64.mk (renamed from expat/StaticLibrary_expat_x64.mk) | 0 | ||||
| -rw-r--r-- | external/expat/UnpackedTarball_expat.mk (renamed from expat/UnpackedTarball_expat.mk) | 2 | ||||
| -rw-r--r-- | external/expat/expat-2.1.0.patch (renamed from expat/expat-2.1.0.patch) | 0 | ||||
| -rw-r--r-- | external/expat/expat-winapi.patch (renamed from expat/expat-winapi.patch) | 0 |
11 files changed, 2 insertions, 6 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 1d1e3788ab03..5e7257bfb83f 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ embeddedobj \ embedserv \ eventattacher \ - $(call gb_Helper_optional,EXPAT,expat) \ extensions \ external \ extras \ diff --git a/external/Module_external.mk b/external/Module_external.mk index ec8e15b7598a..24c2b552a8bd 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,CT2N,ct2n) \ $(call gb_Helper_optional,CURL,curl) \ $(call gb_Helper_optional,EPM,epm) \ + $(call gb_Helper_optional,EXPAT,expat) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,LIBPNG,libpng) \ )) diff --git a/expat/ExternalProject_expat.mk b/external/expat/ExternalProject_expat.mk index 2fdaf5e1a4cb..2fdaf5e1a4cb 100644 --- a/expat/ExternalProject_expat.mk +++ b/external/expat/ExternalProject_expat.mk diff --git a/expat/Makefile b/external/expat/Makefile index ccb1c85a04da..ccb1c85a04da 100644 --- a/expat/Makefile +++ b/external/expat/Makefile diff --git a/expat/Module_expat.mk b/external/expat/Module_expat.mk index 990a2a3b497b..ab39cdaf8dc5 100644 --- a/expat/Module_expat.mk +++ b/external/expat/Module_expat.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Module_Module,expat)) -ifeq ($(SYSTEM_EXPAT),NO) - $(eval $(call gb_Module_add_targets,expat,\ UnpackedTarball_expat \ StaticLibrary_expat \ @@ -36,6 +34,4 @@ $(eval $(call gb_Module_add_targets,expat,\ )) endif -endif - # vim: set noet sw=4 ts=4: diff --git a/expat/README b/external/expat/README index 579d3d3d6bd5..579d3d3d6bd5 100644 --- a/expat/README +++ b/external/expat/README diff --git a/expat/StaticLibrary_expat.mk b/external/expat/StaticLibrary_expat.mk index 2f754526b6e9..2f754526b6e9 100644 --- a/expat/StaticLibrary_expat.mk +++ b/external/expat/StaticLibrary_expat.mk diff --git a/expat/StaticLibrary_expat_x64.mk b/external/expat/StaticLibrary_expat_x64.mk index a38ba28c80dd..a38ba28c80dd 100644 --- a/expat/StaticLibrary_expat_x64.mk +++ b/external/expat/StaticLibrary_expat_x64.mk diff --git a/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk index 660271aa8300..1ea97b584251 100644 --- a/expat/UnpackedTarball_expat.mk +++ b/external/expat/UnpackedTarball_expat.mk @@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,expat)) $(eval $(call gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,expat,\ - expat/expat-2.1.0.patch \ + external/expat/expat-2.1.0.patch \ )) # This is a bit hackish. diff --git a/expat/expat-2.1.0.patch b/external/expat/expat-2.1.0.patch index 070dafc0cb0c..070dafc0cb0c 100644 --- a/expat/expat-2.1.0.patch +++ b/external/expat/expat-2.1.0.patch diff --git a/expat/expat-winapi.patch b/external/expat/expat-winapi.patch index 070dafc0cb0c..070dafc0cb0c 100644 --- a/expat/expat-winapi.patch +++ b/external/expat/expat-winapi.patch |