[libreoffice] 03/05: Add REPORT_BUILDER_BUILD_DEPS to BUILD_DEPS_INDEP after it got finally set

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 4a6e4199c4e9c58215a2ff742dc6f9a7879f9caa
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Fri Jul 21 20:16:22 2017 +0200

    Add REPORT_BUILDER_BUILD_DEPS to BUILD_DEPS_INDEP after it got finally set
---
 rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules b/rules
index 24975a3..1feb7f2 100755
--- a/rules
+++ b/rules
@@ -1103,7 +1103,6 @@ export JAVA_HOME
     ifneq (,$(filter jfreereport, $(SYSTEM_STUFF)))
 	REPORT_BUILDER_BUILD_DEPS += , libbase-java$(OOO_NO_REPORTDESIGN_ARCHS), libsac-java$(OOO_NO_REPORTDESIGN_ARCHS), libxml-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libflute-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libpentaho-reporting-flow-engine-java (>= 0.9.4)$(OOO_NO_REPORTDESIGN_ARCHS), liblayout-java (>= 0.2.10)$(OOO_NO_REPORTDESIGN_ARCHS), libloader-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libformula-java (>= 1.1.7)$(OOO_NO_REPORTDESIGN_ARCHS), librepository-java (>= 1.1 [...]
 	REPORT_BUILDER_JAR_DEPENDS := , libbase-java, libsac-java, libxml-java (>= 1.1.6), libflute-java (>= 1.1.6), libpentaho-reporting-flow-engine-java (>= 0.9.4), liblayout-java (>= 0.2.10), libloader-java (>= 1.1.6), libformula-java (>= 1.1.7), librepository-java (>= 1.1.6), libfonts-java (>= 1.1.6), libserializer-java (>= 1.1.6)
-	BUILD_DEPS_INDEP += $(REPORT_BUILDER_BUILD_DEPS)
 	CONFIGURE_FLAGS += --with-libbase-jar=/usr/share/java/libbase.jar --with-libxml-jar=/usr/share/java/libxml.jar --with-flute-jar=/usr/share/java/flute.jar --with-jfreereport-jar=/usr/share/java/flow-engine.jar --with-liblayout-jar=/usr/share/java/liblayout.jar --with-libloader-jar=/usr/share/java/libloader.jar --with-libformula-jar=/usr/share/java/libformula.jar --with-librepository-jar=/usr/share/java/librepository.jar --with-libfonts-jar=/usr/share/java/libfonts.jar --with-libserialize [...]
     endif
     ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
@@ -1111,6 +1110,7 @@ export JAVA_HOME
 	REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
 	CONFIGURE_FLAGS_INDEP += --with-commons-logging-jar=/usr/share/java/commons-logging.jar
     endif
+	BUILD_DEPS_INDEP += $(REPORT_BUILDER_BUILD_DEPS)
   else
 	CONFIGURE_FLAGS += --disable-report-builder
   endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git