diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-03-02 14:38:51 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 01:02:37 +0200 |
| commit | ff4441cc5e473f7f1f8dd9a7fc46deaab445f7ae (patch) | |
| tree | 159986dafd43a378e7bbd2b775bac997d4ed8d2e /sax/Library_fastsax.mk | |
| parent | fa4ec3c338e5b33e9886ee489bbe38ddd7dfae3c (diff) | |
CWS gnumake4: some fixes for Windows [hg:9eb9b5d5181e]
Diffstat (limited to 'sax/Library_fastsax.mk')
| -rw-r--r-- | sax/Library_fastsax.mk | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk index 06ef80b4ada0..8fe23330d963 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -39,6 +39,15 @@ $(eval $(call gb_Library_set_defs,fastsax,\ $$(DEFS) \ )) +$(eval $(call gb_Library_add_linked_libs,fastsax,\ + sal \ + cppu \ + cppuhelper \ + sax \ + stl \ + $(gb_STDLIBS) \ +)) + ifeq ($(SYSTEM_ZLIB),YES) $(eval $(call gb_Library_set_defs,fastsax,\ $$(DEFS) \ @@ -51,16 +60,15 @@ $(eval $(call gb_Library_set_defs,fastsax,\ $$(DEFS) \ -DSYSTEM_EXPAT \ )) -endif - $(eval $(call gb_Library_add_linked_libs,fastsax,\ - sal \ - cppu \ - cppuhelper \ expat \ - sax \ - $(gb_STDLIBS) \ )) +else +$(eval $(call gb_Library_add_linked_libs,fastsax,\ + expat_xmlparse \ + expat_xmltok \ +)) +endif # re-uses xml2utf object from sax.uno lib (see below) $(eval $(call gb_Library_add_exception_objects,fastsax,\ |