summaryrefslogtreecommitdiff
path: root/legacy/evil
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-11 15:54:23 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-11 15:54:23 +0000
commit0ca69d1f2d2f378223bed712c9cdcd7e6679e305 (patch)
treeed42e2fd8c3584a26ed31a3a56215a08f653788c /legacy/evil
parenta00b9084eadd3d21a7629710876d600692257234 (diff)
Evil: rename variables
SVN revision: 76462
Diffstat (limited to 'legacy/evil')
-rw-r--r--legacy/evil/configure.ac36
-rw-r--r--legacy/evil/src/bin/Makefile.am4
-rw-r--r--legacy/evil/src/lib/Makefile.am14
3 files changed, 27 insertions, 27 deletions
diff --git a/legacy/evil/configure.ac b/legacy/evil/configure.ac
index dd60d661fe..8045d46840 100644
--- a/legacy/evil/configure.ac
+++ b/legacy/evil/configure.ac
@@ -73,20 +73,20 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
73 73
74### Checks for libraries 74### Checks for libraries
75 75
76win32_libs="" 76EVIL_LIBS=""
77win32_dl_libs="" 77EVIL_DLFCN_LIBS=""
78case "$host_os" in 78case "$host_os" in
79 mingw32ce*) 79 mingw32ce*)
80 win32_libs="-lws2" 80 EVIL_LIBS="-lws2"
81 win32_dl_libs="-ltoolhelp" 81 EVIL_DLFCN_LIBS="-ltoolhelp"
82 ;; 82 ;;
83 *) 83 *)
84 win32_libs="-lole32 -luuid -lws2_32 -lsecur32" 84 EVIL_LIBS="-lole32 -luuid -lws2_32 -lsecur32"
85 win32_dl_libs="-lpsapi" 85 EVIL_DLFCN_LIBS="-lpsapi"
86 ;; 86 ;;
87esac 87esac
88AC_SUBST([win32_libs]) 88AC_SUBST([EVIL_LIBS])
89AC_SUBST([win32_dl_libs]) 89AC_SUBST([EVIL_DLFCN_LIBS])
90 90
91 91
92### Checks for header files 92### Checks for header files
@@ -102,25 +102,25 @@ AC_CHECK_HEADERS([errno.h])
102### Checks for compiler characteristics 102### Checks for compiler characteristics
103EFL_ATTRIBUTE_UNUSED 103EFL_ATTRIBUTE_UNUSED
104 104
105win32_cppflags="" 105EVIL_CPPFLAGS="-DEFL_EVIL_BUILD"
106win32_cflags="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" 106EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1"
107win32_cflags="${win32_cflags} -mms-bitfields" 107EVIL_CFLAGS="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -mms-bitfields"
108win32_cxxflags="" 108EVIL_CXXFLAGS=""
109have_wince="no" 109have_wince="no"
110case "$host_os" in 110case "$host_os" in
111 mingw32ce*) 111 mingw32ce*)
112 have_wince="yes" 112 have_wince="yes"
113 win32_cppflags="${win32_cppflags}"
114 ;; 113 ;;
115 *) 114 *)
116 have_wince="no" 115 have_wince="no"
117 win32_cxxflags="-fno-rtti -fno-exceptions" 116 EVIL_CXXFLAGS="-fno-rtti -fno-exceptions"
118 win32_cppflags="${win32_cppflags} -DSECURITY_WIN32" 117 EVIL_CPPFLAGS="-DSECURITY_WIN32"
119 ;; 118 ;;
120esac 119esac
121AC_SUBST([win32_cppflags]) 120AC_SUBST([EVIL_CPPFLAGS])
122AC_SUBST([win32_cflags]) 121AC_SUBST([EVIL_DLFCN_CPPFLAGS])
123AC_SUBST([win32_cxxflags]) 122AC_SUBST([EVIL_CFLAGS])
123AC_SUBST([EVIL_CXXFLAGS])
124 124
125AM_CONDITIONAL(EVIL_HAVE_WINCE, test "x${have_wince}" = "xyes") 125AM_CONDITIONAL(EVIL_HAVE_WINCE, test "x${have_wince}" = "xyes")
126 126
diff --git a/legacy/evil/src/bin/Makefile.am b/legacy/evil/src/bin/Makefile.am
index 9748cdea59..538bbdcc69 100644
--- a/legacy/evil/src/bin/Makefile.am
+++ b/legacy/evil/src/bin/Makefile.am
@@ -5,9 +5,9 @@ AM_CPPFLAGS = \
5-I$(top_srcdir) \ 5-I$(top_srcdir) \
6-I$(top_srcdir)/bin \ 6-I$(top_srcdir)/bin \
7-I$(top_srcdir)/src/lib \ 7-I$(top_srcdir)/src/lib \
8@win32_cppflags@ 8@EVIL_CPPFLAGS@
9 9
10AM_CFLAGS = @win32_cflags@ 10AM_CFLAGS = @EVIL_CFLAGS@
11 11
12bin_PROGRAMS = evil_suite test_evil 12bin_PROGRAMS = evil_suite test_evil
13 13
diff --git a/legacy/evil/src/lib/Makefile.am b/legacy/evil/src/lib/Makefile.am
index 6f41347a20..62d0d56bf3 100644
--- a/legacy/evil/src/lib/Makefile.am
+++ b/legacy/evil/src/lib/Makefile.am
@@ -95,10 +95,10 @@ libevil_la_SOURCES += evil_link_xp.cpp
95 95
96endif 96endif
97 97
98libevil_la_CPPFLAGS = @win32_cppflags@ -DEFL_EVIL_BUILD 98libevil_la_CPPFLAGS = @EVIL_CPPFLAGS@
99libevil_la_CFLAGS = @win32_cflags@ 99libevil_la_CFLAGS = @EVIL_CFLAGS@
100libevil_la_CXXFLAGS = @win32_cxxflags@ 100libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@
101libevil_la_LIBADD = @win32_libs@ $(EFL_MPATROL_LIBS) 101libevil_la_LIBADD = @EVIL_LIBS@
102libevil_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@ 102libevil_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
103 103
104if EVIL_HAVE_WINCE 104if EVIL_HAVE_WINCE
@@ -113,9 +113,9 @@ endif
113 113
114libdl_la_SOURCES = dlfcn.c 114libdl_la_SOURCES = dlfcn.c
115 115
116libdl_la_CPPFLAGS = @win32_cppflags@ -DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1 116libdl_la_CPPFLAGS = @EVIL_DLFCN_CPPFLAGS@
117libdl_la_CFLAGS = @win32_cflags@ 117libdl_la_CFLAGS = @EVIL_CFLAGS@
118libdl_la_LIBADD = $(top_builddir)/src/lib/libevil.la $(EFL_MPATROL_LIBS) @win32_dl_libs@ 118libdl_la_LIBADD = $(top_builddir)/src/lib/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