diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-03 18:51:55 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-03 18:51:55 +0200 |
| commit | 4560a620db00d31872fdb772ce04bb00bc1c7839 (patch) | |
| tree | 7306a181476d5265137ee2d5114b28c0bea2cffc /libcroco | |
| parent | eef313e6a5a5fa9c4ea6ed88e3247ca04280dcdc (diff) | |
configure exists for a reason. Don't redefine the stuff in random makefiles
AKA: fix compiling libcroco against SDK-libxml (Mac)
Diffstat (limited to 'libcroco')
| -rw-r--r-- | libcroco/makefile.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index 814f80404ad4..4888bfa405bc 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)) |