[Libreoffice-commits] .: libcroco/makefile.mk

[Christian Lohmaier]

 libcroco/makefile.mk |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit e220ed4890a84df655ff7a663e29396658478233
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Jun 3 18:51:55 2011 +0200

    configure exists for a reason. Don't redefine the stuff in random makefiles
    
    AKA: fix compiling libcroco against SDK-libxml (Mac)

diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk
index 814f804..4888bfa 100644
--- a/libcroco/makefile.mk
+++ b/libcroco/makefile.mk
@@ -51,20 +51,14 @@ PATCH_FILES=
 CONFIGURE_DIR=
 
 .IF "$(OS)"=="MACOSX"
-.IF "$(SYSTEM_LIBXML)"=="YES"
-LIBXML2_INCLUDE=-I/usr/include/libxml2
-.ELSE
-LIBXML2_INCLUDE=
-.ENDIF
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                  ./configure \
                  --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \
-                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 $(LIBXML2_INCLUDE)" \
+                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
                  LDFLAGS="-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))" \
                  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))