[Libreoffice-commits] .: Branch 'integration/dev300_m101' - avmedia/source

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Tue Mar 15 19:28:51 PDT 2011


 avmedia/source/gstreamer/makefile.mk |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit d55bd63572888a5687a0d5fb4d50be12a0dded66
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Mar 15 21:28:44 2011 -0500

    avmedia/gstreamer .mk must include target.mk even if it has nothing to do

diff --git a/avmedia/source/gstreamer/makefile.mk b/avmedia/source/gstreamer/makefile.mk
index 2f3a7e9..692a63a 100755
--- a/avmedia/source/gstreamer/makefile.mk
+++ b/avmedia/source/gstreamer/makefile.mk
@@ -71,13 +71,18 @@ DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp
 
 .ENDIF # UNX / WNT
+.ENDIF # ENABLE_GSTREAMER
 
 .INCLUDE :  	target.mk
 
+.IF "$(ENABLE_GSTREAMER)" == "TRUE"
+.IF "$(GUI)" == "UNX" || "$(GUI)" == "WNT"
+
 ALLTAR : $(MISC)/avmediagstreamer.component
 $(MISC)/avmediagstreamer.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt avmediagstreamer.component
     $(XSLTPROC) --nonet \
 	--stringparam uri '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' \
 	-o $@ $(SOLARENV)/bin/createcomponent.xslt avmediagstreamer.component
 
+.ENDIF # UNX / WNT
 .ENDIF # ENABLE_GSTREAMER


More information about the Libreoffice-commits mailing list