Make eet depends on eina.

SVN revision: 36842
This commit is contained in:
Cedric BAIL 2008-10-20 09:17:00 +00:00
parent ba9c2d3942
commit f08f865b75
4 changed files with 10 additions and 6 deletions

View File

@ -183,6 +183,8 @@ if test "x$prefer_assert" = "xno"; then
fi
AC_SUBST(DEBUG_CFLAGS)
PKG_CHECK_MODULES(EINA, [eina-0])
EFL_CHECK_DOXYGEN([enable_doc="yes"], [enable_doc="no"])
AC_OUTPUT([

View File

@ -7,12 +7,13 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\"
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@EINA_CFLAGS@
bin_PROGRAMS = eet
eet_SOURCES = eet_main.c
eet_CFLAGS = @WIN32_CFLAGS@
eet_LDADD = $(top_builddir)/src/lib/libeet.la
eet_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@
eet_LDFLAGS = @lt_enable_auto_import@
eet_DEPENDENCIES = $(top_builddir)/src/lib/libeet.la

View File

@ -9,6 +9,7 @@ AM_CPPFLAGS = \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@EVIL_CFLAGS@ \
@EINA_CFLAGS@ \
@EFL_COVERAGE_CFLAGS@ \
@OPENSSL_CFLAGS@
@ -25,7 +26,7 @@ eet_dictionary.c \
eet_utils.c
libeet_la_CFLAGS = @WIN32_CFLAGS@
libeet_la_LIBADD = @OPENSSL_LIBS@ @EFL_COVERAGE_LIBS@ @EVIL_LIBS@ @WIN32_LIBS@ -lz -ljpeg -lm
libeet_la_LIBADD = @OPENSSL_LIBS@ @EFL_COVERAGE_LIBS@ @EVIL_LIBS@ @WIN32_LIBS@ @EINA_LIBS@ -lz -ljpeg -lm
libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
EXTRA_DIST = Eet_private.h

View File

@ -2,15 +2,15 @@ MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib \
@CHECK_CFLAGS@
@CHECK_CFLAGS@ \
@EINA_CFLAGS@
if EFL_ENABLE_TESTS
check_PROGRAMS = eet_suite
eet_suite_SOURCES = eet_suite.c eet_data_suite.c
eet_suite_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/libeet.la
eet_suite_LDADD = @EINA_LIBS@ @CHECK_LIBS@ $(top_builddir)/src/lib/libeet.la
endif