[Libreoffice-commits] core.git: registry/Module_registry.mk
registry/Module_registry.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit d4779887636fa9ab5b477f3436bcd3728a3e30ba Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Mar 14 09:01:45 2013 +0100 regmerge/regview seem to be part of ure, not odk Change-Id: I30ab642d5597153f1700bcf6e1b7647a736a347e diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk index 6aec72f..ed225c3 100644 --- a/registry/Module_registry.mk +++ b/registry/Module_registry.mk @@ -27,7 +27,10 @@ $(eval $(call gb_Module_Module,registry)) $(eval $(call gb_Module_add_targets,registry,\ + Executable_regmerge \ + Executable_regview \ Library_reg \ + StaticLibrary_registry_helper \ ZipPackage_registry_odk_headers \ )) @@ -36,9 +39,6 @@ ifneq (,$(if $(CROSS_COMPILING),,T)$(filter ODK,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,registry,\ Executable_regcompare \ - Executable_regmerge \ - Executable_regview \ - StaticLibrary_registry_helper \ )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: registry/Module_registry.mk
registry/Module_registry.mk |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit df8673367a46b78e5abb35d89559bbc3e64b05b4 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Mar 14 17:24:00 2013 +0100 do not build registry's executables for iOS Change-Id: Ided79f8993a2fb2c261de0fc8a50d5cbf96b9987 diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk index ed225c3..7806c2a 100644 --- a/registry/Module_registry.mk +++ b/registry/Module_registry.mk @@ -27,11 +27,13 @@ $(eval $(call gb_Module_Module,registry)) $(eval $(call gb_Module_add_targets,registry,\ - Executable_regmerge \ - Executable_regview \ Library_reg \ - StaticLibrary_registry_helper \ ZipPackage_registry_odk_headers \ + $(if $(filter-out $(OS),IOS), \ + Executable_regmerge \ + Executable_regview \ + StaticLibrary_registry_helper \ + ) \ )) # if not cross-compiling or we need this for ODK ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
