diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-23 15:23:24 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-23 15:23:24 +0200 |
| commit | 8fb6435604b40e08aa2ed95f31a001920e1ac25a (patch) | |
| tree | 10575c8a205f66745154c06afc8ca1f84ff4f150 /sax | |
| parent | 67cd3faba45badd6592406f6c47b5b24ca639079 (diff) | |
keep gbuild calls consistent at now, even if it is a bit longer
Diffstat (limited to 'sax')
| -rw-r--r-- | sax/Library_expwrap.mk | 2 | ||||
| -rw-r--r-- | sax/Library_fastsax.mk | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index 5b9bd34c3345..f69281e042bf 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,expwrap,\ $(gb_STDLIBS) \ )) -$(call gb_Library_use_external,expwrap,expat_utf16) +$(eval $(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 f347842967be..d6fe4714daa1 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -47,13 +47,9 @@ $(eval $(call gb_Library_add_linked_libs,fastsax,\ $(gb_STDLIBS) \ )) -ifeq ($(SYSTEM_ZLIB),YES) -$(eval $(call gb_Library_add_defs,fastsax,\ - -DSYSTEM_ZLIB \ -)) -endif +$(eval $(call gb_Library_use_external,fastsax,zlib)) -$(call gb_Library_use_external,fastsax,expat_utf8) +$(eval $(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,\ |