diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-19 00:08:31 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:32 +0200 |
| commit | f2899508b3bd55ecdbd45a02e0e8071b95906b3a (patch) | |
| tree | 061ab2746bbebb6ffff3fd1ecf845292c860a0bc /RepositoryExternal.mk | |
| parent | 4c51feb06e9ee9be25eca5ae58d07cd6c12bca63 (diff) | |
gbuild: remove executables from OUTDIR and WORKDIR
Call and link executables directly in INSTDIR.
- gb_Library_get_target is now same as the gb_LinkTarget_get_target
- disable gb_Library_add_auxtarget, no auxtargets need to be copied
- adjust paths of all external executables to OUTDIR_FOR_BUILD for now
- use lazy assignment instead of := in AllLangResTarget because it's
read before Executable
- link.exe generates an import library for lots of executables
because they export symbols, especially since commit
0ffab9363d527d55b12b9b09d7136ca1c9d171e0
"force 'main' to always be DLLPUBLIC."
Change-Id: I3e1ee7425dd430bb83c7cd59e265869a0541b38d
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d3a9ef892b78..db86275c3d89 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2995,7 +2995,7 @@ gb_ExternalExecutable__register_xmllint := else # ! SYSTEM_LIBXML_FOR_BUILD define gb_ExternalExecutable__register_xmllint -$(call gb_ExternalExecutable_set_internal,xmllint) +$(call gb_ExternalExecutable_set_internal,xmllint,$(OUTDIR_FOR_BUILD)/bin/xmllint$(gb_Executable_EXT_for_build)) endef @@ -3008,7 +3008,7 @@ gb_ExternalExecutable__register_xsltproc := else # ! SYSTEM_LIBXSLT_FOR_BUILD define gb_ExternalExecutable__register_xsltproc -$(call gb_ExternalExecutable_set_internal,xsltproc) +$(call gb_ExternalExecutable_set_internal,xsltproc,$(OUTDIR_FOR_BUILD)/bin/xsltproc$(gb_Executable_EXT_for_build)) $(call gb_ExternalExecutable_add_dependencies,xsltproc,$(call gb_Package_get_target,xslt)) endef @@ -3057,7 +3057,7 @@ endef else # ! SYSTEM_GENBRK define gb_ExternalExecutable__register_genbrk -$(call gb_ExternalExecutable_set_internal,genbrk) +$(call gb_ExternalExecutable_set_internal,genbrk,$(OUTDIR_FOR_BUILD)/bin/genbrk$(gb_Executable_EXT_for_build)) $(call gb_ExternalExecutable_add_dependencies,genbrk,\ $(call gb_Package_get_target_for_build,icu) \ ) @@ -3076,7 +3076,7 @@ endef else # ! SYSTEM_GENCCODE define gb_ExternalExecutable__register_genccode -$(call gb_ExternalExecutable_set_internal,genccode) +$(call gb_ExternalExecutable_set_internal,genccode,$(OUTDIR_FOR_BUILD)/bin/genccode$(gb_Executable_EXT_for_build)) $(call gb_ExternalExecutable_add_dependencies,genccode,\ $(call gb_Package_get_target_for_build,icu) \ ) @@ -3095,7 +3095,7 @@ endef else # ! SYSTEM_GENCMN define gb_ExternalExecutable__register_gencmn -$(call gb_ExternalExecutable_set_internal,gencmn) +$(call gb_ExternalExecutable_set_internal,gencmn,$(OUTDIR_FOR_BUILD)/bin/gencmn$(gb_Executable_EXT_for_build)) $(call gb_ExternalExecutable_add_dependencies,gencmn,\ $(call gb_Package_get_target_for_build,icu) \ ) |