[Libreoffice-commits] core.git: external/jpeg external/Module_external.mk jpeg/configs jpeg/Makefile jpeg/Module_jpeg.mk jpeg/patches jpeg/README jpeg/StaticLibrary_jpeg.mk jpeg/UnpackedTarball_jpeg.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                     |    1 
 external/Module_external.mk                  |    1 
 external/jpeg/Makefile                       |    7 ++
 external/jpeg/Module_jpeg.mk                 |   21 ++++++++
 external/jpeg/README                         |    6 ++
 external/jpeg/StaticLibrary_jpeg.mk          |   70 +++++++++++++++++++++++++++
 external/jpeg/UnpackedTarball_jpeg.mk        |   20 +++++++
 external/jpeg/configs/jconfig.h              |   60 +++++++++++++++++++++++
 external/jpeg/patches/jpeg-8c-jmorecfg.patch |   29 +++++++++++
 jpeg/Makefile                                |    7 --
 jpeg/Module_jpeg.mk                          |   21 --------
 jpeg/README                                  |    6 --
 jpeg/StaticLibrary_jpeg.mk                   |   70 ---------------------------
 jpeg/UnpackedTarball_jpeg.mk                 |   20 -------
 jpeg/configs/jconfig.h                       |   60 -----------------------
 jpeg/patches/jpeg-8c-jmorecfg.patch          |   29 -----------
 16 files changed, 214 insertions(+), 214 deletions(-)

New commits:
commit e485e0ffb51ed11325a31fe77e84252be6c9fad9
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sun Nov 3 20:02:13 2013 +0200

    fdo#70393: move jpeg to a subdir of external
    
    Change-Id: I56be33efe0cc1deaf7a7e7ce6c6ea292dbe7786d
    Reviewed-on: https://gerrit.libreoffice.org/6543
    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 15468c5..090172e 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -65,7 +65,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	instsetoo_native \
 	io \
 	javaunohelper \
-	$(call gb_Helper_optional,JPEG,jpeg) \
 	jurt \
 	jvmaccess \
 	jvmfwk \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index feee429..089a632 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,HYPHEN,hyphen) \
 	$(call gb_Helper_optional,ICU,icu) \
 	$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
+	$(call gb_Helper_optional,JPEG,jpeg) \
 	$(call gb_Helper_optional,LCMS2,lcms2) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
diff --git a/jpeg/Makefile b/external/jpeg/Makefile
similarity index 71%
rename from jpeg/Makefile
rename to external/jpeg/Makefile
index ccb1c85..e4968cf 100644
--- a/jpeg/Makefile
+++ b/external/jpeg/Makefile
@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:
diff --git a/jpeg/Module_jpeg.mk b/external/jpeg/Module_jpeg.mk
similarity index 100%
rename from jpeg/Module_jpeg.mk
rename to external/jpeg/Module_jpeg.mk
diff --git a/jpeg/README b/external/jpeg/README
similarity index 100%
rename from jpeg/README
rename to external/jpeg/README
diff --git a/jpeg/StaticLibrary_jpeg.mk b/external/jpeg/StaticLibrary_jpeg.mk
similarity index 100%
rename from jpeg/StaticLibrary_jpeg.mk
rename to external/jpeg/StaticLibrary_jpeg.mk
diff --git a/jpeg/UnpackedTarball_jpeg.mk b/external/jpeg/UnpackedTarball_jpeg.mk
similarity index 78%
rename from jpeg/UnpackedTarball_jpeg.mk
rename to external/jpeg/UnpackedTarball_jpeg.mk
index d2bdfd6..dae63e2 100644
--- a/jpeg/UnpackedTarball_jpeg.mk
+++ b/external/jpeg/UnpackedTarball_jpeg.mk
@@ -11,10 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,jpeg))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,jpeg,$(JPEG_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_file,jpeg,jconfig.h,jpeg/configs/jconfig.h))
+$(eval $(call gb_UnpackedTarball_add_file,jpeg,jconfig.h,external/jpeg/configs/jconfig.h))
 
 $(eval $(call gb_UnpackedTarball_add_patches,jpeg,\
-    jpeg/patches/jpeg-8c-jmorecfg.patch \
+    external/jpeg/patches/jpeg-8c-jmorecfg.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/jpeg/configs/jconfig.h b/external/jpeg/configs/jconfig.h
similarity index 100%
rename from jpeg/configs/jconfig.h
rename to external/jpeg/configs/jconfig.h
diff --git a/jpeg/patches/jpeg-8c-jmorecfg.patch b/external/jpeg/patches/jpeg-8c-jmorecfg.patch
similarity index 100%
rename from jpeg/patches/jpeg-8c-jmorecfg.patch
rename to external/jpeg/patches/jpeg-8c-jmorecfg.patch