[Libreoffice-commits] core.git: expat/expat-2.1.0.patch expat/expat-winapi.patch expat/ExternalProject_expat.mk expat/Makefile expat/Module_expat.mk expat/README expat/StaticLibrary_expat.mk expat/StaticLibrary_expat_x64.mk expat/UnpackedTarball_expat.mk external/expat external/Module_external.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                  |    1 
 expat/ExternalProject_expat.mk            |   22 -----------
 expat/Makefile                            |    7 ---
 expat/Module_expat.mk                     |   41 ---------------------
 expat/README                              |    4 --
 expat/StaticLibrary_expat.mk              |   56 ------------------------------
 expat/StaticLibrary_expat_x64.mk          |   33 -----------------
 expat/UnpackedTarball_expat.mk            |   32 -----------------
 expat/expat-2.1.0.patch                   |   13 ------
 expat/expat-winapi.patch                  |   13 ------
 external/Module_external.mk               |    1 
 external/expat/ExternalProject_expat.mk   |   22 +++++++++++
 external/expat/Makefile                   |    7 +++
 external/expat/Module_expat.mk            |   37 +++++++++++++++++++
 external/expat/README                     |    4 ++
 external/expat/StaticLibrary_expat.mk     |   56 ++++++++++++++++++++++++++++++
 external/expat/StaticLibrary_expat_x64.mk |   33 +++++++++++++++++
 external/expat/UnpackedTarball_expat.mk   |   32 +++++++++++++++++
 external/expat/expat-2.1.0.patch          |   13 ++++++
 external/expat/expat-winapi.patch         |   13 ++++++
 20 files changed, 218 insertions(+), 222 deletions(-)

New commits:
commit 3c61695a8235eec183de1470c42ce5d112ddaa49
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu Oct 17 19:38:07 2013 +0200

    fdo#70393: move expat to a subdir of external
    
    Change-Id: I4735c3b10081ac62b4620ff5180f12c30b077627
    Reviewed-on: https://gerrit.libreoffice.org/6300
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 1d1e378..5e7257b 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 ec8e15b..24c2b55 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
similarity index 100%
rename from expat/ExternalProject_expat.mk
rename to external/expat/ExternalProject_expat.mk
diff --git a/expat/Makefile b/external/expat/Makefile
similarity index 100%
rename from expat/Makefile
rename to external/expat/Makefile
diff --git a/expat/Module_expat.mk b/external/expat/Module_expat.mk
similarity index 96%
rename from expat/Module_expat.mk
rename to external/expat/Module_expat.mk
index 990a2a3..ab39cda 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
similarity index 100%
rename from expat/README
rename to external/expat/README
diff --git a/expat/StaticLibrary_expat.mk b/external/expat/StaticLibrary_expat.mk
similarity index 100%
rename from expat/StaticLibrary_expat.mk
rename to external/expat/StaticLibrary_expat.mk
diff --git a/expat/StaticLibrary_expat_x64.mk b/external/expat/StaticLibrary_expat_x64.mk
similarity index 100%
rename from expat/StaticLibrary_expat_x64.mk
rename to external/expat/StaticLibrary_expat_x64.mk
diff --git a/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk
similarity index 96%
rename from expat/UnpackedTarball_expat.mk
rename to external/expat/UnpackedTarball_expat.mk
index 660271a..1ea97b5 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
similarity index 100%
rename from expat/expat-2.1.0.patch
rename to external/expat/expat-2.1.0.patch
diff --git a/expat/expat-winapi.patch b/external/expat/expat-winapi.patch
similarity index 100%
rename from expat/expat-winapi.patch
rename to external/expat/expat-winapi.patch