summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-02-05 11:08:01 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-02-05 11:08:01 -0500
commitc2ae61ed0dd367bd589eb73c4bfe2f68dac92d23 (patch)
tree2baa6febd839a6cb5a02111017b103a66f0b8e8b
parent04d1c54e1f238b1aaabc137556fd3f11c84e5c71 (diff)
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
-rw-r--r--src/Makefile_Evas.am10
1 files 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 \
2108static_libs/lz4/lz4hc.h 2108static_libs/lz4/lz4hc.h
2109endif 2109endif
2110lib_evas_libevas_la_CPPFLAGS += \ 2110lib_evas_libevas_la_CPPFLAGS += \
2111-I$(top_srcdir)/src/static_libs/rg_etc \ 2111-I$(top_srcdir)/src/static_libs/rg_etc
2112@evas_image_loader_tgv_cflags@
2113if ! ENABLE_LIBLZ4 2112if ! ENABLE_LIBLZ4
2114lib_evas_libevas_la_CPPFLAGS += \ 2113lib_evas_libevas_la_CPPFLAGS += \
2115-I$(top_srcdir)/src/static_libs/lz4 2114-I$(top_srcdir)/src/static_libs/lz4
2116endif 2115endif
2117lib_evas_libevas_la_LIBADD += @evas_image_loader_tgv_libs@
2118endif 2116endif
2119else 2117else
2120loadertgvpkgdir = $(libdir)/evas/modules/image_loaders/tgv/$(MODULE_ARCH) 2118loadertgvpkgdir = $(libdir)/evas/modules/image_loaders/tgv/$(MODULE_ARCH)
@@ -2140,15 +2138,13 @@ modules_evas_image_loaders_tgv_module_la_CPPFLAGS = \
2140-I$(top_srcdir)/src/static_libs/rg_etc \ 2138-I$(top_srcdir)/src/static_libs/rg_etc \
2141-I$(top_srcdir)/src/lib/evas/ \ 2139-I$(top_srcdir)/src/lib/evas/ \
2142@EVAS_CFLAGS@ \ 2140@EVAS_CFLAGS@ \
2143@NEON_CFLAGS@ \ 2141@NEON_CFLAGS@
2144@evas_image_loader_tgv_cflags@
2145if ! ENABLE_LIBLZ4 2142if ! ENABLE_LIBLZ4
2146modules_evas_image_loaders_tgv_module_la_CPPFLAGS += \ 2143modules_evas_image_loaders_tgv_module_la_CPPFLAGS += \
2147-I$(top_srcdir)/src/static_libs/lz4 2144-I$(top_srcdir)/src/static_libs/lz4
2148endif 2145endif
2149modules_evas_image_loaders_tgv_module_la_LIBADD = \ 2146modules_evas_image_loaders_tgv_module_la_LIBADD = \
2150@USE_EVAS_LIBS@ \ 2147@USE_EVAS_LIBS@
2151@evas_image_loader_tgv_libs@
2152modules_evas_image_loaders_tgv_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ 2148modules_evas_image_loaders_tgv_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
2153modules_evas_image_loaders_tgv_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 2149modules_evas_image_loaders_tgv_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
2154modules_evas_image_loaders_tgv_module_la_LIBTOOLFLAGS = --tag=disable-static 2150modules_evas_image_loaders_tgv_module_la_LIBTOOLFLAGS = --tag=disable-static