summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS20
-rw-r--r--ChangeLog.eet (renamed from legacy/eet/ChangeLog)0
-rw-r--r--Makefile.am24
-rw-r--r--NEWS.eet (renamed from legacy/eet/NEWS)0
-rw-r--r--README.eet (renamed from legacy/eet/README)0
-rw-r--r--configure.ac411
-rw-r--r--eet.pc.in (renamed from legacy/eet/eet.pc.in)0
-rw-r--r--eet.spec.in (renamed from legacy/eet/eet.spec.in)0
-rw-r--r--m4/ac_path_generic.m4 (renamed from legacy/ecore/m4/ac_path_generic.m4)0
-rw-r--r--m4/efl_binary.m4 (renamed from legacy/eet/m4/efl_binary.m4)0
-rw-r--r--m4/efl_check_libs.m4 (renamed from legacy/eet/m4/efl_check_libs.m4)0
-rw-r--r--m4/efl_compiler.m42
-rw-r--r--src/bin/Makefile.am2
-rw-r--r--src/bin/eet/Makefile.am17
-rw-r--r--src/bin/eet/eet_main.c (renamed from legacy/eet/src/bin/eet_main.c)0
-rw-r--r--src/examples/Makefile.am6
-rw-r--r--src/examples/eet/Makefile.am50
-rw-r--r--src/examples/eet/eet-basic.c (renamed from legacy/eet/src/examples/eet-basic.c)0
-rw-r--r--src/examples/eet/eet-data-cipher_decipher.c (renamed from legacy/eet/src/examples/eet-data-cipher_decipher.c)0
-rw-r--r--src/examples/eet/eet-data-file_descriptor_01.c (renamed from legacy/eet/src/examples/eet-data-file_descriptor_01.c)0
-rw-r--r--src/examples/eet/eet-data-file_descriptor_02.c (renamed from legacy/eet/src/examples/eet-data-file_descriptor_02.c)0
-rw-r--r--src/examples/eet/eet-data-nested.c (renamed from legacy/eet/src/examples/eet-data-nested.c)0
-rw-r--r--src/examples/eet/eet-data-simple.c (renamed from legacy/eet/src/examples/eet-data-simple.c)0
-rw-r--r--src/examples/eet/eet-file.c (renamed from legacy/eet/src/examples/eet-file.c)0
-rw-r--r--src/examples/eina/Makefile.am2
-rw-r--r--src/lib/Makefile.am2
-rw-r--r--src/lib/eet/Eet.h (renamed from legacy/eet/src/lib/Eet.h)0
-rw-r--r--src/lib/eet/Eet_private.h (renamed from legacy/eet/src/lib/Eet_private.h)0
-rw-r--r--src/lib/eet/Makefile.am43
-rw-r--r--src/lib/eet/eet_alloc.c (renamed from legacy/eet/src/lib/eet_alloc.c)0
-rw-r--r--src/lib/eet/eet_cipher.c (renamed from legacy/eet/src/lib/eet_cipher.c)0
-rw-r--r--src/lib/eet/eet_connection.c (renamed from legacy/eet/src/lib/eet_connection.c)0
-rw-r--r--src/lib/eet/eet_data.c (renamed from legacy/eet/src/lib/eet_data.c)0
-rw-r--r--src/lib/eet/eet_dictionary.c (renamed from legacy/eet/src/lib/eet_dictionary.c)0
-rw-r--r--src/lib/eet/eet_image.c (renamed from legacy/eet/src/lib/eet_image.c)0
-rw-r--r--src/lib/eet/eet_lib.c (renamed from legacy/eet/src/lib/eet_lib.c)0
-rw-r--r--src/lib/eet/eet_node.c (renamed from legacy/eet/src/lib/eet_node.c)0
-rw-r--r--src/lib/eet/eet_utils.c (renamed from legacy/eet/src/lib/eet_utils.c)0
-rw-r--r--src/lib/eet/lz4/README (renamed from legacy/eet/src/lib/lz4/README)0
-rw-r--r--src/lib/eet/lz4/lz4.c (renamed from legacy/eet/src/lib/lz4/lz4.c)0
-rw-r--r--src/lib/eet/lz4/lz4.h (renamed from legacy/eet/src/lib/lz4/lz4.h)0
-rw-r--r--src/lib/eet/lz4/lz4hc.c (renamed from legacy/eet/src/lib/lz4/lz4hc.c)0
-rw-r--r--src/lib/eet/lz4/lz4hc.h (renamed from legacy/eet/src/lib/lz4/lz4hc.h)0
-rw-r--r--src/tests/Makefile.am2
-rw-r--r--src/tests/eet/Makefile.am19
-rw-r--r--src/tests/eet/TODO (renamed from legacy/eet/src/tests/TODO)0
-rw-r--r--src/tests/eet/cert.pem (renamed from legacy/eet/src/tests/cert.pem)0
-rw-r--r--src/tests/eet/eet_data_suite.c (renamed from legacy/eet/src/tests/eet_data_suite.c)0
-rw-r--r--src/tests/eet/eet_suite.c (renamed from legacy/eet/src/tests/eet_suite.c)0
-rw-r--r--src/tests/eet/eet_suite.h (renamed from legacy/eet/src/tests/eet_suite.h)0
-rw-r--r--src/tests/eet/key.pem (renamed from legacy/eet/src/tests/key.pem)0
-rw-r--r--src/tests/eet/key_enc.pem (renamed from legacy/eet/src/tests/key_enc.pem)0
-rw-r--r--src/tests/eet/key_enc_none.pem (renamed from legacy/eet/src/tests/key_enc_none.pem)0
53 files changed, 561 insertions, 39 deletions
diff --git a/AUTHORS b/AUTHORS
index 674562e3db..8771d23ded 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -41,3 +41,23 @@ Raphael Kubo da Costa <rakuco@freebsd.org>
41Jérôme Pinot <ngc891@gmail.com> 41Jérôme Pinot <ngc891@gmail.com>
42Mike Blumenkrantz <michael.blumenkrantz@gmail.com> 42Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
43Patryk Kaczmarek <patryk.k@samsung.com> 43Patryk Kaczmarek <patryk.k@samsung.com>
44
45Eet
46---
47
48The Rasterman (Carsten Haitzler) <raster@rasterman.com>
49David Goodlad <dgoodlad@gmail.com>
50Cedric Bail <cedric.bail@free.fr>
51Arnaud de Turckheim <quarium@gmail.com>
52Luis Felipe Strano Moraes <lfelipe@profusion.mobi>
53Chidambar Zinnoury <illogict@online.fr>
54Vincent Torri <vtorri@univ-evry.fr>
55Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
56Raphael Kubo da Costa <kubo@profusion.mobi>
57Mathieu Taillefumier <mathieu.taillefumier@free.fr>
58Albin "Lutin" Tonnerre <albin.tonnerre@gmail.com>
59Adam Simpkins <adam@adamsimpkins.net>
60Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
61Lionel Orry <lionel.orry@gmail.com>
62Jérôme Pinot <ngc891@gmail.com>
63Leandro Santiago <leandrosansilva@gmail.com>
diff --git a/legacy/eet/ChangeLog b/ChangeLog.eet
index cc26e44429..cc26e44429 100644
--- a/legacy/eet/ChangeLog
+++ b/ChangeLog.eet
diff --git a/Makefile.am b/Makefile.am
index 1d9a508d81..74449d56be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,21 +21,35 @@ m4/ltsugar.m4 \
21m4/ltversion.m4 21m4/ltversion.m4
22 22
23EXTRA_DIST = \ 23EXTRA_DIST = \
24m4/ac_path_generic.m4 \
24m4/efl_attribute.m4 \ 25m4/efl_attribute.m4 \
25m4/efl_check_funcs.m4 \ 26m4/efl_check_funcs.m4 \
26m4/efl_compiler.m4 \ 27m4/efl_compiler.m4 \
27m4/efl_doxygen.m4 \ 28m4/efl_doxygen.m4 \
28m4/efl_path_max.m4 \ 29m4/efl_path_max.m4 \
29m4/efl_threads.m4 \ 30m4/efl_threads.m4 \
30m4/evil_windows.m4 31m4/evil_windows.m4 \
32m4/eina_check.m4
31 33
32if HAVE_WINDOWS 34if HAVE_WINDOWS
33EXTRA_DIST += evil.pc 35EXTRA_DIST += \
36ChangeLog.evil \
37NEWS.evil \
38README.evil \
39evil.pc
34endif 40endif
35 41
36EXTRA_DIST += \ 42EXTRA_DIST += \
43ChangeLog.eina \
44NEWS.eina \
45README.eina \
37eina.spec \ 46eina.spec \
38eina.pc 47eina.pc \
48ChangeLog.eet \
49NEWS.eet \
50README.eet \
51eet.spec \
52eet.pc
39 53
40pkgconfigdir = $(libdir)/pkgconfig 54pkgconfigdir = $(libdir)/pkgconfig
41pkgconfig_DATA = 55pkgconfig_DATA =
@@ -44,7 +58,7 @@ if HAVE_WINDOWS
44pkgconfig_DATA += evil.pc 58pkgconfig_DATA += evil.pc
45endif 59endif
46 60
47pkgconfig_DATA += eina.pc 61pkgconfig_DATA += eina.pc eet.pc
48 62
49 63
50.PHONY: doc benchmark examples install-examples 64.PHONY: doc benchmark examples install-examples
@@ -79,7 +93,7 @@ check-local:
79if EFL_ENABLE_COVERAGE 93if EFL_ENABLE_COVERAGE
80 @$(MAKE) lcov-reset 94 @$(MAKE) lcov-reset
81endif 95endif
82 @./src/tests/eina/eina_suite 96 @./src/tests/eet/eet_suite
83if EFL_ENABLE_COVERAGE 97if EFL_ENABLE_COVERAGE
84 @$(MAKE) lcov-report 98 @$(MAKE) lcov-report
85endif 99endif
diff --git a/legacy/eet/NEWS b/NEWS.eet
index 9555bc938c..9555bc938c 100644
--- a/legacy/eet/NEWS
+++ b/NEWS.eet
diff --git a/legacy/eet/README b/README.eet
index 989f4bbd7d..989f4bbd7d 100644
--- a/legacy/eet/README
+++ b/README.eet
diff --git a/configure.ac b/configure.ac
index 475e67730f..72b13a2a68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,6 +167,19 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
167 167
168#### Additional options to configure 168#### Additional options to configure
169 169
170# Assert or fail.
171
172AC_ARG_ENABLE([assert],
173 [AC_HELP_STRING([--enable-assert], [enable assert, @<:@default=no@:>@])],
174 [
175 if test "x${enableval}" = "xyes" ; then
176 prefer_assert="yes"
177 else
178 prefer_assert="no"
179 fi
180 ],
181 [prefer_assert="no"])
182
170 183
171#### Checks for programs 184#### Checks for programs
172 185
@@ -216,6 +229,8 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
216 229
217#### Checks for header files 230#### Checks for header files
218 231
232EFL_CHECK_PATH_MAX
233
219 234
220#### Checks for types 235#### Checks for types
221 236
@@ -225,6 +240,8 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
225 240
226#### Checks for compiler characteristics 241#### Checks for compiler characteristics
227 242
243AC_C_BIGENDIAN
244AC_C_INLINE
228EFL_ATTRIBUTE_UNUSED 245EFL_ATTRIBUTE_UNUSED
229# EFL_CHECK_COMPILER_FLAGS([MY_LIB], [-Wall -Wextra]) 246# EFL_CHECK_COMPILER_FLAGS([MY_LIB], [-Wall -Wextra])
230 247
@@ -242,6 +259,7 @@ AC_SUBST([lt_enable_auto_import])
242 259
243#### Checks for library functions 260#### Checks for library functions
244 261
262AC_FUNC_ALLOCA
245 263
246 264
247###################### EFL ###################### 265###################### EFL ######################
@@ -422,19 +440,6 @@ if test "x${have_stringshare_usage}" = "xyes"; then
422 AC_DEFINE([EINA_STRINGSHARE_USAGE], [1], [Report Eina stringshare usage pattern]) 440 AC_DEFINE([EINA_STRINGSHARE_USAGE], [1], [Report Eina stringshare usage pattern])
423fi 441fi
424 442
425# Assert or fail.
426
427AC_ARG_ENABLE([assert],
428 [AC_HELP_STRING([--enable-assert], [enable assert, @<:@default=no@:>@])],
429 [
430 if test "x${enableval}" = "xyes" ; then
431 prefer_assert="yes"
432 else
433 prefer_assert="no"
434 fi
435 ],
436 [prefer_assert="no"])
437
438# Check if we want to benchmark on real data 443# Check if we want to benchmark on real data
439AC_ARG_ENABLE([e17], 444AC_ARG_ENABLE([e17],
440 [AC_HELP_STRING([--enable-e17], [enable heavy benchmark @<:@default=no@:>@])], 445 [AC_HELP_STRING([--enable-e17], [enable heavy benchmark @<:@default=no@:>@])],
@@ -481,7 +486,7 @@ case "$host_vendor" in
481 ;; 486 ;;
482esac 487esac
483 488
484# Exotic library for copilation on Coyote 489# Exotic library for compilation on Coyote
485 490
486PKG_CHECK_EXISTS([exotic], 491PKG_CHECK_EXISTS([exotic],
487 [ 492 [
@@ -667,10 +672,6 @@ AC_SUBST([EINA_CONFIGURE_HAVE_DIRENT_H])
667 672
668### Checks for compiler characteristics 673### Checks for compiler characteristics
669 674
670AC_C_BIGENDIAN
671AC_C_INLINE
672EFL_ATTRIBUTE_UNUSED
673
674m4_ifdef([v_ver], 675m4_ifdef([v_ver],
675 [ 676 [
676 EFL_CHECK_COMPILER_FLAGS([EINA], [-Wall -Wextra]) 677 EFL_CHECK_COMPILER_FLAGS([EINA], [-Wall -Wextra])
@@ -678,16 +679,12 @@ m4_ifdef([v_ver],
678 679
679EFL_CHECK_COMPILER_FLAGS([EINA], [-Wshadow]) 680EFL_CHECK_COMPILER_FLAGS([EINA], [-Wshadow])
680 681
681EFL_CHECK_PATH_MAX
682
683### Checks for linker characteristics 682### Checks for linker characteristics
684 683
685EFL_CHECK_LINKER_FLAGS([EINA], [-fno-strict-aliasing]) 684EFL_CHECK_LINKER_FLAGS([EINA], [-fno-strict-aliasing])
686 685
687### Checks for library functions 686### Checks for library functions
688 687
689AC_FUNC_ALLOCA
690
691AC_CHECK_FUNCS([strlcpy openat fstatat fpathconf execvp backtrace backtrace_symbols malloc_usable_size mtrace]) 688AC_CHECK_FUNCS([strlcpy openat fstatat fpathconf execvp backtrace backtrace_symbols malloc_usable_size mtrace])
692 689
693EFL_CHECK_FUNCS([EINA], [dirfd dlopen dladdr fnmatch iconv shm_open setxattr]) 690EFL_CHECK_FUNCS([EINA], [dirfd dlopen dladdr fnmatch iconv shm_open setxattr])
@@ -752,21 +749,359 @@ EINA_CHECK_MODULE([one-big], [${enable_one_big}], [one big])
752 749
753#### Eet 750#### Eet
754 751
755#AC_MSG_NOTICE([Eet checks]) 752AC_MSG_NOTICE([Eet checks])
756 753
757### Default values 754### Default values
755
758### Additional options to configure 756### Additional options to configure
757
758EFL_ENABLE_BIN([eet])
759
760# Old eet file format support
761
762AC_ARG_ENABLE(old-eet-file-format,
763 [AC_HELP_STRING(
764 [--disable-old-eet-file-format],
765 [disable old eet file format support @<:@default=enabled@:>@])],
766 [
767 if test "x${enableval}" = "xyes" ; then
768 old_eet_file_format="yes"
769 else
770 old_eet_file_format="no"
771 fi
772 ],
773 [old_eet_file_format="yes"])
774
775AC_MSG_CHECKING([whether to support old eet file format])
776AC_MSG_RESULT([${old_eet_file_format}])
777
778if test "x${old_eet_file_format}" = "xyes" ; then
779 AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 1, [support old eet file format])
780else
781 AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 0, [support old eet file format])
782fi
783
784# Openssl support
785
786AC_ARG_ENABLE([openssl],
787 [AC_HELP_STRING([--disable-openssl], [disable openssl eet support @<:@default=auto@:>@])],
788 [
789 if test "x${enableval}" = "xyes" ; then
790 want_openssl="yes"
791 else
792 want_openssl="no"
793 fi
794 ],
795 [want_openssl="auto"])
796
797AC_MSG_CHECKING([whether to use OpenSSL])
798AC_MSG_RESULT([${want_openssl}])
799
800# GnuTLS support
801
802AC_ARG_ENABLE([gnutls],
803 [AC_HELP_STRING([--disable-gnutls], [disable gnutls eet support @<:@default=auto@:>@])],
804 [
805 if test "x${enableval}" = "xyes" ; then
806 want_gnutls="yes"
807 else
808 want_gnutls="no"
809 fi
810 ],
811 [want_gnutls="auto"])
812
813AC_MSG_CHECKING([whether to use Gnutls])
814AC_MSG_RESULT([${want_gnutls}])
815
816# Cryptography support
817
818AC_ARG_ENABLE([cipher],
819 [AC_HELP_STRING([--disable-cipher], [disable cipher support for eet API @<:@default=yes@:>@])],
820 [
821 if test "x${enableval}" = "xyes" ; then
822 want_cipher="yes"
823 else
824 want_cipher="no"
825 fi
826 ],
827 [want_cipher="yes"])
828
829AC_MSG_CHECKING([whether to use cipher])
830AC_MSG_RESULT([${want_cipher}])
831
832AC_ARG_ENABLE([signature],
833 [AC_HELP_STRING([--disable-signature], [disable signature file support for eet @<:@default=yes@:>@])],
834 [
835 if test "x${enableval}" = "xyes" ; then
836 want_signature="yes"
837 else
838 want_signature="no"
839 fi
840 ],
841 [want_signature="yes"])
842
843AC_MSG_CHECKING([whether to use signature])
844AC_MSG_RESULT([${want_signature}])
845
759### Checks for programs 846### Checks for programs
847
760### Checks for libraries 848### Checks for libraries
849
850## Compatibility layers
851
852# Evil library for compilation on Windows
853
854EFL_EET_BUILD=""
855case "$host_os" in
856 mingw*)
857 PKG_CHECK_EXISTS([evil >= 1.1.0])
858 AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed])
859 requirements_pc_eet="evil ${requirements_pc_eet}"
860 EFL_EET_BUILD="-DEFL_EET_BUILD"
861 ;;
862esac
863AC_SUBST(EFL_EET_BUILD)
864
865# Exotic library for compilation on Coyote
866
867PKG_CHECK_EXISTS([exotic],
868 [
869 enable_exotic="yes"
870 AC_DEFINE([HAVE_EXOTIC_H], [1], [Define to 1 if you have Exotic.])
871 requirements_pc_eet="exotic ${requirements_pc_eet}"
872 ],
873 [enable_exotic="no"])
874
875## Secure layer
876
877# Gnutls library
878
879have_gnutls="no"
880if test "x${want_gnutls}" = "xyes" || test "x${want_gnutls}" = "xauto" ; then
881 PKG_CHECK_MODULES([GNUTLS], [gnutls >= 1.7.6],
882 [
883 have_gnutls="yes"
884 want_openssl="no"
885 AC_DEFINE([HAVE_GNUTLS], [1], [Have Gnutls support])
886 requirements_pc_eet="gnutls >= 1.7.6 ${requirements_pc_eet}"
887 ],
888 [have_gnutls="no"])
889fi
890
891# libgcrypt
892
893if test "x${have_gnutls}" = "xyes" ; then
894 AC_PATH_GENERIC([libgcrypt], [], [have_gnutls="yes"], [have_gnutls="no"])
895 if test "x${have_gnutls}" = "xyes" ; then
896 requirements_libs_eet="${LIBGCRYPT_LIBS} ${requirements_libs_eet}"
897 fi
898fi
899
900# Specific GNUTLS improvement
901
902AC_ARG_ENABLE(new-gnutls-api,
903 [AC_HELP_STRING(
904 [--disable-new-gnutls-api],
905 [enable use of gnutls_x509_crt_verify_hash. @<:@default=yes@:>@])],
906 [
907 if test "x${enableval}" = "xyes" ; then
908 new_gnutls_api="yes"
909 else
910 new_gnutls_api="no"
911 fi
912 ],
913 [new_gnutls_api="yes"])
914
915AC_MSG_CHECKING([whether to use gnutls_x509_crt_verify_hash])
916AC_MSG_RESULT([${new_gnutls_api}])
917
918if test "x${have_gnutls}" = "xyes" && test "x${new_gnutls_api}" = "xyes" ; then
919 CFLAGS_save="${CFLAGS}"
920 LIBS_save="${LIBS}"
921 CFLAGS="${GNUTLS_CFLAGS}"
922 LIBS="${GNUTLS_LIBS}"
923 AC_CHECK_LIB([gnutls], [gnutls_x509_crt_verify_hash],
924 [
925 AC_DEFINE([EET_USE_NEW_GNUTLS_API], [1], [use gnutls_x509_crt_verify_hash])
926 new_gnutls_api="yes"
927 ],
928 [new_gnutls_api="no"])
929 CFLAGS="${CFLAGS_save}"
930 LIBS="${LIBS_save}"
931fi
932
933use_gnutls_privkey_sign_data="no"
934if test "x${have_gnutls}" = "xyes" ; then
935 CFLAGS_save="${CFLAGS}"
936 LIBS_save="${LIBS}"
937 CFLAGS="${GNUTLS_CFLAGS}"
938 LIBS="${GNUTLS_LIBS}"
939 AC_CHECK_LIB([gnutls], [gnutls_privkey_sign_data],
940 [
941 AC_DEFINE([EET_USE_NEW_PRIVKEY_SIGN_DATA], [1], [use gnutls_privkey_sign_data])
942 use_gnutls_privkey_sign_data="yes"
943 ],
944 [use_gnutls_privkey_sign_data="no"])
945 CFLAGS="${CFLAGS_save}"
946 LIBS="${LIBS_save}"
947fi
948
949AC_MSG_CHECKING([whether to use gnutls_privkey_sign_data])
950AC_MSG_RESULT([${use_gnutls_privkey_sign_data}])
951
952use_gnutls_pubkey_verify_hash="no"
953if test "x${have_gnutls}" = "xyes" ; then
954 CFLAGS_save="${CFLAGS}"
955 LIBS_save="${LIBS}"
956 CFLAGS="${GNUTLS_CFLAGS}"
957 LIBS="${GNUTLS_LIBS}"
958 AC_CHECK_LIB([gnutls], [gnutls_pubkey_verify_hash],
959 [
960 AC_DEFINE([EET_USE_NEW_PUBKEY_VERIFY_HASH], [1], [use gnutls_pubkey_verify_hash])
961 use_gnutls_pubkey_verify_hash="yes"
962 ],
963 [use_gnutls_pubkey_verify_hash="no"])
964 CFLAGS="${CFLAGS_save}"
965 LIBS="${LIBS_save}"
966fi
967
968AC_MSG_CHECKING([whether to use gnutls_pubkey_verify_hash])
969AC_MSG_RESULT([${use_gnutls_pubkey_verify_hash}])
970
971# Openssl library
972
973have_openssl="no"
974if test "x${want_openssl}" = "xyes" || test "x${want_openssl}" = "xauto" ; then
975 PKG_CHECK_EXISTS([openssl],
976 [
977 have_openssl="yes"
978 AC_DEFINE([HAVE_OPENSSL], [1], [Have Openssl support])
979 requirements_pc_eet="openssl ${requirements_pc_eet}"
980 ],
981 [have_openssl="no"])
982fi
983
984if test "x${have_gnutls}" = "xyes" ; then
985 secure_layer="GnuTLS"
986elif test "x${have_openssl}" = "xyes" ; then
987 secure_layer="OpenSSL"
988else
989 secure_layer="no"
990fi
991
992# Cryptography support
993
994have_cipher="no"
995if test "x${have_gnutls}" = "xyes" && test "x${want_cipher}" = "xyes" ; then
996 have_cipher="yes"
997 AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in eet])
998elif test "x${have_openssl}" = "xyes" && test "x${want_cipher}" = "xyes" ; then
999 have_cipher="yes"
1000 AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in eet])
1001fi
1002
1003AC_MSG_CHECKING([whether to activate cipher support in eet])
1004AC_MSG_RESULT([${have_cipher}])
1005
1006have_signature="no"
1007if test "x${have_gnutls}" = "xyes" && test "x${want_signature}" = "xyes" ; then
1008 have_signature="yes"
1009 AC_DEFINE([HAVE_SIGNATURE], [1], [Have signature support for eet file])
1010elif test "x${have_openssl}" = "xyes" && test "x${want_signature}" = "xyes" ; then
1011 have_signature="yes"
1012 AC_DEFINE([HAVE_SIGNATURE], [1], [Have signature support for eet file])
1013fi
1014
1015AC_MSG_CHECKING([whether to activate signature support in eet])
1016AC_MSG_RESULT([${have_signature}])
1017
1018# libjpeg and zlib
1019
1020EFL_CHECK_LIBS([eet], [libjpeg zlib])
1021
1022# Eina library
1023
1024requirements_pc_eet="eina >= 1.2.0 ${requirements_pc_eet}"
1025PKG_CHECK_MODULES([EET], [${requirements_pc_eet}])
1026
1027case "$host_os" in
1028 mingw32ce*)
1029 requirements_libs_eet="${requirements_libs_eet} -lws2"
1030 ;;
1031 mingw*)
1032 requirements_libs_eet="${requirements_libs_eet} -lws2_32"
1033 ;;
1034esac
1035
1036EET_LIBS="${EET_LIBS} ${requirements_libs_eet}"
1037
761### Checks for header files 1038### Checks for header files
1039
1040AC_CHECK_HEADERS(netinet/in.h unistd.h)
1041
762### Checks for types 1042### Checks for types
1043
763### Checks for structures 1044### Checks for structures
1045
764### Checks for compiler characteristics 1046### Checks for compiler characteristics
1047
1048# Check whether the null pointer is zero on this arch
1049AC_TRY_RUN(
1050 [
1051#include <stdlib.h>
1052#include <inttypes.h>
1053int main (int argc, char **argv) {
1054 void *foo = NULL;
1055 uintptr_t bar = (uintptr_t)foo;
1056 return (uintptr_t)foo;
1057}
1058 ],
1059 [have_null="yes"],
1060 [have_null="no"],
1061 [
1062 AC_MSG_WARN([Cannot check when cross-compiling -- assuming null is okay])
1063 have_null="yes"
1064 ])
1065AC_MSG_CHECKING([value of the null pointer])
1066AC_MSG_RESULT([${have_null}])
1067
1068if test ! "x${have_null}" = "xyes" ; then
1069 AC_MSG_WARN([Your system is a bit too funny, eet might not work properly])
1070fi
1071
765### Checks for linker characteristics 1072### Checks for linker characteristics
1073
1074case "${host_os}" in
1075 openbsd*)
1076 ;;
1077 *)
1078 EFL_CHECK_LINKER_FLAGS([EET], [-Wl,--as-needed])
1079 ;;
1080esac
1081
766### Checks for library functions 1082### Checks for library functions
767 1083
768#### End of Eet 1084#### End of Eet
769 1085
1086
1087#### Evas
1088
1089#AC_MSG_NOTICE([Evas checks])
1090
1091### Default values
1092### Additional options to configure
1093### Checks for programs
1094### Checks for libraries
1095### Checks for header files
1096### Checks for types
1097### Checks for structures
1098### Checks for compiler characteristics
1099### Checks for linker characteristics
1100### Checks for library functions
1101
1102#### End of Evas
1103
1104
770AC_CONFIG_FILES([ 1105AC_CONFIG_FILES([
771Makefile 1106Makefile
772src/Makefile 1107src/Makefile
@@ -774,14 +1109,17 @@ src/benchmarks/Makefile
774src/benchmarks/eina/Makefile 1109src/benchmarks/eina/Makefile
775src/bin/Makefile 1110src/bin/Makefile
776src/bin/evil/Makefile 1111src/bin/evil/Makefile
1112src/bin/eet/Makefile
777src/examples/Makefile 1113src/examples/Makefile
778src/examples/eina/Makefile 1114src/examples/eina/Makefile
1115src/examples/eet/Makefile
779src/include/Makefile 1116src/include/Makefile
780src/include/eina/Makefile 1117src/include/eina/Makefile
781src/include/eina/eina_config.h 1118src/include/eina/eina_config.h
782src/lib/Makefile 1119src/lib/Makefile
783src/lib/evil/Makefile 1120src/lib/evil/Makefile
784src/lib/eina/Makefile 1121src/lib/eina/Makefile
1122src/lib/eet/Makefile
785src/modules/Makefile 1123src/modules/Makefile
786src/modules/eina/Makefile 1124src/modules/eina/Makefile
787src/modules/eina/mp/Makefile 1125src/modules/eina/mp/Makefile
@@ -796,9 +1134,12 @@ src/scripts/Makefile
796src/scripts/eina/Makefile 1134src/scripts/eina/Makefile
797src/tests/Makefile 1135src/tests/Makefile
798src/tests/eina/Makefile 1136src/tests/eina/Makefile
1137src/tests/eet/Makefile
799eina.spec 1138eina.spec
1139eet.spec
800evil.pc 1140evil.pc
801eina.pc 1141eina.pc
1142eet.pc
802]) 1143])
803 1144
804AC_OUTPUT 1145AC_OUTPUT
@@ -842,11 +1183,11 @@ echo " File dirfd...........: ${efl_func_dirfd}"
842echo " File xattr...........: ${efl_func_setxattr}" 1183echo " File xattr...........: ${efl_func_setxattr}"
843echo " shm_open.............: ${efl_func_shm_open}" 1184echo " shm_open.............: ${efl_func_shm_open}"
844echo 1185echo
845echo " Tests................: ${_efl_enable_tests} (Coverage: ${_efl_enable_coverage})" 1186echo " Tests................: make check (Coverage: ${_efl_enable_coverage})"
846echo " Examples.............: ${enable_build_examples}" 1187echo " Examples.............: make examples"
847echo " Tiler Example........: ${build_tiler_example}" 1188echo " Tiler Example......: ${build_tiler_example}"
848echo " Examples installed...: ${enable_install_examples}" 1189echo " installation.......: make install-examples"
849echo " Benchmark............: ${enable_benchmark}" 1190echo " Benchmark............: make benchmark"
850if test "x${enable_benchmark}" = "xyes" ; then 1191if test "x${enable_benchmark}" = "xyes" ; then
851echo " Glib...............: ${enable_benchmark_glib}" 1192echo " Glib...............: ${enable_benchmark_glib}"
852echo " E17 real data......: ${enable_benchmark_e17}" 1193echo " E17 real data......: ${enable_benchmark_e17}"
@@ -861,6 +1202,20 @@ echo " Fixed bitmap.......: ${enable_fixed_bitmap}"
861echo " One big............: ${enable_one_big}" 1202echo " One big............: ${enable_one_big}"
862echo " Pass through.......: ${enable_pass_through}" 1203echo " Pass through.......: ${enable_pass_through}"
863echo 1204echo
1205echo "Eet"
1206echo
1207echo " Secure layer.........: ${secure_layer}"
1208if test "x${have_gnutls}" = "xyes" || test "x${have_openssl}" = "xyes" ; then
1209 echo " Cipher support.....: ${have_cipher}"
1210 echo " Signature..........: ${have_signature}"
1211fi
1212echo
1213echo " Old eet file format..: ${old_eet_file_format}"
1214echo
1215echo " Tests................: make check (Coverage: ${_efl_enable_coverage})"
1216echo " Examples.............: make examples"
1217echo " installation.......: make install-examples"
1218echo
864echo "Compilation............: make (or gmake)" 1219echo "Compilation............: make (or gmake)"
865echo " CPPFLAGS.............: $CPPFLAGS" 1220echo " CPPFLAGS.............: $CPPFLAGS"
866echo " CFLAGS...............: $CFLAGS" 1221echo " CFLAGS...............: $CFLAGS"
diff --git a/legacy/eet/eet.pc.in b/eet.pc.in
index ee958878be..ee958878be 100644
--- a/legacy/eet/eet.pc.in
+++ b/eet.pc.in
diff --git a/legacy/eet/eet.spec.in b/eet.spec.in
index 5a91f60044..5a91f60044 100644
--- a/legacy/eet/eet.spec.in
+++ b/eet.spec.in
diff --git a/legacy/ecore/m4/ac_path_generic.m4 b/m4/ac_path_generic.m4
index d42724115f..d42724115f 100644
--- a/legacy/ecore/m4/ac_path_generic.m4
+++ b/m4/ac_path_generic.m4
diff --git a/legacy/eet/m4/efl_binary.m4 b/m4/efl_binary.m4
index fc2f200509..fc2f200509 100644
--- a/legacy/eet/m4/efl_binary.m4
+++ b/m4/efl_binary.m4
diff --git a/legacy/eet/m4/efl_check_libs.m4 b/m4/efl_check_libs.m4
index b1c37894b6..b1c37894b6 100644
--- a/legacy/eet/m4/efl_check_libs.m4
+++ b/m4/efl_check_libs.m4
diff --git a/m4/efl_compiler.m4 b/m4/efl_compiler.m4
index be6a753e07..ca30759d82 100644
--- a/m4/efl_compiler.m4
+++ b/m4/efl_compiler.m4
@@ -65,7 +65,7 @@ dnl AM_CONDITIONAL : EFL_HAVE_FLAG (FLAG being replaced by its value)
65AC_DEFUN([EFL_CHECK_LINKER_FLAG], 65AC_DEFUN([EFL_CHECK_LINKER_FLAG],
66[ 66[
67m4_pushdef([UPEFL], m4_translit([[$1]], [-a-z], [_A-Z])) 67m4_pushdef([UPEFL], m4_translit([[$1]], [-a-z], [_A-Z]))
68m4_pushdef([UP], m4_translit([[$2]], [-a-z], [_A-Z])) 68m4_pushdef([UP], m4_translit([[$2]], [,-a-z], [__A-Z]))
69 69
70LDFLAGS_save="${LDFLAGS}" 70LDFLAGS_save="${LDFLAGS}"
71LDFLAGS="${LDFLAGS} $2" 71LDFLAGS="${LDFLAGS} $2"
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index d89d02e560..70889282e3 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -7,3 +7,5 @@ if HAVE_WINDOWS
7SUBDIRS += evil 7SUBDIRS += evil
8 8
9endif 9endif
10
11SUBDIRS += eet
diff --git a/src/bin/eet/Makefile.am b/src/bin/eet/Makefile.am
new file mode 100644
index 0000000000..af5fa844c8
--- /dev/null
+++ b/src/bin/eet/Makefile.am
@@ -0,0 +1,17 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4AM_CPPFLAGS = \
5-I$(top_srcdir)/src/lib/eet \
6-I$(top_builddir)/src/lib/eet \
7-DPACKAGE_BIN_DIR=\"$(bindir)\" \
8-DPACKAGE_LIB_DIR=\"$(libdir)\" \
9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
10@EET_CFLAGS@
11
12bin_PROGRAMS = @EET_PRG@
13EXTRA_PROGRAMS = eet
14
15eet_SOURCES = eet_main.c
16eet_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
17eet_LDFLAGS = @lt_enable_auto_import@
diff --git a/legacy/eet/src/bin/eet_main.c b/src/bin/eet/eet_main.c
index 8a93d11b4f..8a93d11b4f 100644
--- a/legacy/eet/src/bin/eet_main.c
+++ b/src/bin/eet/eet_main.c
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index d6fbe3e3fe..85c8ca3a4e 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,9 +1,11 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = eina 3SUBDIRS = eina eet
4 4
5examples: 5examples:
6 @$(MAKE) -C eina examples 6 @$(MAKE) -C eina examples
7 @$(MAKE) -C eet examples
7 8
8install-examples: 9install-examples:
9 @$(MAKE) -C eina install-examples \ No newline at end of file 10 @$(MAKE) -C eina install-examples
11 @$(MAKE) -C eet install-examples \ No newline at end of file
diff --git a/src/examples/eet/Makefile.am b/src/examples/eet/Makefile.am
new file mode 100644
index 0000000000..16815c14bd
--- /dev/null
+++ b/src/examples/eet/Makefile.am
@@ -0,0 +1,50 @@
1MAINTAINERCLEANFILES = Makefile.in
2AM_CPPFLAGS = \
3-I$(top_srcdir)/src/lib/eet \
4-I$(top_builddir)/src/lib/eet \
5@EET_CFLAGS@
6
7EXTRA_PROGRAMS = eet_basic eet_file eet_data_simple eet_data_nested eet_data_file_descriptor_01 eet_data_file_descriptor_02 eet_data_cipher_decipher
8
9eet_basic_SOURCES = eet-basic.c
10eet_basic_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
11
12eet_file_SOURCES = eet-file.c
13eet_file_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
14
15eet_data_simple_SOURCES = eet-data-simple.c
16eet_data_simple_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
17
18eet_data_nested_SOURCES = eet-data-nested.c
19eet_data_nested_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
20
21eet_data_file_descriptor_01_SOURCES = eet-data-file_descriptor_01.c
22eet_data_file_descriptor_01_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
23
24eet_data_file_descriptor_02_SOURCES = eet-data-file_descriptor_02.c
25eet_data_file_descriptor_02_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
26
27eet_data_cipher_decipher_SOURCES = eet-data-cipher_decipher.c
28eet_data_cipher_decipher_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
29
30SRCS = \
31eet-basic.c \
32eet-file.c \
33eet-data-simple.c \
34eet-data-nested.c \
35eet-data-file_descriptor_01.c \
36eet-data-file_descriptor_02.c \
37eet-data-cipher_decipher.c
38
39examples: $(EXTRA_PROGRAMS)
40
41install-examples:
42 mkdir -p $(pkgdatadir)/examples
43 $(install_sh_DATA) -c $(SRCS) $(pkgdatadir)/examples
44
45uninstall-local:
46 for f in $(SRCS) ; do \
47 rm -f $(pkgdatadir)/examples/$$f ; \
48 done
49
50EXTRA_DIST = addr_book.txt chat.xml
diff --git a/legacy/eet/src/examples/eet-basic.c b/src/examples/eet/eet-basic.c
index 05ff397789..05ff397789 100644
--- a/legacy/eet/src/examples/eet-basic.c
+++ b/src/examples/eet/eet-basic.c
diff --git a/legacy/eet/src/examples/eet-data-cipher_decipher.c b/src/examples/eet/eet-data-cipher_decipher.c
index 2ef965c745..2ef965c745 100644
--- a/legacy/eet/src/examples/eet-data-cipher_decipher.c
+++ b/src/examples/eet/eet-data-cipher_decipher.c
diff --git a/legacy/eet/src/examples/eet-data-file_descriptor_01.c b/src/examples/eet/eet-data-file_descriptor_01.c
index 4b5b75f865..4b5b75f865 100644
--- a/legacy/eet/src/examples/eet-data-file_descriptor_01.c
+++ b/src/examples/eet/eet-data-file_descriptor_01.c
diff --git a/legacy/eet/src/examples/eet-data-file_descriptor_02.c b/src/examples/eet/eet-data-file_descriptor_02.c
index 65ba79ec40..65ba79ec40 100644
--- a/legacy/eet/src/examples/eet-data-file_descriptor_02.c
+++ b/src/examples/eet/eet-data-file_descriptor_02.c
diff --git a/legacy/eet/src/examples/eet-data-nested.c b/src/examples/eet/eet-data-nested.c
index a6b0e1208a..a6b0e1208a 100644
--- a/legacy/eet/src/examples/eet-data-nested.c
+++ b/src/examples/eet/eet-data-nested.c
diff --git a/legacy/eet/src/examples/eet-data-simple.c b/src/examples/eet/eet-data-simple.c
index 1951fc012b..1951fc012b 100644
--- a/legacy/eet/src/examples/eet-data-simple.c
+++ b/src/examples/eet/eet-data-simple.c
diff --git a/legacy/eet/src/examples/eet-file.c b/src/examples/eet/eet-file.c
index 740c179f7b..740c179f7b 100644
--- a/legacy/eet/src/examples/eet-file.c
+++ b/src/examples/eet/eet-file.c
diff --git a/src/examples/eina/Makefile.am b/src/examples/eina/Makefile.am
index 4656e47241..96e7735e50 100644
--- a/src/examples/eina/Makefile.am
+++ b/src/examples/eina/Makefile.am
@@ -112,7 +112,7 @@ install-examples:
112 mkdir -p $(pkgdatadir)/examples 112 mkdir -p $(pkgdatadir)/examples
113 $(install_sh_DATA) -c $(SRCS) $(pkgdatadir)/examples 113 $(install_sh_DATA) -c $(SRCS) $(pkgdatadir)/examples
114 114
115unsinstall-local: 115uninstall-local:
116 for f in $(SRCS) ; do \ 116 for f in $(SRCS) ; do \
117 rm -f $(pkgdatadir)/examples/$$f ; \ 117 rm -f $(pkgdatadir)/examples/$$f ; \
118 done 118 done
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 92c50645f5..8522639495 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -8,4 +8,4 @@ SUBDIRS += evil
8 8
9endif 9endif
10 10
11SUBDIRS += eina 11SUBDIRS += eina eet
diff --git a/legacy/eet/src/lib/Eet.h b/src/lib/eet/Eet.h
index 05f80e959f..05f80e959f 100644
--- a/legacy/eet/src/lib/Eet.h
+++ b/src/lib/eet/Eet.h
diff --git a/legacy/eet/src/lib/Eet_private.h b/src/lib/eet/Eet_private.h
index 20c12d75be..20c12d75be 100644
--- a/legacy/eet/src/lib/Eet_private.h
+++ b/src/lib/eet/Eet_private.h
diff --git a/src/lib/eet/Makefile.am b/src/lib/eet/Makefile.am
new file mode 100644
index 0000000000..e4d1c3b823
--- /dev/null
+++ b/src/lib/eet/Makefile.am
@@ -0,0 +1,43 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4AM_CPPFLAGS = \
5-I. \
6-I$(top_srcdir)/src/lib/eet \
7-I$(top_srcdir)/src/lib/eet/lz4 \
8-I$(top_builddir)/src/lib/eet \
9-I$(top_builddir)/src/lib/eet/lz4 \
10-DPACKAGE_BIN_DIR=\"$(bindir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
13@EET_CFLAGS@ \
14@EFL_EET_BUILD@
15
16includes_HEADERS = Eet.h
17includesdir = $(includedir)/eet-@VMAJ@
18
19lib_LTLIBRARIES = libeet.la
20
21libeet_la_SOURCES = \
22Eet_private.h \
23eet_alloc.c \
24eet_cipher.c \
25eet_connection.c \
26eet_data.c \
27eet_dictionary.c \
28eet_image.c \
29eet_lib.c \
30eet_node.c \
31eet_utils.c \
32lz4/lz4.c \
33lz4/lz4.h \
34lz4/lz4hc.c \
35lz4/lz4hc.h
36
37libeet_la_LIBADD = @EET_LIBS@ -lm
38libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
39
40EXTRA_DIST = lz4/README
41
42clean-local:
43 @rm -rf *.gcno
diff --git a/legacy/eet/src/lib/eet_alloc.c b/src/lib/eet/eet_alloc.c
index 310b1bff97..310b1bff97 100644
--- a/legacy/eet/src/lib/eet_alloc.c
+++ b/src/lib/eet/eet_alloc.c
diff --git a/legacy/eet/src/lib/eet_cipher.c b/src/lib/eet/eet_cipher.c
index 5bd9f25d0b..5bd9f25d0b 100644
--- a/legacy/eet/src/lib/eet_cipher.c
+++ b/src/lib/eet/eet_cipher.c
diff --git a/legacy/eet/src/lib/eet_connection.c b/src/lib/eet/eet_connection.c
index c044e3d11a..c044e3d11a 100644
--- a/legacy/eet/src/lib/eet_connection.c
+++ b/src/lib/eet/eet_connection.c
diff --git a/legacy/eet/src/lib/eet_data.c b/src/lib/eet/eet_data.c
index d06d3eaceb..d06d3eaceb 100644
--- a/legacy/eet/src/lib/eet_data.c
+++ b/src/lib/eet/eet_data.c
diff --git a/legacy/eet/src/lib/eet_dictionary.c b/src/lib/eet/eet_dictionary.c
index aef8ad2721..aef8ad2721 100644
--- a/legacy/eet/src/lib/eet_dictionary.c
+++ b/src/lib/eet/eet_dictionary.c
diff --git a/legacy/eet/src/lib/eet_image.c b/src/lib/eet/eet_image.c
index 00acda8d2b..00acda8d2b 100644
--- a/legacy/eet/src/lib/eet_image.c
+++ b/src/lib/eet/eet_image.c
diff --git a/legacy/eet/src/lib/eet_lib.c b/src/lib/eet/eet_lib.c
index 98c9225cb3..98c9225cb3 100644
--- a/legacy/eet/src/lib/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
diff --git a/legacy/eet/src/lib/eet_node.c b/src/lib/eet/eet_node.c
index faaa90587b..faaa90587b 100644
--- a/legacy/eet/src/lib/eet_node.c
+++ b/src/lib/eet/eet_node.c
diff --git a/legacy/eet/src/lib/eet_utils.c b/src/lib/eet/eet_utils.c
index b04ad1b525..b04ad1b525 100644
--- a/legacy/eet/src/lib/eet_utils.c
+++ b/src/lib/eet/eet_utils.c
diff --git a/legacy/eet/src/lib/lz4/README b/src/lib/eet/lz4/README
index 0abb85714a..0abb85714a 100644
--- a/legacy/eet/src/lib/lz4/README
+++ b/src/lib/eet/lz4/README
diff --git a/legacy/eet/src/lib/lz4/lz4.c b/src/lib/eet/lz4/lz4.c
index 06e2829707..06e2829707 100644
--- a/legacy/eet/src/lib/lz4/lz4.c
+++ b/src/lib/eet/lz4/lz4.c
diff --git a/legacy/eet/src/lib/lz4/lz4.h b/src/lib/eet/lz4/lz4.h
index ebd62b69a4..ebd62b69a4 100644
--- a/legacy/eet/src/lib/lz4/lz4.h
+++ b/src/lib/eet/lz4/lz4.h
diff --git a/legacy/eet/src/lib/lz4/lz4hc.c b/src/lib/eet/lz4/lz4hc.c
index cca755c26c..cca755c26c 100644
--- a/legacy/eet/src/lib/lz4/lz4hc.c
+++ b/src/lib/eet/lz4/lz4hc.c
diff --git a/legacy/eet/src/lib/lz4/lz4hc.h b/src/lib/eet/lz4/lz4hc.h
index cb74689f07..cb74689f07 100644
--- a/legacy/eet/src/lib/lz4/lz4hc.h
+++ b/src/lib/eet/lz4/lz4hc.h
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index b8f642fb72..45fa7fe5f4 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,3 +1,3 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = eina 3SUBDIRS = eina eet
diff --git a/src/tests/eet/Makefile.am b/src/tests/eet/Makefile.am
new file mode 100644
index 0000000000..b1a6ee94d0
--- /dev/null
+++ b/src/tests/eet/Makefile.am
@@ -0,0 +1,19 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib/eet \
5-I$(top_builddir)/src/lib/eet \
6-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests\" \
7@CHECK_CFLAGS@ \
8@EET_CFLAGS@
9
10if EFL_ENABLE_TESTS
11
12check_PROGRAMS = eet_suite
13
14eet_suite_SOURCES = eet_suite.c eet_data_suite.c eet_suite.h
15eet_suite_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
16
17endif
18
19EXTRA_DIST = cert.pem key_enc_none.pem key_enc.pem key.pem
diff --git a/legacy/eet/src/tests/TODO b/src/tests/eet/TODO
index da5fa1bd19..da5fa1bd19 100644
--- a/legacy/eet/src/tests/TODO
+++ b/src/tests/eet/TODO
diff --git a/legacy/eet/src/tests/cert.pem b/src/tests/eet/cert.pem
index 3265462d7b..3265462d7b 100644
--- a/legacy/eet/src/tests/cert.pem
+++ b/src/tests/eet/cert.pem
diff --git a/legacy/eet/src/tests/eet_data_suite.c b/src/tests/eet/eet_data_suite.c
index c4d5e5096b..c4d5e5096b 100644
--- a/legacy/eet/src/tests/eet_data_suite.c
+++ b/src/tests/eet/eet_data_suite.c
diff --git a/legacy/eet/src/tests/eet_suite.c b/src/tests/eet/eet_suite.c
index 91ef2a73ae..91ef2a73ae 100644
--- a/legacy/eet/src/tests/eet_suite.c
+++ b/src/tests/eet/eet_suite.c
diff --git a/legacy/eet/src/tests/eet_suite.h b/src/tests/eet/eet_suite.h
index c5c91aaee1..c5c91aaee1 100644
--- a/legacy/eet/src/tests/eet_suite.h
+++ b/src/tests/eet/eet_suite.h
diff --git a/legacy/eet/src/tests/key.pem b/src/tests/eet/key.pem
index 74763ca8c8..74763ca8c8 100644
--- a/legacy/eet/src/tests/key.pem
+++ b/src/tests/eet/key.pem
diff --git a/legacy/eet/src/tests/key_enc.pem b/src/tests/eet/key_enc.pem
index 83c1ba235b..83c1ba235b 100644
--- a/legacy/eet/src/tests/key_enc.pem
+++ b/src/tests/eet/key_enc.pem
diff --git a/legacy/eet/src/tests/key_enc_none.pem b/src/tests/eet/key_enc_none.pem
index 1163851906..1163851906 100644
--- a/legacy/eet/src/tests/key_enc_none.pem
+++ b/src/tests/eet/key_enc_none.pem