Modified: openoffice/trunk/main/solenv/gbuild/LinkTarget.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/LinkTarget.mk?rev=1838757&r1=1838756&r2=1838757&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/LinkTarget.mk (original) +++ openoffice/trunk/main/solenv/gbuild/LinkTarget.mk Thu Aug 23 20:05:32 2018 @@ -533,6 +533,44 @@ endif endef +define gb_LinkTarget_add_private_api +$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ + $(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag) +$(call gb_LinkTarget_get_headers_target,$(1)) \ +$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) +ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) +endif + +$(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag): $(2) + $(call gb_Output_announce,$@,$(true),PVTIDL,2) + -$$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/urd) && \ + mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/rdb) && \ + mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) && \ + $$(gb_UnoApiTarget_IDLCCOMMAND) -I$$(OUTDIR)/idl -O $$(call gb_UnoPrivateApiTarget_get_target,$(1)/urd) \ + -verbose -cid -we $(2) && \ + $$(gb_UnoApiTarget_REGMERGECOMMAND) $$(call gb_UnoPrivateApiTarget_get_target,$(1)/rdb/registry.rdb) /UCR \ + $(patsubst %.idl,%.urd,$$(call gb_UnoPrivateApiTarget_get_target,$(1)/urd)/$(notdir $(2))) && \ + $(gb_UnoApiTarget_CPPUMAKERCOMMAND) \ + -O $$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) \ + -BUCR \ + -C \ + $$(call gb_UnoPrivateApiTarget_get_target,$(1)/rdb/registry.rdb) \ + $$(OUTDIR)/bin/udkapi.rdb && \ + touch $(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag)) + +$(call gb_LinkTarget_get_clean_target,$(1)) : + rm -rf $(call gb_UnoPrivateApiTarget_get_target,$(1)) + +endef + +# FIXME: multiple?? +define gb_LinkTarget_set_private_api +$(foreach api,$(2),$(call gb_LinkTarget_add_private_api,$(1),$(api))) + +endef + define gb_LinkTarget_add_libs $(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2) endef
Modified: openoffice/trunk/main/solenv/gbuild/TargetLocations.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/TargetLocations.mk?rev=1838757&r1=1838756&r2=1838757&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/TargetLocations.mk (original) +++ openoffice/trunk/main/solenv/gbuild/TargetLocations.mk Thu Aug 23 20:05:32 2018 @@ -72,6 +72,7 @@ gb_UnoApiTarget_get_target = $(WORKDIR)/ gb_UnoApiOutTarget_get_target = $(OUTDIR)/bin/$(1).rdb gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1) gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1) +gb_UnoPrivateApiTarget_get_target = $(WORKDIR)/UnoPrivateApi/$(1) gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1) gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1) gb_Module_get_target = $(WORKDIR)/Module/$(1)
