forked from enlightenment/efl
Make efreet depend on eina. No change in the code yet, so just fix your build system and no bug must show up.
SVN revision: 36625
This commit is contained in:
parent
ab60bdaf87
commit
b6a71c63e6
|
@ -33,6 +33,7 @@ AC_FUNC_ALLOCA
|
||||||
PCFLAGS=$CFLAGS
|
PCFLAGS=$CFLAGS
|
||||||
|
|
||||||
PKG_CHECK_MODULES(ECORE, [ecore >= 0.9.9 ecore-file >= 0.9.9])
|
PKG_CHECK_MODULES(ECORE, [ecore >= 0.9.9 ecore-file >= 0.9.9])
|
||||||
|
PKG_CHECK_MODULES([EINA], [eina-0])
|
||||||
|
|
||||||
CFLAGS=$ECORE_CFLAGS" "$CFLAGS
|
CFLAGS=$ECORE_CFLAGS" "$CFLAGS
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ AM_CPPFLAGS = \
|
||||||
-I. \
|
-I. \
|
||||||
-I$(top_srcdir)/src/lib \
|
-I$(top_srcdir)/src/lib \
|
||||||
@ECORE_CFLAGS@ \
|
@ECORE_CFLAGS@ \
|
||||||
|
@EINA_CFLAGS@ \
|
||||||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||||
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\"
|
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\"
|
||||||
|
@ -17,7 +18,7 @@ efreet_test_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la \
|
||||||
$(top_builddir)/src/lib/libefreet_mime.la
|
$(top_builddir)/src/lib/libefreet_mime.la
|
||||||
efreet_test_LDADD = $(top_builddir)/src/lib/libefreet.la \
|
efreet_test_LDADD = $(top_builddir)/src/lib/libefreet.la \
|
||||||
$(top_builddir)/src/lib/libefreet_mime.la \
|
$(top_builddir)/src/lib/libefreet_mime.la \
|
||||||
@ECORE_LIBS@
|
@ECORE_LIBS@ @EINA_LIBS@
|
||||||
efreet_test_SOURCES = \
|
efreet_test_SOURCES = \
|
||||||
ef_test.h \
|
ef_test.h \
|
||||||
ef_data_dirs.c \
|
ef_data_dirs.c \
|
||||||
|
@ -35,11 +36,11 @@ ef_locale.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
efreet_spec_test_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la
|
efreet_spec_test_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la
|
||||||
efreet_spec_test_LDADD = $(top_builddir)/src/lib/libefreet.la
|
efreet_spec_test_LDADD = $(top_builddir)/src/lib/libefreet.la @EINA_LIBS@
|
||||||
efreet_spec_test_SOURCES = \
|
efreet_spec_test_SOURCES = \
|
||||||
efreet_spec_test.c
|
efreet_spec_test.c
|
||||||
|
|
||||||
efreet_cache_test_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la
|
efreet_cache_test_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la
|
||||||
efreet_cache_test_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@
|
efreet_cache_test_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@ @EINA_LIBS@
|
||||||
efreet_cache_test_SOURCES = \
|
efreet_cache_test_SOURCES = \
|
||||||
ef_cache.c
|
ef_cache.c
|
||||||
|
|
|
@ -3,15 +3,16 @@ MAINTAINERCLEANFILES = Makefile.in
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I. \
|
-I. \
|
||||||
-I$(top_srcdir)/src/lib \
|
-I$(top_srcdir)/src/lib \
|
||||||
|
@EINA_CFLAGS@ \
|
||||||
@ECORE_CFLAGS@
|
@ECORE_CFLAGS@
|
||||||
|
|
||||||
bin_PROGRAMS = efreet_alloc efreet_menu_alloc
|
bin_PROGRAMS = efreet_alloc efreet_menu_alloc
|
||||||
|
|
||||||
efreet_menu_alloc_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la
|
efreet_menu_alloc_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la
|
||||||
efreet_menu_alloc_SOURCES = efreet_menu_alloc.c comp.h
|
efreet_menu_alloc_SOURCES = efreet_menu_alloc.c comp.h
|
||||||
efreet_menu_alloc_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@
|
efreet_menu_alloc_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@ @EINA_LIBS@
|
||||||
|
|
||||||
efreet_alloc_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la
|
efreet_alloc_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la
|
||||||
efreet_alloc_SOURCES = efreet_alloc.c comp.h
|
efreet_alloc_SOURCES = efreet_alloc.c comp.h
|
||||||
efreet_alloc_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@
|
efreet_alloc_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@ @EINA_LIBS@
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,8 @@ MAINTAINERCLEANFILES = Makefile.in
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
@ECORE_CFLAGS@
|
@ECORE_CFLAGS@ \
|
||||||
|
@EINA_CFLAGS@
|
||||||
|
|
||||||
lib_LTLIBRARIES = libefreet.la libefreet_mime.la libefreet_trash.la
|
lib_LTLIBRARIES = libefreet.la libefreet_mime.la libefreet_trash.la
|
||||||
|
|
||||||
|
@ -60,8 +61,8 @@ $(EFREETTRASHSOURCES)
|
||||||
installed_headersdir = $(prefix)/include/efreet
|
installed_headersdir = $(prefix)/include/efreet
|
||||||
installed_headers_DATA = $(EFREETHEADERS) $(EFREETMIMEHEADERS) $(EFREETTRASHHEADERS)
|
installed_headers_DATA = $(EFREETHEADERS) $(EFREETMIMEHEADERS) $(EFREETTRASHHEADERS)
|
||||||
|
|
||||||
libefreet_la_LIBADD = @ECORE_LIBS@
|
libefreet_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@
|
||||||
libefreet_la_LDFLAGS = -version-info @version_info@
|
libefreet_la_LDFLAGS = -version-info @version_info@
|
||||||
|
|
||||||
libefreet_mime_la_LIBADD = @ECORE_LIBS@ libefreet.la
|
libefreet_mime_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@ libefreet.la
|
||||||
libefreet_trash_la_LIBADD = @ECORE_LIBS@ libefreet.la
|
libefreet_trash_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@ libefreet.la
|
||||||
|
|
Loading…
Reference in New Issue