[Libreoffice-commits] core.git: 2 commits - external/libpng external/Module_external.mk external/msc-externals external/Package_dbghelp.mk external/Package_msms.mk external/Package_msvc80_dlls.mk external/Package_msvc_dlls.mk

[Bjoern Michaelsen]

 external/Module_external.mk                    |    7 +------
 external/Package_dbghelp.mk                    |   14 --------------
 external/Package_msms.mk                       |   16 ----------------
 external/Package_msvc80_dlls.mk                |   16 ----------------
 external/Package_msvc_dlls.mk                  |   18 ------------------
 external/libpng/Module_libpng.mk               |    4 ----
 external/msc-externals/Module_msc-externals.mk |   19 +++++++++++++++++++
 external/msc-externals/Package_dbghelp.mk      |   14 ++++++++++++++
 external/msc-externals/Package_msms.mk         |   16 ++++++++++++++++
 external/msc-externals/Package_msvc80_dlls.mk  |   16 ++++++++++++++++
 external/msc-externals/Package_msvc_dlls.mk    |   18 ++++++++++++++++++
 11 files changed, 84 insertions(+), 74 deletions(-)

New commits:
commit b63029c8072c10c03b2fc36fe82619f0cff0ca18
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Oct 16 15:15:56 2013 +0200

    no need to double the conditional, once is enough
    
    - the whole module wont be loaded with --with-system-libpng because of the
      gb_Helper_optional thingie one level up
    
    Change-Id: I885fedf82bdbb383a3caee343422dc79528838e0
    Reviewed-on: https://gerrit.libreoffice.org/6266
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/external/libpng/Module_libpng.mk b/external/libpng/Module_libpng.mk
index d61375d..afb0016 100644
--- a/external/libpng/Module_libpng.mk
+++ b/external/libpng/Module_libpng.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,libpng))
 
-ifeq ($(SYSTEM_LIBPNG),NO)
-
 $(eval $(call gb_Module_add_targets,libpng,\
 	StaticLibrary_png \
 	UnpackedTarball_png \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
commit 29a5707821f9ec386d5f6b90f7838db9cdff1263
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Oct 16 15:12:54 2013 +0200

    move MSVC externals to subdir
    
    see http://nabble.documentfoundation.org/move-external-builds-into-subfolder-fdo-70393-td4078160.html for details
    
    Change-Id: I5ebf3a6162a8f977d1ddf0d445f076afd53332e4
    Reviewed-on: https://gerrit.libreoffice.org/6265
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/external/Module_external.mk b/external/Module_external.mk
index 99e49752..4f7ce0a 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -22,12 +22,7 @@ $(eval $(call gb_Module_add_targets,external,\
 endif
 
 ifeq ($(COM),MSC)
-$(eval $(call gb_Module_add_targets,external,\
-	Package_dbghelp \
-	$(if $(MSM_PATH),Package_msms) \
-	Package_msvc_dlls \
-	$(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \
-))
+$(eval $(call gb_Module_add_moduledir,external,msc-externals))
 endif
 
 ifeq ($(HAVE_READDIR_R),NO)
diff --git a/external/Package_msms.mk b/external/msc-externals/Module_msc-externals.mk
similarity index 55%
copy from external/Package_msms.mk
copy to external/msc-externals/Module_msc-externals.mk
index 283e113..1caa327 100644
--- a/external/Package_msms.mk
+++ b/external/msc-externals/Module_msc-externals.mk
@@ -7,10 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,msms,$(MSM_PATH)))
+$(eval $(call gb_Module_Module,msc-externals))
 
-$(eval $(call gb_Package_add_files,msms,bin,\
-	$(MERGE_MODULES) \
+$(eval $(call gb_Module_add_targets,msc-externals,\
+	Package_dbghelp \
+	$(if $(MSM_PATH),Package_msms) \
+	Package_msvc_dlls \
+	$(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \
 ))
 
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
+# vim: set noet sw=4 ts=4:
diff --git a/external/Package_dbghelp.mk b/external/msc-externals/Package_dbghelp.mk
similarity index 100%
rename from external/Package_dbghelp.mk
rename to external/msc-externals/Package_dbghelp.mk
diff --git a/external/Package_msms.mk b/external/msc-externals/Package_msms.mk
similarity index 100%
rename from external/Package_msms.mk
rename to external/msc-externals/Package_msms.mk
diff --git a/external/Package_msvc80_dlls.mk b/external/msc-externals/Package_msvc80_dlls.mk
similarity index 100%
rename from external/Package_msvc80_dlls.mk
rename to external/msc-externals/Package_msvc80_dlls.mk
diff --git a/external/Package_msvc_dlls.mk b/external/msc-externals/Package_msvc_dlls.mk
similarity index 100%
rename from external/Package_msvc_dlls.mk
rename to external/msc-externals/Package_msvc_dlls.mk