merge: evil compile

SVN revision: 76471
This commit is contained in:
Vincent Torri 2012-09-11 17:44:59 +00:00
parent 37cfda6c14
commit d2d31d5d56
4 changed files with 22 additions and 7 deletions

View File

@ -10,6 +10,7 @@ config.h.in \
config.h.in~ \
config.sub \
configure \
depcomp \
install-sh \
ltmain.sh \
missing \
@ -25,6 +26,17 @@ m4/efl_compiler.m4 \
m4/efl_doxygen.m4 \
m4/evil_windows.m4
if HAVE_WINDOWS
EXTRA_DIST += evil.pc
endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA =
if HAVE_WINDOWS
pkgconfig_DATA += evil.pc
endif
.PHONY: doc

View File

@ -248,7 +248,7 @@ case "$host_os" in
EVIL_DLFCN_LIBS="-ltoolhelp"
;;
*)
EVIL_LIBS="-lole32 -lws2_32 -lsecur32"
EVIL_LIBS="-luuid -lole32 -lws2_32 -lsecur32"
EVIL_DLFCN_LIBS="-lpsapi"
;;
esac
@ -267,6 +267,7 @@ AC_CHECK_HEADERS([errno.h])
### Checks for compiler characteristics
EVIL_CPPFLAGS="-DEFL_EVIL_BUILD"
EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1"
EVIL_CFLAGS="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -mms-bitfields"
EVIL_CXXFLAGS=""
@ -276,6 +277,7 @@ if test "x${have_win32}" = "xyes" ; then
fi
AC_SUBST([EVIL_CPPFLAGS])
AC_SUBST([EVIL_DLFCN_CPPFLAGS])
AC_SUBST([EVIL_CFLAGS])
AC_SUBST([EVIL_CXXFLAGS])
@ -313,6 +315,7 @@ src/bin/Makefile
src/bin/evil/Makefile
src/lib/Makefile
src/lib/evil/Makefile
evil.pc
])
AC_OUTPUT

View File

@ -2,9 +2,9 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/bin \
-I$(top_srcdir)/src/lib \
-I. \
-I$(top_srcdir)/src/lib/evil \
-I$(top_builddir)/src/lib/evil \
@EVIL_CPPFLAGS@
AM_CFLAGS = @EVIL_CFLAGS@
@ -45,9 +45,9 @@ evil_suite_SOURCES += memcpy_glibc_arm.S
endif
evil_suite_LDADD = $(top_builddir)/src/lib/libdl.la $(top_builddir)/src/lib/libevil.la -lm
evil_suite_LDADD = $(top_builddir)/src/lib/evil/libdl.la $(top_builddir)/src/lib/evil/libevil.la -lm
evil_suite_LDFLAGS = -Wl,--enable-auto-import
test_evil_SOURCES = test_evil.c
test_evil_LDADD = $(top_builddir)/src/lib/libevil.la
test_evil_LDADD = $(top_builddir)/src/lib/evil/libevil.la
test_evil_LDFLAGS = -Wl,--enable-auto-import

View File

@ -115,7 +115,7 @@ libdl_la_SOURCES = dlfcn.c
libdl_la_CPPFLAGS = @EVIL_DLFCN_CPPFLAGS@
libdl_la_CFLAGS = @EVIL_CFLAGS@
libdl_la_LIBADD = $(top_builddir)/src/lib/libevil.la @EVIL_DLFCN_LIBS@
libdl_la_LIBADD = $(top_builddir)/src/lib/evil/libevil.la @EVIL_DLFCN_LIBS@
libdl_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
EXTRA_DIST = gdtoa/README gdtoa/README.mingw