summaryrefslogtreecommitdiff
path: root/legacy/eet/src
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-07-01 09:47:48 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-07-01 09:47:48 +0000
commit344b3f5d84b4ed4c7af958d46c303d6efb753847 (patch)
tree4b05d0ac320ec19fbb137edbe5c4dfed7b0a16cc /legacy/eet/src
parent54f22b1e7bccfa2895a960f0d432d27c529cc8c4 (diff)
Eet: add nice m4 macros to check functions and libraries. Will be usable easily in the merge, per EFL lib
Please, test. config.h is the same (except useless macro HAVE_ICONV_H) and compilation is correct on linux and mingw here SVN revision: 73095
Diffstat (limited to 'legacy/eet/src')
-rw-r--r--legacy/eet/src/bin/Makefile.am7
-rw-r--r--legacy/eet/src/lib/Makefile.am12
-rw-r--r--legacy/eet/src/tests/Makefile.am8
3 files changed, 10 insertions, 17 deletions
diff --git a/legacy/eet/src/bin/Makefile.am b/legacy/eet/src/bin/Makefile.am
index 89c68f1dca..3b83f76534 100644
--- a/legacy/eet/src/bin/Makefile.am
+++ b/legacy/eet/src/bin/Makefile.am
@@ -8,14 +8,11 @@ AM_CPPFLAGS = \
8-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 8-DPACKAGE_BIN_DIR=\"$(bindir)\" \
9-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 9-DPACKAGE_LIB_DIR=\"$(libdir)\" \
10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
11@EET_CPPFLAGS@ \ 11@EET_CFLAGS@
12@EINA_CFLAGS@ \
13@EVIL_CFLAGS@
14 12
15bin_PROGRAMS = @EET_PRG@ 13bin_PROGRAMS = @EET_PRG@
16EXTRA_PROGRAMS = eet 14EXTRA_PROGRAMS = eet
17 15
18eet_SOURCES = eet_main.c 16eet_SOURCES = eet_main.c
19eet_CFLAGS = @EET_CFLAGS@ 17eet_LDADD = $(top_builddir)/src/lib/libeet.la @EET_LIBS@
20eet_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ @EVIL_LIBS@ @EXOTIC_LIBS@
21eet_LDFLAGS = @lt_enable_auto_import@ 18eet_LDFLAGS = @lt_enable_auto_import@
diff --git a/legacy/eet/src/lib/Makefile.am b/legacy/eet/src/lib/Makefile.am
index bcd6cebb5b..71a233f7ce 100644
--- a/legacy/eet/src/lib/Makefile.am
+++ b/legacy/eet/src/lib/Makefile.am
@@ -9,13 +9,9 @@ AM_CPPFLAGS = \
9-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 9-DPACKAGE_BIN_DIR=\"$(bindir)\" \
10-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 10-DPACKAGE_LIB_DIR=\"$(libdir)\" \
11-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 11-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
12@EVIL_CFLAGS@ \ 12@EET_CFLAGS@ \
13@EINA_CFLAGS@ \
14@EET_CPPFLAGS@ \
15@EFL_EET_BUILD@ \ 13@EFL_EET_BUILD@ \
16@EFL_COVERAGE_CFLAGS@ \ 14@EFL_COVERAGE_CFLAGS@
17@OPENSSL_CFLAGS@ \
18@GNUTLS_CFLAGS@
19 15
20includes_HEADERS = Eet.h 16includes_HEADERS = Eet.h
21includesdir = $(includedir)/eet-@VMAJ@ 17includesdir = $(includedir)/eet-@VMAJ@
@@ -38,8 +34,8 @@ lz4/lz4.h \
38lz4/lz4hc.c \ 34lz4/lz4hc.c \
39lz4/lz4hc.h 35lz4/lz4hc.h
40 36
41libeet_la_CFLAGS = @EET_CFLAGS@ @DEBUG_CFLAGS@ 37libeet_la_CFLAGS = @DEBUG_CFLAGS@
42libeet_la_LIBADD = @GNUTLS_LIBS@ @OPENSSL_LIBS@ @EFL_COVERAGE_LIBS@ @EET_LIBS@ @EINA_LIBS@ @EVIL_LIBS@ -lz -ljpeg -lm 38libeet_la_LIBADD = @EFL_COVERAGE_LIBS@ @EET_LIBS@ -lm
43libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ 39libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
44 40
45EXTRA_DIST = lz4/README 41EXTRA_DIST = lz4/README
diff --git a/legacy/eet/src/tests/Makefile.am b/legacy/eet/src/tests/Makefile.am
index 61158f713a..d318f4129a 100644
--- a/legacy/eet/src/tests/Makefile.am
+++ b/legacy/eet/src/tests/Makefile.am
@@ -4,15 +4,15 @@ AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib \ 4-I$(top_srcdir)/src/lib \
5-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests\" \ 5-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests\" \
6@CHECK_CFLAGS@ \ 6@CHECK_CFLAGS@ \
7@EINA_CFLAGS@ 7@EET_CFLAGS@
8 8
9if EFL_ENABLE_TESTS 9if EFL_ENABLE_TESTS
10 10
11check_PROGRAMS = eet_suite 11check_PROGRAMS = eet_suite
12 12
13eet_suite_SOURCES = eet_suite.c eet_data_suite.c 13eet_suite_SOURCES = eet_suite.c eet_data_suite.c eet_suite.h
14eet_suite_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ @CHECK_LIBS@ 14eet_suite_LDADD = $(top_builddir)/src/lib/libeet.la @EET_LIBS@ @CHECK_LIBS@
15 15
16endif 16endif
17 17
18EXTRA_DIST = eet_suite.h cert.pem key_enc_none.pem key_enc.pem key.pem 18EXTRA_DIST = cert.pem key_enc_none.pem key_enc.pem key.pem