diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2012-10-12 12:28:11 -0700 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-25 17:37:34 +0200 |
| commit | 2ffde7b17192f76f815ab451f08164519f69887e (patch) | |
| tree | 9ea5145c64e94170e1baf7b1a1e4adb92e772cf7 /shell | |
| parent | 7f96cec269edabaf26f5e518d632cbfde95320ca (diff) | |
gbuildification of expat
Two different xmlparse libraries are created: ascii_expat_xmlparse and
expat_xmlparse. One without -DXML_UNICODE and one with. Source file are
duplicated and renamed with gb_UnpackedTarball_set_post_action function
to be able to add artifacts twice to gbuild machinery.
On windows 64 bit additional two librares are created: expat_xmlparse_x64 and
expat_xmltok_x64. That is due the problem with shell/shlxthandler (comment):
------------------------------------------------------
use UNICODE only because shell/shlxthandler
doesn't link against ascii_expat_xmlparse
------------------------------------------------------
Include files are delivered to $(OUTDIR)/inc/external/expat
now and not to $(OUTDIR)/inc/external any more.
set_include call is added in RepositoryExternal.mk.
To define dependency between StaticLibrary and ExternalProject
new function was introduced: gb_StaticLibrary_use_external_project.
Change-Id: I3b3aa40f39ef82c70f6f28790b582c83e48bdf76
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Library_ooofilt_x64.mk | 2 | ||||
| -rw-r--r-- | shell/Library_propertyhdl_x64.mk | 2 | ||||
| -rw-r--r-- | shell/Library_shlxthdl_x64.mk | 2 | ||||
| -rw-r--r-- | shell/StaticLibrary_xmlparser_x64.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index 9c3cb655758d..7ea310914c8b 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\ )) $(eval $(call gb_Library_use_externals,ooofilt_x64,\ - expat_utf16 \ + expat_utf16_x64 \ zlib \ )) diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index f12ba0c29af6..5b07b4c4ee36 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\ )) $(eval $(call gb_Library_use_externals,propertyhdl_x64,\ - expat_utf16 \ + expat_utf16_x64 \ zlib \ )) diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index e5deaa9cc46e..0d70683044c6 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\ )) $(eval $(call gb_Library_use_externals,shlxthdl_x64,\ - expat_utf16 \ + expat_utf16_x64 \ zlib \ )) diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk index 2f5f510bdd94..bbf7a4a40207 100644 --- a/shell/StaticLibrary_xmlparser_x64.mk +++ b/shell/StaticLibrary_xmlparser_x64.mk @@ -35,7 +35,7 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\ )) $(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser_x64,\ - expat_utf16 \ + expat_utf16_x64 \ )) $(eval $(call gb_StaticLibrary_add_x64_generated_exception_objects,shell_xmlparser_x64,\ |