From c2ae61ed0dd367bd589eb73c4bfe2f68dac92d23 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 5 Feb 2019 11:08:01 -0500 Subject: [PATCH] autotools: remove all usage of evas_image_loader_tgv_(cflags|libs) Summary: these are empty variables which are apparently causing build errors for some users in certain cases Reviewers: bu5hm4n, stefan_schmidt Reviewed By: stefan_schmidt Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7876 --- src/Makefile_Evas.am | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 12f9b31fd5..d81ea48225 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -2108,13 +2108,11 @@ static_libs/lz4/lz4hc.c \ static_libs/lz4/lz4hc.h endif lib_evas_libevas_la_CPPFLAGS += \ --I$(top_srcdir)/src/static_libs/rg_etc \ -@evas_image_loader_tgv_cflags@ +-I$(top_srcdir)/src/static_libs/rg_etc if ! ENABLE_LIBLZ4 lib_evas_libevas_la_CPPFLAGS += \ -I$(top_srcdir)/src/static_libs/lz4 endif -lib_evas_libevas_la_LIBADD += @evas_image_loader_tgv_libs@ endif else loadertgvpkgdir = $(libdir)/evas/modules/image_loaders/tgv/$(MODULE_ARCH) @@ -2140,15 +2138,13 @@ modules_evas_image_loaders_tgv_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/static_libs/rg_etc \ -I$(top_srcdir)/src/lib/evas/ \ @EVAS_CFLAGS@ \ -@NEON_CFLAGS@ \ -@evas_image_loader_tgv_cflags@ +@NEON_CFLAGS@ if ! ENABLE_LIBLZ4 modules_evas_image_loaders_tgv_module_la_CPPFLAGS += \ -I$(top_srcdir)/src/static_libs/lz4 endif modules_evas_image_loaders_tgv_module_la_LIBADD = \ -@USE_EVAS_LIBS@ \ -@evas_image_loader_tgv_libs@ +@USE_EVAS_LIBS@ modules_evas_image_loaders_tgv_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ modules_evas_image_loaders_tgv_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_image_loaders_tgv_module_la_LIBTOOLFLAGS = --tag=disable-static