forked from enlightenment/efl
* fix pkg-config requirements
* fix a bit the autotools SVN revision: 39754
This commit is contained in:
parent
98284f7849
commit
45e1663dab
|
@ -31,14 +31,10 @@ AC_SUBST(version_info)
|
|||
|
||||
AC_FUNC_ALLOCA
|
||||
|
||||
PCFLAGS=$CFLAGS
|
||||
PKG_CHECK_MODULES(EFREET, [eina-0 ecore >= 0.9.9 ecore-file >= 0.9.9])
|
||||
PKG_CHECK_MODULES(EINA, [eina-0])
|
||||
|
||||
PKG_CHECK_MODULES(ECORE, [ecore >= 0.9.9 ecore-file >= 0.9.9])
|
||||
PKG_CHECK_MODULES([EINA], [eina-0])
|
||||
|
||||
CFLAGS=$ECORE_CFLAGS" "$CFLAGS
|
||||
|
||||
requirements="ecore ecore-file"
|
||||
requirements="ecore-file ecore eina-0"
|
||||
|
||||
AC_ARG_ENABLE(strict-spec,
|
||||
[AC_HELP_STRING([--enable-strict-spec],[Enable strict spec compliance])],
|
||||
|
@ -54,8 +50,6 @@ if test "x$enable_sloppy_spec" = "xyes" ; then
|
|||
AC_DEFINE(SLOPPY_SPEC, 1, [Sloppy Spec Compliance])
|
||||
fi
|
||||
|
||||
CFLAGS=$PCFLAGS
|
||||
|
||||
AC_ARG_ENABLE(hidden-visibility,
|
||||
[AC_HELP_STRING([--enable-hidden-visibility],[Enable hidden visibility])],
|
||||
[enable_hidden_visibility=$enableval], [enable_hidden_visibility="auto"])
|
||||
|
|
|
@ -6,11 +6,10 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
AM_CPPFLAGS = \
|
||||
-I. \
|
||||
-I$(top_srcdir)/src/lib \
|
||||
@ECORE_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\"
|
||||
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
||||
@EFREET_CFLAGS@
|
||||
|
||||
bin_PROGRAMS = efreet_test efreet_spec_test efreet_cache_test
|
||||
|
||||
|
@ -18,7 +17,7 @@ efreet_test_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la \
|
|||
$(top_builddir)/src/lib/libefreet_mime.la
|
||||
efreet_test_LDADD = $(top_builddir)/src/lib/libefreet.la \
|
||||
$(top_builddir)/src/lib/libefreet_mime.la \
|
||||
@ECORE_LIBS@ @EINA_LIBS@
|
||||
@EFREET_LIBS@
|
||||
efreet_test_SOURCES = \
|
||||
ef_test.h \
|
||||
ef_data_dirs.c \
|
||||
|
@ -35,12 +34,10 @@ efreet_test_SOURCES += \
|
|||
ef_locale.c
|
||||
endif
|
||||
|
||||
efreet_spec_test_DEPENDENCIES = $(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.c
|
||||
|
||||
efreet_cache_test_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la
|
||||
efreet_cache_test_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@ @EINA_LIBS@
|
||||
efreet_cache_test_LDADD = $(top_builddir)/src/lib/libefreet.la @EFREET_LIBS@
|
||||
efreet_cache_test_SOURCES = \
|
||||
ef_cache.c
|
||||
|
|
|
@ -3,16 +3,13 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
AM_CPPFLAGS = \
|
||||
-I. \
|
||||
-I$(top_srcdir)/src/lib \
|
||||
@EINA_CFLAGS@ \
|
||||
@ECORE_CFLAGS@
|
||||
@EFREET_CFLAGS@
|
||||
|
||||
bin_PROGRAMS = efreet_alloc efreet_menu_alloc
|
||||
|
||||
efreet_menu_alloc_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la
|
||||
efreet_menu_alloc_SOURCES = efreet_menu_alloc.c comp.h
|
||||
efreet_menu_alloc_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@ @EINA_LIBS@
|
||||
efreet_menu_alloc_LDADD = $(top_builddir)/src/lib/libefreet.la @EFREET_LIBS@
|
||||
|
||||
efreet_alloc_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la
|
||||
efreet_alloc_SOURCES = efreet_alloc.c comp.h
|
||||
efreet_alloc_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@ @EINA_LIBS@
|
||||
efreet_alloc_LDADD = $(top_builddir)/src/lib/libefreet.la @EFREET_LIBS@
|
||||
|
||||
|
|
|
@ -4,8 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_builddir) \
|
||||
-I$(top_srcdir) \
|
||||
@ECORE_CFLAGS@ \
|
||||
@EINA_CFLAGS@
|
||||
@EFREET_CFLAGS@
|
||||
|
||||
lib_LTLIBRARIES = libefreet.la libefreet_mime.la libefreet_trash.la
|
||||
|
||||
|
@ -62,8 +61,8 @@ $(EFREETTRASHSOURCES)
|
|||
installed_headersdir = $(prefix)/include/efreet
|
||||
installed_headers_DATA = $(EFREETHEADERS) $(EFREETMIMEHEADERS) $(EFREETTRASHHEADERS)
|
||||
|
||||
libefreet_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@
|
||||
libefreet_la_LIBADD = @EFREET_LIBS@
|
||||
libefreet_la_LDFLAGS = -version-info @version_info@
|
||||
|
||||
libefreet_mime_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@ libefreet.la
|
||||
libefreet_trash_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@ libefreet.la
|
||||
libefreet_mime_la_LIBADD = @EFREET_LIBS@ libefreet.la
|
||||
libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la
|
||||
|
|
Loading…
Reference in New Issue