aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Eet.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_Eet.am
parentecore_getopt: correct fix for CID 98382 and 98383 (diff)
downloadefl-3fe554e0b648a9f03ca150ec3b44f20f277b261c.tar.gz
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_Eet.am')
-rw-r--r--src/Makefile_Eet.am21
1 files changed, 16 insertions, 5 deletions
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index d5a308b10c..8e7f56a675 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -17,27 +17,38 @@ lib/eet/eet_image.c \
lib/eet/eet_lib.c \
lib/eet/eet_node.c \
lib/eet/eet_utils.c \
-static_libs/lz4/lz4.c \
-static_libs/lz4/lz4.h \
-static_libs/lz4/lz4hc.c \
-static_libs/lz4/lz4hc.h \
static_libs/rg_etc/rg_etc1.c \
static_libs/rg_etc/rg_etc2.c \
static_libs/rg_etc/etc2_encoder.c \
static_libs/rg_etc/rg_etc1.h
+if ! ENABLE_LIBLZ4
+lib_eet_libeet_la_SOURCES += \
+static_libs/lz4/lz4.c \
+static_libs/lz4/lz4.h \
+static_libs/lz4/lz4hc.c \
+static_libs/lz4/lz4hc.h
+endif
lib_eet_libeet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
--I$(top_srcdir)/src/static_libs/lz4 \
-I$(top_srcdir)/src/static_libs/rg_etc \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
@EET_CFLAGS@
+if ! ENABLE_LIBLZ4
+lib_eet_libeet_la_CPPFLAGS += \
+-I$(top_srcdir)/src/static_libs/lz4
+endif
lib_eet_libeet_la_LIBADD = @EET_LIBS@ @EVIL_LIBS@
+if ENABLE_LIBLZ4
+lib_eet_libeet_la_LIBADD += @LIBLZ4_LIBS@
+endif
lib_eet_libeet_la_DEPENDENCIES = @EET_INTERNAL_LIBS@
lib_eet_libeet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+if ! ENABLE_LIBLZ4
EXTRA_DIST += static_libs/lz4/README
+endif
### Binary