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 /external/cairo | |
| parent | 90d7723085a8da0929c7c17587a7717ceeb23d36 (diff) | |
gbuild: remove gb_ExternalPackage_add_library_for_install
Deliver all external libraries to INSTDIR directly.
Change-Id: I8d3e035e5cfa07bd0f53ee4a226c48d4b86a4032
Diffstat (limited to 'external/cairo')
| -rw-r--r-- | external/cairo/ExternalPackage_cairo.mk | 4 | ||||
| -rw-r--r-- | external/cairo/ExternalPackage_pixman.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk index 83c0bd5df9de..34462f6fff66 100644 --- a/external/cairo/ExternalPackage_cairo.mk +++ b/external/cairo/ExternalPackage_cairo.mk @@ -9,8 +9,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo)) +$(eval $(call gb_ExternalPackage_set_outdir,cairo,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo)) -$(eval $(call gb_ExternalPackage_add_library_for_install,cairo,lib/libcairo.so.2,src/.libs/libcairo.so.2.11000.2)) +$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11000.2)) # vim: set noet sw=4 ts=4: diff --git a/external/cairo/ExternalPackage_pixman.mk b/external/cairo/ExternalPackage_pixman.mk index 0e342c8265dd..ee3bf1139da8 100644 --- a/external/cairo/ExternalPackage_pixman.mk +++ b/external/cairo/ExternalPackage_pixman.mk @@ -9,8 +9,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,pixman,pixman)) +$(eval $(call gb_ExternalPackage_set_outdir,pixman,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman)) -$(eval $(call gb_ExternalPackage_add_library_for_install,pixman,lib/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4)) +$(eval $(call gb_ExternalPackage_add_file,pixman,$(LIBO_LIB_FOLDER)/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4)) # vim: set noet sw=4 ts=4: |