diff options
| author | David Tardon <dtardon@redhat.com> | 2012-05-17 07:38:11 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-17 07:57:59 +0200 |
| commit | 06c8ad5197d1e2c7a418a7a5b48bc1ad20ce1754 (patch) | |
| tree | aea0d4d664ea71f319f75ad2c797e04980344e54 /solenv | |
| parent | remove duplicated dependency (diff) | |
| download | core-06c8ad5197d1e2c7a418a7a5b48bc1ad20ce1754.tar.gz core-06c8ad5197d1e2c7a418a7a5b48bc1ad20ce1754.zip | |
Revert "fix spurious re-delivery of RDB files:"
This reverts commit 07c0b800d9d70857882238204820f75b8dc98b26.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/UnoApi.mk | 8 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 41bfc9f82173..9ecf1edd90e3 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -30,14 +30,6 @@ $(call gb_UnoApi_get_clean_target,%) : $(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_UnoApi_get_target,$*)) -# override the rule from Package.mk:44: -# preserving timestamps is not desirable here, because the OUTDIR target -# depends on package targets _inc and _idl, and those depend on the WORKDIR -# target, so with timestamps preserved the RDB always gets delivered again -$(call gb_UnoApi_get_target,%) : $(call gb_UnoApiTarget_get_target,%) - $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --no-dereference --force $< $@ - - define gb_UnoApi_UnoApi $(call gb_UnoApiTarget_UnoApiTarget,$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b570cecfe4cc..8d35ab3d6c86 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -285,7 +285,6 @@ include $(SOLARENV)/inc/minor.mk # For example: # $(OUTDIR)/bin/% for executables collides # with $(OUTDIR)/bin/%.res for resources on unix -# with $(OUTDIR)/bin/%.rdb for UnoApi # $(OUTDIR)/lib/%.lib collides # on windows (static and dynamic libs) # $(OUTDIR)/xml/% for packageparts collides @@ -304,7 +303,6 @@ include $(foreach class, \ StaticLibrary \ Executable \ SdiTarget \ - UnoApi \ Package \ CustomTarget \ ExternalLib \ @@ -317,6 +315,7 @@ include $(foreach class, \ JunitTest \ Module \ UnoApiTarget \ + UnoApi \ UnoApiMerge \ InternalUnoApi \ Zip \ |