[Libreoffice-commits] .: binfilter/bf_svtools

[Libreoffice Gerrit user]

 binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk |    2 +-
 binfilter/bf_svtools/util/makefile.mk                   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4781be1277dfb218b66fb787e5ec9a2ed7d9011d
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Fri Oct 12 08:50:07 2012 -0700

    rename jpeg_filter to prevent the hiding of global jpeg library
    
    Change-Id: I7bef1a2976a8305f8ad7d9a086b3621e9f709e93
    Reviewed-on: https://gerrit.libreoffice.org/861
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk b/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk
index 4d3a3fb..affbbd6 100644
--- a/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk
+++ b/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk
@@ -19,7 +19,7 @@
 PRJ=..$/..$/..$/..
 
 PRJNAME=binfilter
-TARGET=jpeg
+TARGET=jpeg_filter
 
 # --- Settings -----------------------------------------------------------
 
diff --git a/binfilter/bf_svtools/util/makefile.mk b/binfilter/bf_svtools/util/makefile.mk
index 05488e3..fc1059c 100644
--- a/binfilter/bf_svtools/util/makefile.mk
+++ b/binfilter/bf_svtools/util/makefile.mk
@@ -41,7 +41,7 @@ LIB1FILES=	\
         $(SLB)$/unoiface.lib	\
         $(SLB)$/filter.lib		\
         $(SLB)$/igif.lib		\
-        $(SLB)$/jpeg.lib		\
+        $(SLB)$/jpeg_filter.lib		\
         $(SLB)$/ixpm.lib		\
         $(SLB)$/ixbm.lib		\
         $(SLB)$/numbers.lib 	\