[Libreoffice-commits] .: canvas/source vcl/unx

[Sebastian Spaeth]

 canvas/source/cairo/makefile.mk        |    4 ++--
 vcl/unx/source/fontmanager/makefile.mk |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6736962786ef8cd1cbd8e40c8dff16f98e9bb08d
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Fri Dec 10 14:59:37 2010 +0100

    Use FONTCONFIG_LIBS rather than -lfontconfig
    
    And add some spaces.

diff --git a/canvas/source/cairo/makefile.mk b/canvas/source/cairo/makefile.mk
index b0ff10f..5c0d237 100644
--- a/canvas/source/cairo/makefile.mk
+++ b/canvas/source/cairo/makefile.mk
@@ -98,8 +98,8 @@ CFLAGSCXX+=$(OBJCXXFLAGS)
 
 # Xlib
 SLOFILES+= $(SLO)$/cairo_xlib_cairo.obj
-SHL1STDLIBS+= -lfontconfig -lX11 -lXrender $(FREETYPE_LIBS)
-CFLAGS+=$(FREETYPE_CFLAGS)
+SHL1STDLIBS+= $(FONTCONFIG_LIBS) -lX11 -lXrender $(FREETYPE_LIBS)
+CFLAGS+= $(FREETYPE_CFLAGS)
 
 .ENDIF   # "$(GUIBASE)"=="aqua"
 
diff --git a/vcl/unx/source/fontmanager/makefile.mk b/vcl/unx/source/fontmanager/makefile.mk
index 980bc9f..1e2097f 100644
--- a/vcl/unx/source/fontmanager/makefile.mk
+++ b/vcl/unx/source/fontmanager/makefile.mk
@@ -42,8 +42,8 @@ INCDEPN+= -I..$/fontsubset
 CDEFS += -DENABLE_FONTCONFIG
 .ENDIF
 
-CFLAGS+=$(FREETYPE_CFLAGS)
-CFLAGS+=$(FONTCONFIG_CFLAGS)
+CFLAGS+= $(FREETYPE_CFLAGS)
+CFLAGS+= $(FONTCONFIG_CFLAGS)
 # --- Files --------------------------------------------------------
 
 .IF "$(GUIBASE)"=="aqua"