merge: evil compile

SVN revision: 76471

2 files changed, 6 insertions, 6 deletions

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 @@
 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
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
 
 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