forked from enlightenment/efl
* remove useless iconv_cflags
* put iconv_libs to the correct libtool var SVN revision: 45794
This commit is contained in:
parent
b413db68cd
commit
e373b2c376
|
@ -380,7 +380,6 @@ fi
|
|||
AC_SUBST(fnmatch_libs)
|
||||
|
||||
# iconv library
|
||||
iconv_cflags=""
|
||||
iconv_libs=""
|
||||
have_iconv="no"
|
||||
AC_ARG_WITH([iconv-link],
|
||||
|
@ -405,7 +404,6 @@ if test "x${have_iconv}" = "xno" ; then
|
|||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST(iconv_cflags)
|
||||
AC_SUBST(iconv_libs)
|
||||
|
||||
|
||||
|
|
|
@ -7,8 +7,7 @@ AM_CPPFLAGS = \
|
|||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
||||
@EINA_CPPFLAGS@ \
|
||||
@EFL_EINA_BUILD@ \
|
||||
@iconv_cflags@
|
||||
@EFL_EINA_BUILD@
|
||||
|
||||
base_sources = \
|
||||
eina_error.c \
|
||||
|
@ -128,9 +127,9 @@ else
|
|||
libeina_la_SOURCES = $(base_sources)
|
||||
endif
|
||||
|
||||
libeina_la_LIBADD = @EINA_LIBS@ @dlopen_libs@
|
||||
libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ @iconv_libs@
|
||||
libeina_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ @iconv_cflags@
|
||||
libeina_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ @iconv_libs@
|
||||
libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
|
||||
libeina_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
|
||||
|
||||
clean-local:
|
||||
rm -rf *.gcno eina_amalgamation.c
|
||||
|
|
Loading…
Reference in New Issue