diff options
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 10 | ||||
| -rw-r--r-- | solenv/gbuild/Pagein.mk | 24 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 3 |
3 files changed, 19 insertions, 18 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 9ce5fcfb56e2..7679da701a53 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -646,35 +646,35 @@ File gid_File_Txt_Pagein_Calc TXT_FILE_BODY; Dir = gid_Brand_Dir_Program; Styles = (PACKED); - Name = "pagein-calc"; + Name = "Pagein/pagein-calc"; End File gid_File_Txt_Pagein_Common TXT_FILE_BODY; Dir = gid_Brand_Dir_Program; Styles = (PACKED); - Name = "pagein-common"; + Name = "Pagein/pagein-common"; End File gid_File_Txt_Pagein_Draw TXT_FILE_BODY; Dir = gid_Brand_Dir_Program; Styles = (PACKED); - Name = "pagein-draw"; + Name = "Pagein/pagein-draw"; End File gid_File_Txt_Pagein_Impress TXT_FILE_BODY; Dir = gid_Brand_Dir_Program; Styles = (PACKED); - Name = "pagein-impress"; + Name = "Pagein/pagein-impress"; End File gid_File_Txt_Pagein_Writer TXT_FILE_BODY; Dir = gid_Brand_Dir_Program; Styles = (PACKED); - Name = "pagein-writer"; + Name = "Pagein/pagein-writer"; End #endif diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk index e0ce2424c5df..2d94f5513c60 100644 --- a/solenv/gbuild/Pagein.mk +++ b/solenv/gbuild/Pagein.mk @@ -18,6 +18,9 @@ gb_Pagein__make_library_path = $(call gb_Pagein__get_libdir,$(1))$(call gb_Libra gb_Pagein__make_path = \ $(if $(call gb_Pagein__is_library,$(1)),$(call gb_Pagein__make_library_path,$(1)),$(1)) +gb_Pagein__get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/pagein-$(1) +gb_Pagein__get_final_target = $(WORKDIR)/Pagein/pagein-$(1).final + define gb_Pagein__command $(call gb_Output_announce,$(2),$(true),PAG,5) $(call gb_Helper_abbreviate_dirs,\ @@ -31,24 +34,23 @@ endef $(call gb_Pagein_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),PAG,5) $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_Pagein_get_target,$*) $(call gb_Pagein_get_outdir_target,$*)) + rm -f $(call gb_Pagein__get_final_target,$*) $(call gb_Pagein_get_target,$*)) $(call gb_Pagein_get_target,%) : $(call gb_Pagein__command,$@,$*,$^) - -gb_Pagein_get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/pagein-$(1) + +$(call gb_Pagein__get_final_target,%) : + touch $@ define gb_Pagein_Pagein $(call gb_Pagein_get_target,$(1)) : OBJECTS := $(call gb_Pagein_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE) -$$(eval $$(call gb_Module_register_target,$(call gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_clean_target,$(1)))) -$(call gb_Helper_make_userfriendly_targets,$(1),Pagein,$(call gb_Pagein_get_outdir_target,$(1))) -$(call gb_Deliver_add_deliverable,$(call gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_target,$(1)),$(1)) -$(call gb_Pagein_get_outdir_target,$(1)) : $(call gb_Pagein_get_target,$(1)) -$(call gb_Pagein_get_outdir_target,$(1)) :| $(dir $(call gb_Pagein_get_outdir_target,$(1))).dir - -$(call gb_Helper_install,$(call gb_Pagein_get_outdir_target,$(1)), \ - $(call gb_Pagein_get_install_target,$(1)), \ +$(call gb_Pagein__get_final_target,$(1)) : $(call gb_Pagein_get_target,$(1)) +$$(eval $$(call gb_Module_register_target,$(call gb_Pagein__get_final_target,$(1)),$(call gb_Pagein_get_clean_target,$(1)))) +$(call gb_Helper_make_userfriendly_targets,$(1),Pagein,$(call gb_Pagein_get_target,$(1))) + +$(call gb_Helper_install,$(call gb_Pagein__get_final_target,$(1)), \ + $(call gb_Pagein__get_install_target,$(1)), \ $(call gb_Pagein_get_target,$(1))) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index ff23882c1550..007e730cee4e 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -22,7 +22,6 @@ gb_CliLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliLibrary_EXT) gb_CliNativeLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliNativeLibrary_EXT) gb_CliUnoApi_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliUnoApi_EXT) -gb_Pagein_get_outdir_target = $(OUTDIR)/bin/pagein-$(1) gb_PackagePart_get_destinations = \ $(INSTDIR) \ $(OUTDIR)/bin \ @@ -148,7 +147,7 @@ gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1) gb_Module_get_target = $(WORKDIR)/Module/$(1) gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o -gb_Pagein_get_target = $(WORKDIR)/Pagein/$(1) +gb_Pagein_get_target = $(WORKDIR)/Pagein/pagein-$(1) gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1) gb_Package_get_target = $(WORKDIR)/Package/$(1).filelist gb_Package_get_target_for_build = $(WORKDIR_FOR_BUILD)/Package/$(1).filelist |