forked from enlightenment/efl
Make edje depend on eina. No change in the code yet, so just fix your build system and no bug must show up.
SVN revision: 36623
This commit is contained in:
parent
3d49d88a32
commit
ab60bdaf87
|
@ -38,6 +38,8 @@ PKG_PROG_PKG_CONFIG
|
||||||
|
|
||||||
AC_FUNC_ALLOCA
|
AC_FUNC_ALLOCA
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES([EINA], [eina-0])
|
||||||
|
|
||||||
WIN32_CFLAGS=""
|
WIN32_CFLAGS=""
|
||||||
lt_no_undefined=""
|
lt_no_undefined=""
|
||||||
lt_enable_auto_import=""
|
lt_enable_auto_import=""
|
||||||
|
|
|
@ -11,7 +11,8 @@ AM_CPPFLAGS = \
|
||||||
@EDJE_CFLAGS@ \
|
@EDJE_CFLAGS@ \
|
||||||
@ECORE_EVAS_CFLAGS@ \
|
@ECORE_EVAS_CFLAGS@ \
|
||||||
@ECORE_FILE_CFLAGS@ \
|
@ECORE_FILE_CFLAGS@ \
|
||||||
@EVIL_CFLAGS@
|
@EVIL_CFLAGS@ \
|
||||||
|
@EINA_CFLAGS@
|
||||||
|
|
||||||
if BUILD_EDJE_CC
|
if BUILD_EDJE_CC
|
||||||
EDJE_CC = edje_cc
|
EDJE_CC = edje_cc
|
||||||
|
@ -50,7 +51,7 @@ edje_prefix.h \
|
||||||
edje_main.h
|
edje_main.h
|
||||||
|
|
||||||
edje_cc_CFLAGS = @WIN32_CFLAGS@
|
edje_cc_CFLAGS = @WIN32_CFLAGS@
|
||||||
edje_cc_LDADD = $(top_builddir)/src/lib/libedje.la $(EDJE_LIBS) $(ECORE_EVAS_LIBS) $(EVIL_LIBS)
|
edje_cc_LDADD = $(top_builddir)/src/lib/libedje.la $(EDJE_LIBS) $(ECORE_EVAS_LIBS) $(EVIL_LIBS) $(EINA_LIBS)
|
||||||
edje_cc_LDFLAGS = @lt_enable_auto_import@
|
edje_cc_LDFLAGS = @lt_enable_auto_import@
|
||||||
edje_cc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
|
edje_cc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
|
||||||
|
|
||||||
|
@ -62,6 +63,6 @@ edje_cc_mem.c \
|
||||||
edje_cc_sources.c
|
edje_cc_sources.c
|
||||||
|
|
||||||
edje_decc_CFLAGS = @WIN32_CFLAGS@
|
edje_decc_CFLAGS = @WIN32_CFLAGS@
|
||||||
edje_decc_LDADD = $(top_builddir)/src/lib/libedje.la $(EDJE_LIBS) $(ECORE_EVAS_LIBS) $(ECORE_FILE_LIBS) $(EVIL_LIBS)
|
edje_decc_LDADD = $(top_builddir)/src/lib/libedje.la $(EDJE_LIBS) $(ECORE_EVAS_LIBS) $(ECORE_FILE_LIBS) $(EVIL_LIBS) $(EINA_LIBS)
|
||||||
edje_decc_LDFLAGS = @lt_enable_auto_import@
|
edje_decc_LDFLAGS = @lt_enable_auto_import@
|
||||||
edje_decc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
|
edje_decc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
|
||||||
|
|
|
@ -10,7 +10,8 @@ AM_CPPFLAGS = \
|
||||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||||
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
||||||
@EDJE_CFLAGS@ \
|
@EDJE_CFLAGS@ \
|
||||||
@EVIL_CFLAGS@
|
@EVIL_CFLAGS@ \
|
||||||
|
@EINA_CFLAGS@
|
||||||
|
|
||||||
lib_LTLIBRARIES = \
|
lib_LTLIBRARIES = \
|
||||||
libedje.la
|
libedje.la
|
||||||
|
@ -44,6 +45,6 @@ edje_script_only.c \
|
||||||
edje_entry.c
|
edje_entry.c
|
||||||
|
|
||||||
libedje_la_CFLAGS = @WIN32_CFLAGS@
|
libedje_la_CFLAGS = @WIN32_CFLAGS@
|
||||||
libedje_la_LIBADD = @EDJE_LIBS@ -lm
|
libedje_la_LIBADD = @EDJE_LIBS@ @EINA_LIBS@ -lm
|
||||||
libedje_la_DEPENDENCIES = $(top_builddir)/config.h
|
libedje_la_DEPENDENCIES = $(top_builddir)/config.h
|
||||||
libedje_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
|
libedje_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
|
||||||
|
|
Loading…
Reference in New Issue