From 990111d87aa2589a93455828aa59352ba7ee25d2 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Fri, 1 Apr 2011 20:49:35 +0000
Subject: gnumake4: #i117610#: add RepositoryExternal.mk, and use it.
 [hg:62e2f8dc95a7]

---
 sax/Library_expwrap.mk | 26 +-------------------------
 sax/Library_fastsax.mk | 15 +--------------
 2 files changed, 2 insertions(+), 39 deletions(-)

(limited to 'sax')

diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 2c03ccf20f07..6bea2f3e077b 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -39,13 +39,6 @@ $(eval $(call gb_Library_set_defs,expwrap,\
 	$$(DEFS) \
 ))
 
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_set_defs,expwrap,\
-	$$(DEFS) \
-	-DSYSTEM_ZLIB \
-))
-endif
-
 $(eval $(call gb_Library_add_linked_libs,expwrap,\
 	sal \
 	cppu \
@@ -54,24 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,expwrap,\
     $(gb_STDLIBS) \
 ))
 
-ifeq ($(SYSTEM_EXPAT),YES)
-$(eval $(call gb_Library_set_defs,expwrap,\
-	$$(DEFS) \
-	-DSYSTEM_EXPAT \
-))
-$(eval $(call gb_Library_add_linked_libs,expwrap,\
-	expat \
-))
-else
-$(eval $(call gb_Library_set_defs,expwrap,\
-	$$(DEFS) \
-	-DXML_UNICODE \
-))
-$(eval $(call gb_Library_add_linked_static_libs,expwrap,\
-	expat_xmlparse \
-	expat_xmltok \
-))
-endif
+$(call gb_Library_use_external,expwrap,expat_utf16)
 
 $(eval $(call gb_Library_add_exception_objects,expwrap,\
 	sax/source/expatwrap/attrlistimpl \
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index 1ee51eeffb92..e45fa5021311 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -55,20 +55,7 @@ $(eval $(call gb_Library_set_defs,fastsax,\
 ))
 endif
 
-ifeq ($(SYSTEM_EXPAT),YES)
-$(eval $(call gb_Library_set_defs,fastsax,\
-	$$(DEFS) \
-	-DSYSTEM_EXPAT \
-))
-$(eval $(call gb_Library_add_linked_libs,fastsax,\
-	expat \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,fastsax,\
-	expat_xmlparse \
-	expat_xmltok \
-))
-endif
+$(call gb_Library_use_external,fastsax,expat_utf8)
 
 # re-uses xml2utf object from sax.uno lib (see below)
 $(eval $(call gb_Library_add_exception_objects,fastsax,\
-- 
cgit v1.2.1