diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-25 22:36:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-27 00:50:02 +0200 |
| commit | 349015b18e285b9642e0b16a5e4db61ef347a6a8 (patch) | |
| tree | be3b36ba75e167cea6d13f91e26fcc596e9e2d28 /solenv/gbuild/ExternalPackage.mk | |
| parent | 90d7723085a8da0929c7c17587a7717ceeb23d36 (diff) | |
gbuild: remove gb_ExternalPackage_add_library_for_install
Deliver all external libraries to INSTDIR directly.
Change-Id: I8d3e035e5cfa07bd0f53ee4a226c48d4b86a4032
Diffstat (limited to 'solenv/gbuild/ExternalPackage.mk')
| -rw-r--r-- | solenv/gbuild/ExternalPackage.mk | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk index ad5697d4a5c8..21ea69320f7d 100644 --- a/solenv/gbuild/ExternalPackage.mk +++ b/solenv/gbuild/ExternalPackage.mk @@ -113,6 +113,7 @@ endef # # gb_ExternalPackage_add_file package dest src define gb_ExternalPackage_add_file +$(if $(4),$(call gb_Output_error,gb_ExternalPackage_add_file: $(1) 4: $(4))) $(call gb_ExternalPackage_mark_generated_file,$(1),$(3)) $(call gb_Package_add_file,$(1),$(2),$(3)) @@ -194,40 +195,4 @@ gb_ExternalPackage_PROJECT_$(1) := $(2) endef -# gb_ExternalPackage__add_file_for_install package dest dest-inst src -define gb_ExternalPackage__add_file_for_install -$(call gb_ExternalPackage_add_file,$(1),$(2),$(4)) - -$(call gb_Helper_install,$(call gb_Package_get_target,$(1)), \ - $(3), \ - $(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(4)) - -$(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(4) :| \ - $(call gb_Package_get_preparation_target,$(1)) - -endef - -# Add a (dynamic) library that is a part of the installation. -# -# This function is very similar to gb_ExternalPackage_add_file, except -# that it also allows to deliver the library to its proper place in -# $(INSTROOT). -# -# The last argument is the name under which the library was registered. -# It is used to determine layer, if the library is not in layer OOO. -# -# gb_ExternalPackage_add_library_for_install package dest src library? -define gb_ExternalPackage_add_library_for_install -$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),$(INSTROOT)/$(LIBO_LIB_FOLDER))/$(notdir $(2)),$(3)) - -endef - -# Add several libraries for install at once. -# -# gb_ExternalPackage_add_libraries_for_install package destdir file(s) -define gb_ExternalPackage_add_libraries_for_install -$(foreach file,$(3),$(call gb_ExternalPackage_add_library_for_install,$(1),$(2)/$(notdir $(file)),$(file))) - -endef - # vim: set noet sw=4 ts=4: |