summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2013-12-14 11:17:30 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2013-12-17 06:26:29 +0000
commit85d1e39d742d7798369b0071f9a5de5f62810d39 (patch)
tree2cefa2cedd017918c31c3a132c5026e0e69e1428 /odk
parent42aec34a5d83d863e050da85f88b31417c44b698 (diff)
gbuild: Fix and check package dependencies.
Change-Id: Ia54def7a404e07974eb1e8a556f4659cd974e7f8 Reviewed-on: https://gerrit.libreoffice.org/7081 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Diffstat (limited to 'odk')
-rw-r--r--odk/CustomTarget_check.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 88af63aeac9b..295f353d5dc6 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -32,17 +32,13 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(call gb_Executable_get_target,$(exe))) \
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \
$(call gb_Package_get_target,odk_config) \
- $(if $(filter WNT,$(OS)),\
- $(call gb_Package_get_target,odk_config_win),\
- $(call gb_Package_get_target,odk_config_notwin) \
- ) \
+ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
$(call gb_Package_get_target,odk_docs) \
$(call gb_Package_get_target,odk_html) \
$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_javadoc)) \
$(call gb_Package_get_target,odk_lib) \
$(call gb_Package_get_target,odk_settings) \
$(call gb_Package_get_target,odk_settings_generated) \
- $(call gb_Package_get_target,odk_uno_loader_classes) \
$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
$(call gb_Helper_print_on_error,\