[Libreoffice-commits] core.git: 2 commits - solenv/gbuild svx/source

[David Tardon]

 solenv/gbuild/Package.mk     |    8 ++++++++
 svx/source/svdraw/svdobj.cxx |    2 --
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit aaff3ae833f1180a17b9738a7825a780bea64a79
Author: David Tardon <dtardon at redhat.com>
Date:   Sat May 25 10:28:24 2013 +0200

    i did not intend to commit this
    
    Change-Id: I4cecd0105156adeb65bf1d42c3b26f8ad669a52b

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 11032ad..98e3b9a 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -498,8 +498,6 @@ SdrObject::~SdrObject()
         delete mpViewContact;
         mpViewContact = 0L;
     }
-
-    mnLayerID = 59; // random value
 }
 
 void SdrObject::Free( SdrObject*& _rpObject )
commit dfc155edb15f632d5e036b260ff2b8bf56e78732
Author: David Tardon <dtardon at redhat.com>
Date:   Sat May 25 10:27:49 2013 +0200

    fix generated deps on headers in $(OUTDIR)/inc
    
    Change-Id: Id4d03f2d500e8fcec4b6ead5365eaffbd0ece19f

diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 63da386..7811ebe 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -44,6 +44,14 @@ endef
 $(foreach destination,$(call gb_PackagePart_get_destinations),$(eval \
   $(call gb_PackagePart__rule,$(destination))))
 
+# Dummy rule to force rebuild of files that depend on headers in
+# $(OUTDIR)/inc (thus the dep files will be rebuild too). Otherwise
+# incremental build will fail with 'No rule to make target ...'.
+#
+# This should be removed again after some time.
+$(OUTDIR)/inc/% :
+	@true
+
 # Deliver one file to the output dir.
 #
 # gb_PackagePart_PackagePart destfile source prep-target outdir