summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-11 17:44:59 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-11 17:44:59 +0000
commitd2d31d5d5603dd24c4f1ea52c137ffab7218eea6 (patch)
tree818f8415029e066d0da1b74e7f382cd4cb9722bc
parent37cfda6c1412ce5decb302b3739e6bc639783e2a (diff)
merge: evil compile
SVN revision: 76471
-rw-r--r--Makefile.am12
-rw-r--r--configure.ac5
-rw-r--r--src/bin/evil/Makefile.am10
-rw-r--r--src/lib/evil/Makefile.am2
4 files changed, 22 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index d5c643a611..5da702b397 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ config.h.in \
10config.h.in~ \ 10config.h.in~ \
11config.sub \ 11config.sub \
12configure \ 12configure \
13depcomp \
13install-sh \ 14install-sh \
14ltmain.sh \ 15ltmain.sh \
15missing \ 16missing \
@@ -25,6 +26,17 @@ m4/efl_compiler.m4 \
25m4/efl_doxygen.m4 \ 26m4/efl_doxygen.m4 \
26m4/evil_windows.m4 27m4/evil_windows.m4
27 28
29if HAVE_WINDOWS
30EXTRA_DIST += evil.pc
31endif
32
33pkgconfigdir = $(libdir)/pkgconfig
34pkgconfig_DATA =
35
36if HAVE_WINDOWS
37pkgconfig_DATA += evil.pc
38endif
39
28 40
29.PHONY: doc 41.PHONY: doc
30 42
diff --git a/configure.ac b/configure.ac
index 7aa0a78875..fee52f4e86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -248,7 +248,7 @@ case "$host_os" in
248 EVIL_DLFCN_LIBS="-ltoolhelp" 248 EVIL_DLFCN_LIBS="-ltoolhelp"
249 ;; 249 ;;
250 *) 250 *)
251 EVIL_LIBS="-lole32 -lws2_32 -lsecur32" 251 EVIL_LIBS="-luuid -lole32 -lws2_32 -lsecur32"
252 EVIL_DLFCN_LIBS="-lpsapi" 252 EVIL_DLFCN_LIBS="-lpsapi"
253 ;; 253 ;;
254esac 254esac
@@ -267,6 +267,7 @@ AC_CHECK_HEADERS([errno.h])
267### Checks for compiler characteristics 267### Checks for compiler characteristics
268 268
269EVIL_CPPFLAGS="-DEFL_EVIL_BUILD" 269EVIL_CPPFLAGS="-DEFL_EVIL_BUILD"
270EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1"
270EVIL_CFLAGS="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -mms-bitfields" 271EVIL_CFLAGS="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -mms-bitfields"
271EVIL_CXXFLAGS="" 272EVIL_CXXFLAGS=""
272 273
@@ -276,6 +277,7 @@ if test "x${have_win32}" = "xyes" ; then
276fi 277fi
277 278
278AC_SUBST([EVIL_CPPFLAGS]) 279AC_SUBST([EVIL_CPPFLAGS])
280AC_SUBST([EVIL_DLFCN_CPPFLAGS])
279AC_SUBST([EVIL_CFLAGS]) 281AC_SUBST([EVIL_CFLAGS])
280AC_SUBST([EVIL_CXXFLAGS]) 282AC_SUBST([EVIL_CXXFLAGS])
281 283
@@ -313,6 +315,7 @@ src/bin/Makefile
313src/bin/evil/Makefile 315src/bin/evil/Makefile
314src/lib/Makefile 316src/lib/Makefile
315src/lib/evil/Makefile 317src/lib/evil/Makefile
318evil.pc
316]) 319])
317 320
318AC_OUTPUT 321AC_OUTPUT
diff --git a/src/bin/evil/Makefile.am b/src/bin/evil/Makefile.am
index 32984d5247..cf424f5a52 100644
--- a/src/bin/evil/Makefile.am
+++ b/src/bin/evil/Makefile.am
@@ -2,9 +2,9 @@
2MAINTAINERCLEANFILES = Makefile.in 2MAINTAINERCLEANFILES = Makefile.in
3 3
4AM_CPPFLAGS = \ 4AM_CPPFLAGS = \
5-I$(top_srcdir) \ 5-I. \
6-I$(top_srcdir)/bin \ 6-I$(top_srcdir)/src/lib/evil \
7-I$(top_srcdir)/src/lib \ 7-I$(top_builddir)/src/lib/evil \
8@EVIL_CPPFLAGS@ 8@EVIL_CPPFLAGS@
9 9
10AM_CFLAGS = @EVIL_CFLAGS@ 10AM_CFLAGS = @EVIL_CFLAGS@
@@ -45,9 +45,9 @@ evil_suite_SOURCES += memcpy_glibc_arm.S
45 45
46endif 46endif
47 47
48evil_suite_LDADD = $(top_builddir)/src/lib/libdl.la $(top_builddir)/src/lib/libevil.la -lm 48evil_suite_LDADD = $(top_builddir)/src/lib/evil/libdl.la $(top_builddir)/src/lib/evil/libevil.la -lm
49evil_suite_LDFLAGS = -Wl,--enable-auto-import 49evil_suite_LDFLAGS = -Wl,--enable-auto-import
50 50
51test_evil_SOURCES = test_evil.c 51test_evil_SOURCES = test_evil.c
52test_evil_LDADD = $(top_builddir)/src/lib/libevil.la 52test_evil_LDADD = $(top_builddir)/src/lib/evil/libevil.la
53test_evil_LDFLAGS = -Wl,--enable-auto-import 53test_evil_LDFLAGS = -Wl,--enable-auto-import
diff --git a/src/lib/evil/Makefile.am b/src/lib/evil/Makefile.am
index 8876d77e8f..65e240c892 100644
--- a/src/lib/evil/Makefile.am
+++ b/src/lib/evil/Makefile.am
@@ -115,7 +115,7 @@ libdl_la_SOURCES = dlfcn.c
115 115
116libdl_la_CPPFLAGS = @EVIL_DLFCN_CPPFLAGS@ 116libdl_la_CPPFLAGS = @EVIL_DLFCN_CPPFLAGS@
117libdl_la_CFLAGS = @EVIL_CFLAGS@ 117libdl_la_CFLAGS = @EVIL_CFLAGS@
118libdl_la_LIBADD = $(top_builddir)/src/lib/libevil.la @EVIL_DLFCN_LIBS@ 118libdl_la_LIBADD = $(top_builddir)/src/lib/evil/libevil.la @EVIL_DLFCN_LIBS@
119libdl_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@ 119libdl_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
120 120
121EXTRA_DIST = gdtoa/README gdtoa/README.mingw 121EXTRA_DIST = gdtoa/README gdtoa/README.mingw