[Libreoffice-commits] .: Branch 'libreoffice-3-4' - slideshow/source

Caolán McNamara caolan at kemper.freedesktop.org
Tue Nov 8 06:27:12 PST 2011


 slideshow/source/engine/OGLTrans/mac/makefile.mk |    8 ++++++++
 slideshow/source/engine/OGLTrans/unx/makefile.mk |    8 ++++++++
 slideshow/source/engine/OGLTrans/win/makefile.mk |    4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 4a1f6199251d3f09951a3c3573d60ba822fe1332
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 7 21:23:24 2011 +0100

    Fix build of ogltrans.component
    
    ...now that postprocess/packcomponents wants to use it.
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/slideshow/source/engine/OGLTrans/mac/makefile.mk b/slideshow/source/engine/OGLTrans/mac/makefile.mk
index aaaedb9..8f08080 100644
--- a/slideshow/source/engine/OGLTrans/mac/makefile.mk
+++ b/slideshow/source/engine/OGLTrans/mac/makefile.mk
@@ -85,3 +85,11 @@ DEF1EXPORTFILE=../exports.dxp
 # ==========================================================================
 
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/ogltrans.component
+
+$(MISC)/ogltrans.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ../ogltrans.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ../ogltrans.component
diff --git a/slideshow/source/engine/OGLTrans/unx/makefile.mk b/slideshow/source/engine/OGLTrans/unx/makefile.mk
index 31066e3..2b31ac7 100644
--- a/slideshow/source/engine/OGLTrans/unx/makefile.mk
+++ b/slideshow/source/engine/OGLTrans/unx/makefile.mk
@@ -71,3 +71,11 @@ DEF1EXPORTFILE=../exports.dxp
 # ==========================================================================
 
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/ogltrans.component
+
+$(MISC)/ogltrans.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ../ogltrans.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ../ogltrans.component
diff --git a/slideshow/source/engine/OGLTrans/win/makefile.mk b/slideshow/source/engine/OGLTrans/win/makefile.mk
index 7da3787..7f0ac88 100644
--- a/slideshow/source/engine/OGLTrans/win/makefile.mk
+++ b/slideshow/source/engine/OGLTrans/win/makefile.mk
@@ -74,7 +74,7 @@ DEF1EXPORTFILE=../exports.dxp
 ALLTAR : $(MISC)/ogltrans.component
 
 $(MISC)/ogltrans.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        ogltrans.component
+        ../ogltrans.component
     $(XSLTPROC) --nonet --stringparam uri \
         '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt ogltrans.component
+        $(SOLARENV)/bin/createcomponent.xslt ../ogltrans.component


More information about the Libreoffice-commits mailing list