diff options
| author | David Tardon <dtardon@redhat.com> | 2012-01-29 15:33:16 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-01-29 15:40:30 +0100 |
| commit | 7b2331fef6518817934c2582a9ffa0bf55057a0f (patch) | |
| tree | e8038e46982831a31120bf6737243916315591ef /solenv | |
| parent | split rdb generation out of UnoApiTarget (diff) | |
| download | core-7b2331fef6518817934c2582a9ffa0bf55057a0f.tar.gz core-7b2331fef6518817934c2582a9ffa0bf55057a0f.zip | |
simplify UnoApiTarget's targets
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/UnoApiTarget.mk | 17 |
2 files changed, 7 insertions, 13 deletions
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index c5c7d8635975..3bce08d293d9 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -47,6 +47,7 @@ gb_Rdb_get_outdir_target = $(OUTDIR)/xml/$(1).rdb gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res gb_TypesRdb_get_outdir_target = $(OUTDIR)/rdb/$(1).rdb +gb_UnoApiTarget_get_outdir_target = $(OUTDIR)/bin/$(1).rdb gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip # outdir targets: $(1) is path @@ -120,7 +121,6 @@ gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/inc/$(firstword $(subst /, ,$(1 gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1) gb_TypesRdb_get_target = $(WORKDIR)/TypesRdb/$(1).rdb gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).done -gb_UnoApiOutTarget_get_target = $(OUTDIR)/bin/$(1).rdb gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1) gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1) gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX) @@ -195,7 +195,6 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\ Executable \ Library \ StaticLibrary \ - UnoApiOutTarget \ )) $(eval $(call gb_Helper_make_dep_targets,\ diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 8d8ed4703901..0747655360d8 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -35,7 +35,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDI gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview$(gb_Executable_EXT_for_build) gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET) -$(call gb_UnoApiOutTarget_get_target,%) : +$(call gb_UnoApiTarget_get_outdir_target,%) : $(call gb_Deliver_deliver,$(call gb_TypesRdb_get_target,$*),$@) define gb_UnoApiTarget_autopackage_inc @@ -56,10 +56,9 @@ endef define gb_UnoApiTarget_UnoApiTarget $(call gb_TypesRdb_TypesRdb,$(1)) -$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiOutTarget_get_target,$(1)),$(call gb_UnoApiOutTarget_get_clean_target,$(1)))) -$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) -$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_TypesRdb_get_outdir_target,$(1)) -$(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) +$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiTarget_get_outdir_target,$(1)),$(call gb_UnoApiTarget_get_clean_target,$(1)))) +$(call gb_UnoApiTarget_get_outdir_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) +$(call gb_UnoApiTarget_get_outdir_target,$(1)) : $(call gb_TypesRdb_get_outdir_target,$(1)) $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_TypesRdb_get_target,$(1)) $(call gb_UnoApiTarget_get_clean_target,$(1)) : $(call gb_TypesRdb_get_clean_target,$(1)) $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := @@ -177,16 +176,12 @@ $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := $(2) endef -.PHONY : $(call gb_UnoApiOutTarget_get_clean_target,%) -$(call gb_UnoApiOutTarget_get_clean_target,%) : - -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_UnoApiOutTarget_get_target,$*)) - .PHONY : $(call gb_UnoApiTarget_get_clean_target,%) $(call gb_UnoApiTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),UNO,2) -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_UnoApiTarget_get_target,$*)) + rm -f $(call gb_UnoApiTarget_get_target,$*) \ + $(call gb_UnoApiTarget_get_outdir_target,$*)) -rm -rf $(call gb_UnoApiTarget_get_header_target,$*)\ $(call gb_UnoApiTarget_get_dep_target,$*) \ $(basename $(call gb_UnoApiPartTarget_get_dep_target,$*)) \ |