diff options
| -rw-r--r-- | Module_tail_build.mk | 1 | ||||
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 9 | ||||
| -rw-r--r-- | solenv/gbuild/Module.mk | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 68a23db79cde..0469a4bb5abc 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -95,6 +95,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\ $(call gb_Helper_optional,ICU,icu) \ idl \ $(call gb_Helper_optional,DESKTOP,idlc) \ + instsetoo_native \ io \ javaunohelper \ $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 6f12965cce49..1135616ce542 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -28,7 +28,8 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \ $(SOLARENV)/bin/make_installer.pl \ - $(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) + $(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \ + $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%.sh: $(SRCDIR)/instsetoo_native/inc_openoffice/unix/find-requires-%.sh cat $< | tr -d "\015" > $@ @@ -37,7 +38,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-% ifneq ($(WITH_LANG),) $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \ $(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf | \ - $(call gb_Executable_get_runtime_dependencies,ulfex) + $(call gb_Executable_get_runtime_dependencies,ulfex) \ + $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_Output_announce,$@,$(true),SUM,1) MERGEINPUT=`$(gb_MKTEMP)` && \ echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/instsetoo_native/inc_openoffice/windows/msi_languages.po) > $${MERGEINPUT} && \ @@ -46,7 +48,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: rm -rf $${MERGEINPUT} else $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \ - $(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf + $(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf \ + $(call gb_Postprocess_get_target,AllModulesButInstsetNative) cp $< $@ endif diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index d20176a3db25..52c211321acb 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -154,6 +154,7 @@ gb_Module__debug_enabled = \ $(filter all $(1)/,$(ENABLE_DEBUGINFO_FOR))) define gb_Module_Module +$(if $(filter-out tail_build instsetoo_native,$(1)),$(call gb_Postprocess_get_target,AllModulesButInstsetNative) : $(call gb_Module_get_target,$(1))) gb_Module_ALLMODULES += $(1) gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword $(MAKEFILE_LIST)))) gb_Module_TARGETSTACK := $(call gb_Module_get_target,$(1)) $(gb_Module_TARGETSTACK) @@ -290,4 +291,8 @@ endif $$(eval $$(gb_Extensions_final_hook)) endef +$(call gb_Postprocess_get_target,AllModulesButInstsetNative) : + $(call gb_Output_announce,All modules but instset: $^,$(true),ALL) + $(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@) && touch $@) + # vim: set noet sw=4: |