diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-14 20:43:57 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-15 11:35:58 +0100 |
| commit | 70527511fac91d81f59f79b216a391d547f28d1d (patch) | |
| tree | 400958e215d5af712a21fe8e1a30bce3e1863476 /RepositoryExternal.mk | |
| parent | e097ec36d7c6488049ba16ec75ec40e0e2bb0789 (diff) | |
expat: get rid of expat_xmltok static library:
Just compile those files twice.
Also rename the UTF8 library to plain "expat".
This allows python to simply use that library and build "pyexpat"
succesfully.
Change-Id: I7e37ec5b87b70c2cf8c86e06709f0e8d0a67f09d
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 7d56e35068ca..6712055d26b7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -286,9 +286,8 @@ endef else # !SYSTEM_EXPAT $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - ascii_expat_xmlparse \ - expat_xmlparse \ - expat_xmltok \ + expat \ + expat_utf16 \ expat_x64 \ )) @@ -300,7 +299,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) -$(if $(filter-out ascii_expat_xmlparse expat_xmltok,$(2)),\ +$(if $(filter expat_utf16,$(2)),\ $(call gb_LinkTarget_add_defs,$(1),\ -DXML_UNICODE \ )) @@ -315,12 +314,12 @@ endif # SYSTEM_EXPAT # now define 2 wrappers that select which internal static library to use... define gb_LinkTarget__use_expat_utf8 -$(call gb_LinkTarget__use_expat,$(1),ascii_expat_xmlparse expat_xmltok) +$(call gb_LinkTarget__use_expat,$(1),expat) endef define gb_LinkTarget__use_expat_utf16 -$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse expat_xmltok) +$(call gb_LinkTarget__use_expat,$(1),expat_utf16) endef |