[Libreoffice-commits] .: Branch 'feature/gnumake4' - forms/Library_frm.mk

[Bjoern Michaelsen]

 forms/Library_frm.mk |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 06ed8bfddc3a11536058b2c12366d47b28472e38
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jul 23 14:14:10 2011 +0200

    use gb_Library_use_external in forms

diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index 02c4987..c58b3a9 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -35,11 +35,6 @@ $(eval $(call gb_Library_set_include,frm,\
     -I$(realpath $(SRCDIR)/forms/source/inc) \
     -I$(realpath $(SRCDIR)/forms/source/solar/inc) \
     -I$(OUTDIR)/inc \
-    $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
-))
-
-$(eval $(call gb_Library_add_defs,frm,\
-    $(if $(filter YES,$(SYSTEM_LIBXML)),-DSYSTEM_LIBXML $(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
 $(eval $(call gb_Library_add_api,frm,\
@@ -67,9 +62,9 @@ $(eval $(call gb_Library_add_linked_libs,frm,\
     ucbhelper \
     utl \
     vcl \
-    xml2 \
     $(gb_STDLIBS) \
 ))
+$(eval $(call gb_Library_use_external,frm,libxml2))
 
 $(eval $(call gb_Library_set_componentfile,frm,forms/util/frm))