summaryrefslogtreecommitdiff
path: root/src/Makefile_Evas.am
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2014-08-12 09:37:33 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2014-08-22 16:27:28 +0200
commit3fe554e0b648a9f03ca150ec3b44f20f277b261c (patch)
tree91099b28f71242f57c0159fccec848de4e31ee99 /src/Makefile_Evas.am
parent8c8a2b1098932ebd6f40ef064dfa652bbdf7edc0 (diff)
build: Allow to use external liblz4 instead of embedded copy
While we are likely will keep the embedded copy for a while to avoid a really new dependency we allow now to use the external liblz4. You need at least revision r120 and a package that ships the pc file for it. Personally I would like to get rid of it rather sooner than later due to the security implications and a bunch of code we ship but have no idea about. Reality is that it will need some time until this new lib is actually packaged and shipped with releases for a a majority of people. This patch was co-worked with Doug Newgard <scimmia22@outlook.com>
Diffstat (limited to 'src/Makefile_Evas.am')
-rw-r--r--src/Makefile_Evas.am40
1 files changed, 32 insertions, 8 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 3fe513c2f1..4f0ec0c915 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1904,30 +1904,42 @@ modules/evas/savers/tgv/evas_image_save_tgv.c \
1904static_libs/rg_etc/rg_etc1.c \ 1904static_libs/rg_etc/rg_etc1.c \
1905static_libs/rg_etc/rg_etc2.c \ 1905static_libs/rg_etc/rg_etc2.c \
1906static_libs/rg_etc/rg_etc1.h \ 1906static_libs/rg_etc/rg_etc1.h \
1907static_libs/rg_etc/etc2_encoder.c \ 1907static_libs/rg_etc/etc2_encoder.c
1908if ! ENABLE_LIBLZ4
1909lib_evas_libevas_la_SOURCES += \
1908static_libs/lz4/lz4.c \ 1910static_libs/lz4/lz4.c \
1909static_libs/lz4/lz4.h \ 1911static_libs/lz4/lz4.h \
1910static_libs/lz4/lz4hc.c \ 1912static_libs/lz4/lz4hc.c \
1911static_libs/lz4/lz4hc.h 1913static_libs/lz4/lz4hc.h
1914endif
1912lib_evas_libevas_la_CPPFLAGS += \ 1915lib_evas_libevas_la_CPPFLAGS += \
1913-I$(top_srcdir)/src/static_libs/lz4 \
1914-I$(top_srcdir)/src/static_libs/rg_etc \ 1916-I$(top_srcdir)/src/static_libs/rg_etc \
1915@evas_image_loader_tgv_cflags@ 1917@evas_image_loader_tgv_cflags@
1918if ! ENABLE_LIBLZ4
1919lib_evas_libevas_la_CPPFLAGS += \
1920-I$(top_srcdir)/src/static_libs/lz4
1921endif
1916lib_evas_libevas_la_LIBADD += @evas_image_loader_tgv_libs@ 1922lib_evas_libevas_la_LIBADD += @evas_image_loader_tgv_libs@
1917if EVAS_CSERVE2 1923if EVAS_CSERVE2
1918bin_evas_evas_cserve2_slave_SOURCES += \ 1924bin_evas_evas_cserve2_slave_SOURCES += \
1919modules/evas/loaders/tgv/evas_image_load_tgv.c \ 1925modules/evas/loaders/tgv/evas_image_load_tgv.c \
1920static_libs/rg_etc/rg_etc1.c \ 1926static_libs/rg_etc/rg_etc1.c \
1921static_libs/rg_etc/rg_etc2.c \ 1927static_libs/rg_etc/rg_etc2.c \
1922static_libs/rg_etc/rg_etc1.h \ 1928static_libs/rg_etc/rg_etc1.h
1929if ! ENABLE_LIBLZ4
1930bin_evas_evas_cserve2_slave_SOURCES += \
1923static_libs/lz4/lz4.c \ 1931static_libs/lz4/lz4.c \
1924static_libs/lz4/lz4.h 1932static_libs/lz4/lz4.h
1933endif
1925bin_evas_evas_cserve2_slave_CPPFLAGS += \ 1934bin_evas_evas_cserve2_slave_CPPFLAGS += \
1926-I$(top_builddir)/src/lib/efl \ 1935-I$(top_builddir)/src/lib/efl \
1927-I$(top_srcdir)/src/static_libs/lz4 \
1928-I$(top_srcdir)/src/static_libs/rg_etc \ 1936-I$(top_srcdir)/src/static_libs/rg_etc \
1929-I$(top_srcdir)/src/lib/evas/ \ 1937-I$(top_srcdir)/src/lib/evas/ \
1930@evas_image_loader_tgv_cflags@ 1938@evas_image_loader_tgv_cflags@
1939if ! ENABLE_LIBLZ4
1940bin_evas_evas_cserve2_slave_CPPFLAGS += \
1941-I$(top_srcdir)/src/static_libs/lz4
1942endif
1931bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_tgv_libs@ 1943bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_tgv_libs@
1932endif 1944endif
1933else 1945else
@@ -1937,16 +1949,22 @@ modules_evas_loaders_tgv_module_la_SOURCES = \
1937modules/evas/loaders/tgv/evas_image_load_tgv.c \ 1949modules/evas/loaders/tgv/evas_image_load_tgv.c \
1938static_libs/rg_etc/rg_etc1.c \ 1950static_libs/rg_etc/rg_etc1.c \
1939static_libs/rg_etc/rg_etc2.c \ 1951static_libs/rg_etc/rg_etc2.c \
1940static_libs/rg_etc/rg_etc1.h \ 1952static_libs/rg_etc/rg_etc1.h
1953if ! ENABLE_LIBLZ4
1954modules_evas_loaders_tgv_module_la_SOURCES += \
1941static_libs/lz4/lz4.c \ 1955static_libs/lz4/lz4.c \
1942static_libs/lz4/lz4.h 1956static_libs/lz4/lz4.h
1957endif
1943modules_evas_loaders_tgv_module_la_CPPFLAGS = \ 1958modules_evas_loaders_tgv_module_la_CPPFLAGS = \
1944-I$(top_builddir)/src/lib/efl \ 1959-I$(top_builddir)/src/lib/efl \
1945-I$(top_srcdir)/src/static_libs/lz4 \
1946-I$(top_srcdir)/src/static_libs/rg_etc \ 1960-I$(top_srcdir)/src/static_libs/rg_etc \
1947-I$(top_srcdir)/src/lib/evas/ \ 1961-I$(top_srcdir)/src/lib/evas/ \
1948@EVAS_CFLAGS@ \ 1962@EVAS_CFLAGS@ \
1949@evas_image_loader_tgv_cflags@ 1963@evas_image_loader_tgv_cflags@
1964if ! ENABLE_LIBLZ4
1965modules_evas_loaders_tgv_module_la_CPPFLAGS += \
1966-I$(top_srcdir)/src/static_libs/lz4
1967endif
1950modules_evas_loaders_tgv_module_la_LIBADD = \ 1968modules_evas_loaders_tgv_module_la_LIBADD = \
1951@USE_EVAS_LIBS@ \ 1969@USE_EVAS_LIBS@ \
1952@evas_image_loader_tgv_libs@ 1970@evas_image_loader_tgv_libs@
@@ -1960,18 +1978,24 @@ modules_evas_savers_tgv_module_la_SOURCES = \
1960modules/evas/savers/tgv/evas_image_save_tgv.c \ 1978modules/evas/savers/tgv/evas_image_save_tgv.c \
1961static_libs/rg_etc/rg_etc1.c \ 1979static_libs/rg_etc/rg_etc1.c \
1962static_libs/rg_etc/rg_etc1.h \ 1980static_libs/rg_etc/rg_etc1.h \
1963static_libs/rg_etc/etc2_encoder.c \ 1981static_libs/rg_etc/etc2_encoder.c
1982if ! ENABLE_LIBLZ4
1983modules_evas_savers_tgv_module_la_SOURCES += \
1964static_libs/lz4/lz4.c \ 1984static_libs/lz4/lz4.c \
1965static_libs/lz4/lz4.h \ 1985static_libs/lz4/lz4.h \
1966static_libs/lz4/lz4hc.c \ 1986static_libs/lz4/lz4hc.c \
1967static_libs/lz4/lz4hc.h 1987static_libs/lz4/lz4hc.h
1988endif
1968modules_evas_savers_tgv_module_la_CPPFLAGS = \ 1989modules_evas_savers_tgv_module_la_CPPFLAGS = \
1969-I$(top_builddir)/src/lib/efl \ 1990-I$(top_builddir)/src/lib/efl \
1970-I$(top_srcdir)/src/static_libs/lz4 \
1971-I$(top_srcdir)/src/static_libs/rg_etc \ 1991-I$(top_srcdir)/src/static_libs/rg_etc \
1972-I$(top_srcdir)/src/lib/evas/ \ 1992-I$(top_srcdir)/src/lib/evas/ \
1973@EVAS_CFLAGS@ \ 1993@EVAS_CFLAGS@ \
1974@evas_image_saver_tgv_cflags@ 1994@evas_image_saver_tgv_cflags@
1995if ! ENABLE_LIBLZ4
1996modules_evas_savers_tgv_module_la_CPPFLAGS += \
1997-I$(top_srcdir)/src/static_libs/lz4
1998endif
1975modules_evas_savers_tgv_module_la_LIBADD = \ 1999modules_evas_savers_tgv_module_la_LIBADD = \
1976@USE_EVAS_LIBS@ \ 2000@USE_EVAS_LIBS@ \
1977@evas_image_saver_tgv_libs@ 2001@evas_image_saver_tgv_libs@