diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-24 20:11:45 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-24 23:22:42 +0200 |
| commit | 5b57402ac40470605fbb31ebccbc8da4a5506089 (patch) | |
| tree | 39b3a4e6885307a5204b21b2bb3c47c1937cd97d /sax/Library_sax.mk | |
| parent | 06f611210cf487dcd32aa7ccfaae5ed80124e439 (diff) | |
sax: avoid pointless linking expwrap against sax
..only to share one class with fastsax in sax, where it's not used.
The link dependency is ugly, mostly for libmerged.
Use static library.
Another option would be to link fastsax against expwrap.
Change-Id: Ia85b01150959e2472d1ac04013b8b9a27232a070
Diffstat (limited to 'sax/Library_sax.mk')
| -rw-r--r-- | sax/Library_sax.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 690bff77d22f..3dc8942795a1 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -13,6 +13,11 @@ $(eval $(call gb_Library_use_package,sax,\ sax_inc \ )) +$(eval $(call gb_Library_set_include,sax,\ + -I$(SRCDIR)/sax/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_Library_use_sdk_api,sax)) $(eval $(call gb_Library_use_libraries,sax,\ @@ -23,20 +28,14 @@ $(eval $(call gb_Library_use_libraries,sax,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_set_include,sax,\ - -I$(SRCDIR)/sax/inc \ - $$(INCLUDE) \ -)) - $(eval $(call gb_Library_add_defs,sax,\ -DSAX_DLLIMPLEMENTATION \ )) $(eval $(call gb_Library_add_exception_objects,sax,\ - sax/source/expatwrap/xml2utf \ sax/source/tools/converter \ sax/source/tools/fastattribs \ - sax/source/tools/fastserializer \ + sax/source/tools/fastserializer \ sax/source/tools/fshelper \ )) |