diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2012-09-11 17:11:37 +0000 |
---|---|---|
committer | Vincent Torri <vincent.torri@gmail.com> | 2012-09-11 17:11:37 +0000 |
commit | a96ba56971c37367c762278f67d78f7a0112b470 (patch) | |
tree | 42354721766865f91c28bace6f7bd9bec69e2a52 /src | |
parent | cd69ef4c8a66e7155967a8b661a014856979cf31 (diff) |
merge: fix++
SVN revision: 76466
Diffstat (limited to 'src')
-rw-r--r-- | src/bin/evil/Makefile.am | 2 | ||||
-rw-r--r-- | src/lib/evil/Makefile.am | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/evil/Makefile.am b/src/bin/evil/Makefile.am index 538bbdcc69..32984d5247 100644 --- a/src/bin/evil/Makefile.am +++ b/src/bin/evil/Makefile.am | |||
@@ -35,7 +35,7 @@ evil_test_print.h \ | |||
35 | evil_test_realpath.h \ | 35 | evil_test_realpath.h \ |
36 | evil_test_util.h | 36 | evil_test_util.h |
37 | 37 | ||
38 | if EVIL_HAVE_WINCE | 38 | if HAVE_WINCE |
39 | 39 | ||
40 | evil_suite_SOURCES += memcpy_glibc_arm.S | 40 | evil_suite_SOURCES += memcpy_glibc_arm.S |
41 | 41 | ||
diff --git a/src/lib/evil/Makefile.am b/src/lib/evil/Makefile.am index 62d0d56bf3..8876d77e8f 100644 --- a/src/lib/evil/Makefile.am +++ b/src/lib/evil/Makefile.am | |||
@@ -24,7 +24,7 @@ evil_util.h | |||
24 | stdheadersdir = $(includedir)/evil-@VMAJ@ | 24 | stdheadersdir = $(includedir)/evil-@VMAJ@ |
25 | nobase_dist_stdheaders_DATA = pwd.h sys/mman.h fnmatch.h dirent.h dlfcn.h | 25 | nobase_dist_stdheaders_DATA = pwd.h sys/mman.h fnmatch.h dirent.h dlfcn.h |
26 | 26 | ||
27 | if EVIL_HAVE_WINCE | 27 | if HAVE_WINCE |
28 | 28 | ||
29 | nobase_dist_stdheaders_DATA += mingw32ce/errno.h | 29 | nobase_dist_stdheaders_DATA += mingw32ce/errno.h |
30 | 30 | ||
@@ -85,7 +85,7 @@ evil_pformat.h \ | |||
85 | evil_private.h \ | 85 | evil_private.h \ |
86 | evil_fnmatch_private.h | 86 | evil_fnmatch_private.h |
87 | 87 | ||
88 | if EVIL_HAVE_WINCE | 88 | if HAVE_WINCE |
89 | 89 | ||
90 | libevil_la_SOURCES += evil_errno.c evil_link_ce.c | 90 | libevil_la_SOURCES += evil_errno.c evil_link_ce.c |
91 | 91 | ||
@@ -101,7 +101,7 @@ libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@ | |||
101 | libevil_la_LIBADD = @EVIL_LIBS@ | 101 | libevil_la_LIBADD = @EVIL_LIBS@ |
102 | libevil_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@ | 102 | libevil_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@ |
103 | 103 | ||
104 | if EVIL_HAVE_WINCE | 104 | if HAVE_WINCE |
105 | 105 | ||
106 | libevil_la_LINK = $(LINK) $(libevil_la_LDFLAGS) | 106 | libevil_la_LINK = $(LINK) $(libevil_la_LDFLAGS) |
107 | 107 | ||