summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2012-10-12 08:50:07 -0700
committerMichael Stahl <mstahl@redhat.com>2012-10-12 15:55:35 +0000
commit4781be1277dfb218b66fb787e5ec9a2ed7d9011d (patch)
treef3d6b9cafcb679341b1e379a518f82dbd7427adb
parenta8de7ee56a3c8375c585db364dac5f67d72ea97a (diff)
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@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk2
-rw-r--r--binfilter/bf_svtools/util/makefile.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk b/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk
index 4d3a3fb9c..affbbd67d 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 05488e398..fc1059c2b 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 \