From 4781be1277dfb218b66fb787e5ec9a2ed7d9011d Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 12 Oct 2012 08:50:07 -0700 Subject: 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 Tested-by: Michael Stahl --- binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk | 2 +- binfilter/bf_svtools/util/makefile.mk | 2 +- 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 \ -- cgit v1.2.3