Makefile.in | 10 +-- RepositoryExternal.mk | 79 ++++++++++++-------------- RepositoryFixes.mk | 2 configure.ac | 2 external/firebird/ExternalProject_firebird.mk | 2 external/icu/ExternalPackage_icu.mk | 59 +++---------------- external/icu/ExternalProject_icu.mk | 5 - solenv/gbuild/platform/com_GCC_class.mk | 3 solenv/gbuild/platform/com_MSC_class.mk | 2 9 files changed, 65 insertions(+), 99 deletions(-)
New commits: commit d7ddb18d41c7f58a28ba428defb4632d99f0ab6a Author: Michael Stahl <mst...@redhat.com> Date: Wed Oct 23 15:20:35 2013 +0200 icu: apparently "icutu" library is only used by genbrk etc. tools Change-Id: I15a3cc3fcdca7d9c4f91e67a4517c9c3533efea7 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 7915893..6f1b306 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1153,10 +1153,6 @@ define gb_LinkTarget__use_icui18n $(call gb_LinkTarget_add_libs,$(1),-licui18n) endef -define gb_LinkTarget__use_icutu -$(call gb_LinkTarget_add_libs,$(1),-licutu) - -endef define gb_LinkTarget__use_icuuc $(call gb_LinkTarget_add_libs,$(1),-licuuc) @@ -1199,7 +1195,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) endif $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - icutu$(gb_ICU_suffix) \ icuuc$(gb_ICU_suffix) \ )) @@ -1233,21 +1228,6 @@ endif endef -define gb_LinkTarget__use_icutu -$(call gb_LinkTarget_use_package,$(1),icu) - -ifeq ($(OS),WNT) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,icu)/source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ -) -else -$(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib -licutu$(gb_ICU_suffix) \ -) -endif - -endef - define gb_LinkTarget__use_icuuc $(call gb_LinkTarget_use_package,$(1),icu) diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index db0a302..726ba42 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -71,7 +71,7 @@ endif endif ifeq ($(OS),WNT) -gb_Library_ICU_LIBRARIES := icudt icuuc icuin icutu +gb_Library_ICU_LIBRARIES := icudt icuuc icuin gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_ICU_LIBRARIES),$(lib):%),$(gb_Library_FILENAMES)) gb_Library_FILENAMES += $(foreach lib,$(gb_Library_ICU_LIBRARIES),$(lib):$(lib)$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll) gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES)) diff --git a/external/icu/ExternalPackage_icu.mk b/external/icu/ExternalPackage_icu.mk index 635e9d7..c5ff826 100644 --- a/external/icu/ExternalPackage_icu.mk +++ b/external/icu/ExternalPackage_icu.mk @@ -21,14 +21,12 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ source/lib/icudt$(ICU_MAJOR).dll \ source/lib/icuuc$(ICU_MAJOR).dll \ source/lib/icuin$(ICU_MAJOR).dll \ - source/lib/icutu$(ICU_MAJOR).dll \ )) else $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ - source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ )) endif # $(COM) @@ -38,7 +36,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,lib,\ source/lib/libicudatalo.so \ source/lib/libicuuclo.so \ source/lib/libicui18nlo.so \ - source/lib/libicutulo.so \ )) else # $(OS) != WNT/ANDROID @@ -46,7 +43,6 @@ else # $(OS) != WNT/ANDROID $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION))) endif # $(OS) endif # DISABLE_DYNLOADING diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index 52cac49..f348718 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : --with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source) \ --disable-layout --disable-static --enable-shared --disable-samples \ && $(MAKE) \ - && for lib in icudata icuin icuuc icutu; do \ + && for lib in icudata icuin icuuc; do \ touch $$lib; \ done \ ,source) @@ -90,8 +90,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ $(gb_Package_SOURCEDIR_icu)/source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION) \ $(gb_Package_SOURCEDIR_icu)/source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION) \ - $(gb_Package_SOURCEDIR_icu)/source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION) \ - $(gb_Package_SOURCEDIR_icu)/source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)) \ + $(gb_Package_SOURCEDIR_icu)/source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)) \ ,source) endif commit e353b2bcc26b8f6c12a916dcd67587ea89f3db55 Author: Michael Stahl <mst...@redhat.com> Date: Wed Oct 23 15:19:14 2013 +0200 icu: use executables from WORKDIR Change-Id: I74b9d1dbcb3e8f7f2cc092dad60266cf60475367 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 639d22a..7915893 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3145,7 +3145,8 @@ endef else # ! SYSTEM_GENBRK define gb_ExternalExecutable__register_genbrk -$(call gb_ExternalExecutable_set_internal,genbrk,$(OUTDIR_FOR_BUILD)/bin/genbrk$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_internal,genbrk,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genbrk$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_precommand,genbrk,$(gb_ICU_PRECOMMAND)) $(call gb_ExternalExecutable_add_dependencies,genbrk,\ $(call gb_Package_get_target_for_build,icu) \ ) @@ -3164,7 +3165,8 @@ endef else # ! SYSTEM_GENCCODE define gb_ExternalExecutable__register_genccode -$(call gb_ExternalExecutable_set_internal,genccode,$(OUTDIR_FOR_BUILD)/bin/genccode$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_internal,genccode,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genccode$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_precommand,genccode,$(gb_ICU_PRECOMMAND)) $(call gb_ExternalExecutable_add_dependencies,genccode,\ $(call gb_Package_get_target_for_build,icu) \ ) @@ -3183,7 +3185,8 @@ endef else # ! SYSTEM_GENCMN define gb_ExternalExecutable__register_gencmn -$(call gb_ExternalExecutable_set_internal,gencmn,$(OUTDIR_FOR_BUILD)/bin/gencmn$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_internal,gencmn,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/gencmn$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_precommand,gencmn,$(gb_ICU_PRECOMMAND)) $(call gb_ExternalExecutable_add_dependencies,gencmn,\ $(call gb_Package_get_target_for_build,icu) \ ) diff --git a/external/icu/ExternalPackage_icu.mk b/external/icu/ExternalPackage_icu.mk index baf38c7..635e9d7 100644 --- a/external/icu/ExternalPackage_icu.mk +++ b/external/icu/ExternalPackage_icu.mk @@ -23,11 +23,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ source/lib/icuin$(ICU_MAJOR).dll \ source/lib/icutu$(ICU_MAJOR).dll \ )) -$(eval $(call gb_ExternalPackage_add_files,icu,bin,\ - source/bin/genccode.exe \ - source/bin/genbrk.exe \ - source/bin/gencmn.exe \ -)) else $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ @@ -35,11 +30,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ )) -$(eval $(call gb_ExternalPackage_add_files,icu,bin,\ - source/bin/genccode.exe \ - source/bin/genbrk.exe \ - source/bin/gencmn.exe \ -)) endif # $(COM) else ifeq ($(OS),ANDROID) @@ -58,12 +48,6 @@ $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicuuc$(gb_Li $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION))) -$(eval $(call gb_ExternalPackage_add_files,icu,bin,\ - source/bin/genccode \ - source/bin/genbrk \ - source/bin/gencmn \ -)) - endif # $(OS) endif # DISABLE_DYNLOADING diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 1bb16ba..88542e1 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -228,4 +228,7 @@ gb_LinkTarget_get_linksearchpath_for_layer = \ $(patsubst $(layer):%,-L%,\ $(filter $(layer):%,$(gb_Library_LAYER_DIRS)))) + +gb_ICU_PRECOMMAND := $(call gb_Helper_extend_ld_path,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib) + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 2648591..8e00102 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -572,4 +572,6 @@ gb_UIMenubarTarget_UIMenubarTarget_platform := gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program);$(shell cygpath -w $(OUTDIR)/bin)" PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program" gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_BIN_FOLDER)/python.exe +gb_ICU_PRECOMMAND := PATH="$(shell cygpath -w $(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib)" + # vim: set noet sw=4: commit a92f80fdca36976ecfaed84eaf29b14f5503603a Author: Michael Stahl <mst...@redhat.com> Date: Wed Oct 23 15:00:29 2013 +0200 icu: use libraries from WORKDIR Change-Id: I7d996cc9412eadf89c8d04ee29abe1fa6f7d53db diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 764f988..639d22a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1192,60 +1192,74 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icudt \ icuin \ )) - -define gb_LinkTarget__use_icudata -$(call gb_LinkTarget_use_package,$(1),icu) -$(call gb_LinkTarget_use_libraries,$(1),\ - icudt \ -) - -endef -define gb_LinkTarget__use_icui18n -$(call gb_LinkTarget_use_package,$(1),icu) -$(call gb_LinkTarget_use_libraries,$(1),\ - icuin \ -) - -endef else $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icudata$(gb_ICU_suffix) \ icui18n$(gb_ICU_suffix) \ )) +endif +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + icutu$(gb_ICU_suffix) \ + icuuc$(gb_ICU_suffix) \ +)) define gb_LinkTarget__use_icudata $(call gb_LinkTarget_use_package,$(1),icu) -$(call gb_LinkTarget_use_libraries,$(1),\ - icudata$(gb_ICU_suffix) \ + +ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,icu)/source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib -licudata$(gb_ICU_suffix) \ ) +endif endef + define gb_LinkTarget__use_icui18n $(call gb_LinkTarget_use_package,$(1),icu) -$(call gb_LinkTarget_use_libraries,$(1),\ - icui18n$(gb_ICU_suffix) \ -) -endef +ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,icu)/source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib -licui18n$(gb_ICU_suffix) \ +) endif -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - icutu$(gb_ICU_suffix) \ - icuuc$(gb_ICU_suffix) \ -)) +endef define gb_LinkTarget__use_icutu $(call gb_LinkTarget_use_package,$(1),icu) -$(call gb_LinkTarget_use_libraries,$(1),\ - icutu$(gb_ICU_suffix) \ + +ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,icu)/source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib -licutu$(gb_ICU_suffix) \ ) +endif endef + define gb_LinkTarget__use_icuuc $(call gb_LinkTarget_use_package,$(1),icu) -$(call gb_LinkTarget_use_libraries,$(1),\ - icuuc$(gb_ICU_suffix) \ + +ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,icu)/source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ ) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib -licuuc$(gb_ICU_suffix) \ +) +endif endef diff --git a/configure.ac b/configure.ac index 3f3d809..0bacf50 100644 --- a/configure.ac +++ b/configure.ac @@ -9029,7 +9029,7 @@ else # external libs): the system icu-config is quite unhelpful and spits out # dozens of weird flags and also default path -I/usr/include ICU_CFLAGS="-I${WORKDIR}/UnpackedTarball/icu/source/i18n -I${WORKDIR}/UnpackedTarball/icu/source/common" - ICU_LIBS="" + ICU_LIBS="-L${WORKDIR}/UnpackedTarball/icu/source/lib" fi AC_SUBST(SYSTEM_ICU) AC_SUBST(SYSTEM_GENBRK) diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index bf6b453..7001c23 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ ,$(ICU_CPPFLAGS)) \ - -L$(OUTDIR)/lib \ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ " \ && ./configure \ --without-editline \ diff --git a/external/icu/ExternalPackage_icu.mk b/external/icu/ExternalPackage_icu.mk index 4af02f5..baf38c7 100644 --- a/external/icu/ExternalPackage_icu.mk +++ b/external/icu/ExternalPackage_icu.mk @@ -12,13 +12,11 @@ icu_VERSION := $(ICU_MAJOR).$(ICU_MINOR)$(if $(ICU_MICRO),.$(ICU_MICRO)) $(eval $(call gb_ExternalPackage_ExternalPackage,icu,icu)) $(eval $(call gb_ExternalPackage_use_external_project,icu,icu)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),WNT) -ifeq ($(COM),GCC) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata.dll.a,source/stubdata/icudt.lib)) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc.dll.a,source/lib/icuuc.lib)) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n.dll.a,source/lib/icuin.lib)) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu.dll.a,source/lib/icutu.lib)) +ifeq ($(COM),GCC) $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ source/lib/icudt$(ICU_MAJOR).dll \ source/lib/icuuc$(ICU_MAJOR).dll \ @@ -30,14 +28,7 @@ $(eval $(call gb_ExternalPackage_add_files,icu,bin,\ source/bin/genbrk.exe \ source/bin/gencmn.exe \ )) - else -$(eval $(call gb_ExternalPackage_add_files,icu,lib,\ - source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ - source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ - source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ - source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib\ -)) $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ @@ -49,37 +40,31 @@ $(eval $(call gb_ExternalPackage_add_files,icu,bin,\ source/bin/genbrk.exe \ source/bin/gencmn.exe \ )) -endif -else # $(OS) -ifeq ($(DISABLE_DYNLOADING),TRUE) -$(eval $(call gb_ExternalPackage_add_files,icu,lib,\ - source/lib/libicudata.a \ - source/lib/libicuuc.a \ - source/lib/libicui18n.a \ - source/lib/libicutu.a \ -)) +endif # $(COM) + else ifeq ($(OS),ANDROID) + $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,lib,\ source/lib/libicudatalo.so \ source/lib/libicuuclo.so \ source/lib/libicui18nlo.so \ source/lib/libicutulo.so \ )) -else + +else # $(OS) != WNT/ANDROID + $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata$(gb_Library_DLLEXT),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc$(gb_Library_DLLEXT),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n$(gb_Library_DLLEXT),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_files,icu,bin,\ source/bin/genccode \ source/bin/genbrk \ source/bin/gencmn \ )) -endif -endif + +endif # $(OS) +endif # DISABLE_DYNLOADING + # vim: set noet sw=4 ts=4: commit dddff6e51dd8dd755f9afabccda4ee91e1ecc78e Author: Michael Stahl <mst...@redhat.com> Date: Wed Oct 23 16:33:50 2013 +0200 Makefile: make convenience targets like "make icu" work for external/ Change-Id: I6cf2e6bd1c52412339ec6bab98b3f1b28cef1032 diff --git a/Makefile.in b/Makefile.in index 7e64637..47f507a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -77,13 +77,13 @@ define gbuild_module_rules .PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).showdeliverables $(1).subsequentcheck $(1): bootstrap fetch - cd $(SRCDIR)/$(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) + cd $(SRCDIR)/$(2) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $(1).build $(1).check $(1).clean $(1).showdeliverables: - cd $(SRCDIR)/$(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) + cd $(SRCDIR)/$(2) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) $(1).subsequentcheck: - cd $(SRCDIR)/$(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck + cd $(SRCDIR)/$(2) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck $(1).all: bootstrap fetch $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if $(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1)) @@ -91,10 +91,10 @@ $(1).all: bootstrap fetch endef define gbuild_modules_rules -$(foreach m,$(1),$(call gbuild_module_rules,$(m))) +$(foreach m,$(1),$(call gbuild_module_rules,$(notdir $(m)),$(m))) endef -gbuild_modules := $(filter-out Module%,$(subst /, ,$(subst $(SRCDIR)/,,$(wildcard $(SRCDIR)/*/Module_*.mk)))) +gbuild_modules := $(patsubst $(SRCDIR)/%/,%,$(dir $(wildcard $(SRCDIR)/*/Module_*.mk $(SRCDIR)/external/*/Module_*.mk))) $(eval $(call gbuild_modules_rules,$(gbuild_modules))) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits