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 /Makefile.top | |
parent | remove accidentally committed garbage (diff) | |
download | core-2ffde7b17192f76f815ab451f08164519f69887e.tar.gz core-2ffde7b17192f76f815ab451f08164519f69887e.zip |
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 'Makefile.top')
-rw-r--r-- | Makefile.top | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.top b/Makefile.top index aa1e25f515cd..68bbbd1bc8fb 100644 --- a/Makefile.top +++ b/Makefile.top @@ -73,6 +73,7 @@ editeng\ embeddedobj\ embedserv\ eventattacher\ +expat\ extensions\ extras\ fileaccess\ @@ -210,7 +211,6 @@ cppunit\ crashrep\ curl\ epm\ -expat\ external\ gdk-pixbuf\ gettext\ |