summaryrefslogtreecommitdiff
path: root/src/Makefile_Evil.am
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-11-06 23:07:05 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-11-06 23:07:05 +0000
commitc163de7b32e38b99961c7bf65ab78e8ce1c013e2 (patch)
treefc3365e854d6bf463323c8063ff56e8d8293e13c /src/Makefile_Evil.am
parent51db47a9d3bd29ba51a9db0c869543c679b66085 (diff)
merge: fix compilation on Windows
SVN revision: 78952
Diffstat (limited to 'src/Makefile_Evil.am')
-rw-r--r--src/Makefile_Evil.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index cd5797ddd3..4eb8b56616 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -104,9 +104,9 @@ lib_evil_libevil_la_LIBADD = @EVIL_LIBS@
104lib_evil_libevil_la_LDFLAGS = -no-undefined -version-info @version_info@ 104lib_evil_libevil_la_LDFLAGS = -no-undefined -version-info @version_info@
105 105
106if HAVE_WINCE 106if HAVE_WINCE
107lib_evil_libevil_la_LINK = $(LINK) $(libevil_la_LDFLAGS) 107lib_evil_libevil_la_LINK = $(LINK) $(lib_evil_libevil_la_LDFLAGS)
108else 108else
109lib_evil_libevil_la_LINK = $(CXXLINK) $(libevil_la_LDFLAGS) 109lib_evil_libevil_la_LINK = $(CXXLINK) $(lib_evil_libevil_la_LDFLAGS)
110endif 110endif
111 111
112lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c 112lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c
@@ -118,7 +118,7 @@ lib_evil_libdl_la_CPPFLAGS = \
118 118
119lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@ 119lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@
120 120
121lib_evil_libdl_la_LIBADD = $(top_builddir)/src/lib/evil/libevil.la @EVIL_DLFCN_LIBS@ 121lib_evil_libdl_la_LIBADD = lib/evil/libevil.la @EVIL_DLFCN_LIBS@
122 122
123lib_evil_libdl_la_LDFLAGS = -no-undefined -version-info @version_info@ 123lib_evil_libdl_la_LDFLAGS = -no-undefined -version-info @version_info@
124 124
@@ -172,7 +172,7 @@ endif
172 172
173bin_evil_evil_suite_LDADD = \ 173bin_evil_evil_suite_LDADD = \
174lib/evil/libevil.la \ 174lib/evil/libevil.la \
175lib/eina/libdl.la \ 175lib/evil/libdl.la \
176-lm 176-lm
177 177
178bin_evil_test_evil_SOURCES = bin/evil/test_evil.c 178bin_evil_test_evil_SOURCES = bin/evil/test_evil.c