[Libreoffice-commits] .: postprocess/packcomponents

Stephan Bergmann sbergmann at kemper.freedesktop.org
Thu Nov 3 07:15:16 PDT 2011


 postprocess/packcomponents/makefile.mk |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 2e68995221d45a296e8bee306a12e9a4f4a0cc91
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 3 15:15:05 2011 +0100

    Still missing conditionalization.

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 2de3f99..9d36059 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -368,10 +368,7 @@ my_components += component/avmedia/source/gstreamer/avmediagstreamer
 
 .INCLUDE: target.mk
 
-ALLTAR : \
-    $(MISC)/services.rdb \
-    $(MISC)/scriptproviderforbeanshell.rdb \
-    $(MISC)/scriptproviderforjavascript.rdb
+ALLTAR : $(MISC)/services.rdb
 
 $(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
         $(MISC)/services.input $(my_components:^"$(SOLARXMLDIR)/":+".component")
@@ -384,6 +381,8 @@ $(MISC)/services.input : makefile.mk
         > $@
 
 .IF "$(ENABLE_SCRIPTING_BEANSHELL)" == "YES"
+ALLTAR : $(MISC)/scriptproviderforbeanshell.rdb
+
 $(MISC)/scriptproviderforbeanshell.rdb .ERRREMOVE : \
         $(SOLARENV)/bin/packcomponents.xslt \
         $(MISC)/scriptproviderforbeanshell.input \
@@ -399,6 +398,8 @@ $(MISC)/scriptproviderforbeanshell.input : makefile.mk
 .END
 
 .IF "$(ENABLE_SCRIPTING_JAVASCRIPT)" == "YES"
+ALLTAR : $(MISC)/scriptproviderforjavascript.rdb
+
 $(MISC)/scriptproviderforjavascript.rdb .ERRREMOVE : \
         $(SOLARENV)/bin/packcomponents.xslt \
         $(MISC)/scriptproviderforjavascript.input \


More information about the Libreoffice-commits mailing list