[Libreoffice-commits] .: Branch 'feature/gnumake4' - libcroco/makefile.mk

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Fri Jun 17 09:39:12 PDT 2011


 libcroco/makefile.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ccd0ec7be0ce4d6b251642bbb0659aa0269f7f87
Author: Michael Stahl <mst at openoffice.org>
Date:   Thu Apr 28 10:12:42 2011 +0000

    gnumake4: libcroco: use LIBXML_CFLAGS [hg:506ddad86d06]

diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk
index d5c84d5..8f80daf 100644
--- a/libcroco/makefile.mk
+++ b/libcroco/makefile.mk
@@ -58,9 +58,9 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                  LDFLAGS="-L$(SOLARLIBDIR)" \
                  GLIB2_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \
                  GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
-                 LIBXML2_CFLAGS=" " \
-                 LIBXML2_LIBS="-lxml2"
-                 
+                 LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
+                 LIBXML2_LIBS="$(LIBXML_LIBS)"
+
 CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
                 
 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \


More information about the Libreoffice-commits mailing list