summaryrefslogtreecommitdiff
path: root/legacy/evil/src
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-08-19 08:59:51 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-08-19 08:59:51 +0000
commitcba9a2a11c4cfcb622d2e7984f3ab93287be6388 (patch)
tree9332250bc7953c442198240073666c510f4dda21 /legacy/evil/src
parent8d6dbed30dfc0606dd9a8c027fd7de646b40fd2f (diff)
Evil: less automake stuff, and remove warnings.
currently, distcheck fails because I remove the .la files when installing (so actually, it's uninstall which fails). I'll fix that later. SVN revision: 75425
Diffstat (limited to 'legacy/evil/src')
-rw-r--r--legacy/evil/src/bin/Makefile.am3
-rw-r--r--legacy/evil/src/lib/Makefile.am48
-rw-r--r--legacy/evil/src/lib/dlfcn.c (renamed from legacy/evil/src/lib/dlfcn/dlfcn.c)2
-rw-r--r--legacy/evil/src/lib/dlfcn.h (renamed from legacy/evil/src/lib/dlfcn/dlfcn.h)0
-rw-r--r--legacy/evil/src/lib/gdtoa/Makefile.am35
-rw-r--r--legacy/evil/src/lib/gdtoa/gdtoaimp.h4
6 files changed, 48 insertions, 44 deletions
diff --git a/legacy/evil/src/bin/Makefile.am b/legacy/evil/src/bin/Makefile.am
index c0120336e0..9748cdea59 100644
--- a/legacy/evil/src/bin/Makefile.am
+++ b/legacy/evil/src/bin/Makefile.am
@@ -5,7 +5,6 @@ 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-I$(top_srcdir)/src/lib/dlfcn \
9@win32_cppflags@ 8@win32_cppflags@
10 9
11AM_CFLAGS = @win32_cflags@ 10AM_CFLAGS = @win32_cflags@
@@ -46,7 +45,7 @@ evil_suite_SOURCES += memcpy_glibc_arm.S
46 45
47endif 46endif
48 47
49evil_suite_LDADD = $(top_builddir)/src/lib/dlfcn/libdl.la $(top_builddir)/src/lib/libevil.la -lm 48evil_suite_LDADD = $(top_builddir)/src/lib/libdl.la $(top_builddir)/src/lib/libevil.la -lm
50evil_suite_LDFLAGS = -Wl,--enable-auto-import 49evil_suite_LDFLAGS = -Wl,--enable-auto-import
51 50
52test_evil_SOURCES = test_evil.c 51test_evil_SOURCES = test_evil.c
diff --git a/legacy/evil/src/lib/Makefile.am b/legacy/evil/src/lib/Makefile.am
index 7c16667b22..bbcb1729ed 100644
--- a/legacy/evil/src/lib/Makefile.am
+++ b/legacy/evil/src/lib/Makefile.am
@@ -1,9 +1,7 @@
1 1
2MAINTAINERCLEANFILES = Makefile.in 2MAINTAINERCLEANFILES = Makefile.in
3 3
4SUBDIRS = gdtoa . dlfcn 4lib_LTLIBRARIES = libevil.la libdl.la
5
6lib_LTLIBRARIES = libevil.la
7 5
8install_evilheadersdir = $(includedir)/evil-@VMAJ@ 6install_evilheadersdir = $(includedir)/evil-@VMAJ@
9dist_install_evilheaders_DATA = \ 7dist_install_evilheaders_DATA = \
@@ -24,7 +22,7 @@ evil_unistd.h \
24evil_util.h 22evil_util.h
25 23
26stdheadersdir = $(includedir)/evil-@VMAJ@ 24stdheadersdir = $(includedir)/evil-@VMAJ@
27nobase_dist_stdheaders_DATA = pwd.h sys/mman.h fnmatch.h dirent.h 25nobase_dist_stdheaders_DATA = pwd.h sys/mman.h fnmatch.h dirent.h dlfcn.h
28 26
29if EVIL_HAVE_WINCE 27if EVIL_HAVE_WINCE
30 28
@@ -32,7 +30,36 @@ nobase_dist_stdheaders_DATA += mingw32ce/errno.h
32 30
33endif 31endif
34 32
33# gdtoa
35libevil_la_SOURCES = \ 34libevil_la_SOURCES = \
35gdtoa/arithchk.c \
36gdtoa/dmisc.c \
37gdtoa/dtoa.c \
38gdtoa/gd_arith.h \
39gdtoa/g_dfmt.c \
40gdtoa/gd_qnan.h \
41gdtoa/gdtoa.c \
42gdtoa/gdtoa_fltrnds.h \
43gdtoa/gdtoa.h \
44gdtoa/gdtoaimp.h \
45gdtoa/gethex.c \
46gdtoa/g_ffmt.c \
47gdtoa/g__fmt.c \
48gdtoa/gmisc.c \
49gdtoa/g_xfmt.c \
50gdtoa/hd_init.c \
51gdtoa/hexnan.c \
52gdtoa/misc.c \
53gdtoa/qnan.c \
54gdtoa/smisc.c \
55gdtoa/strtodg.c \
56gdtoa/strtof.c \
57gdtoa/strtopx.c \
58gdtoa/sum.c \
59gdtoa/ulp.c
60
61#evil
62libevil_la_SOURCES += \
36evil_dirent.c \ 63evil_dirent.c \
37evil_fcntl.c \ 64evil_fcntl.c \
38evil_fnmatch.c \ 65evil_fnmatch.c \
@@ -71,7 +98,7 @@ endif
71libevil_la_CPPFLAGS = @win32_cppflags@ -DEFL_EVIL_BUILD 98libevil_la_CPPFLAGS = @win32_cppflags@ -DEFL_EVIL_BUILD
72libevil_la_CFLAGS = @win32_cflags@ 99libevil_la_CFLAGS = @win32_cflags@
73libevil_la_CXXFLAGS = @win32_cxxflags@ 100libevil_la_CXXFLAGS = @win32_cxxflags@
74libevil_la_LIBADD = gdtoa/libgdtoa.la @win32_libs@ $(EFL_MPATROL_LIBS) 101libevil_la_LIBADD = @win32_libs@ $(EFL_MPATROL_LIBS)
75libevil_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@
76 103
77if EVIL_HAVE_WINCE 104if EVIL_HAVE_WINCE
@@ -84,5 +111,14 @@ libevil_la_LINK = $(CXXLINK) $(libevil_la_LDFLAGS)
84 111
85endif 112endif
86 113
114libdl_la_SOURCES = dlfcn.c
115
116libdl_la_CPPFLAGS = @win32_cppflags@ -DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1
117libdl_la_CFLAGS = @win32_cflags@
118libdl_la_LIBADD = $(top_builddir)/src/lib/libevil.la $(EFL_MPATROL_LIBS) @win32_dl_libs@
119libdl_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
120
121EXTRA_DIST = gdtoa/README gdtoa/README.mingw
122
87install-data-hook: 123install-data-hook:
88 rm -f $(libdir)/$(lib_LTLIBRARIES) 124 rm -f $(libdir)/libevil.la $(libdir)/libdl.la
diff --git a/legacy/evil/src/lib/dlfcn/dlfcn.c b/legacy/evil/src/lib/dlfcn.c
index 126b68c3ed..818cabf014 100644
--- a/legacy/evil/src/lib/dlfcn/dlfcn.c
+++ b/legacy/evil/src/lib/dlfcn.c
@@ -20,7 +20,7 @@
20# include <psapi.h> /* EnumProcessModules(Ex) */ 20# include <psapi.h> /* EnumProcessModules(Ex) */
21#endif 21#endif
22 22
23#include "../Evil.h" 23#include "Evil.h"
24 24
25#include "dlfcn.h" 25#include "dlfcn.h"
26 26
diff --git a/legacy/evil/src/lib/dlfcn/dlfcn.h b/legacy/evil/src/lib/dlfcn.h
index 610331b702..610331b702 100644
--- a/legacy/evil/src/lib/dlfcn/dlfcn.h
+++ b/legacy/evil/src/lib/dlfcn.h
diff --git a/legacy/evil/src/lib/gdtoa/Makefile.am b/legacy/evil/src/lib/gdtoa/Makefile.am
deleted file mode 100644
index b008151ba6..0000000000
--- a/legacy/evil/src/lib/gdtoa/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4noinst_LTLIBRARIES = libgdtoa.la
5
6libgdtoa_la_SOURCES = \
7arithchk.c \
8dmisc.c \
9dtoa.c \
10gd_arith.h \
11g_dfmt.c \
12gd_qnan.h \
13gdtoa.c \
14gdtoa_fltrnds.h \
15gdtoa.h \
16gdtoaimp.h \
17gethex.c \
18g_ffmt.c \
19g__fmt.c \
20gmisc.c \
21g_xfmt.c \
22hd_init.c \
23hexnan.c \
24misc.c \
25qnan.c \
26smisc.c \
27strtodg.c \
28strtof.c \
29strtopx.c \
30sum.c \
31ulp.c
32
33libgdtoa_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import
34
35EXTRA_DIST = README README.mingw \ No newline at end of file
diff --git a/legacy/evil/src/lib/gdtoa/gdtoaimp.h b/legacy/evil/src/lib/gdtoa/gdtoaimp.h
index 49b9ce05b3..3a06c2072f 100644
--- a/legacy/evil/src/lib/gdtoa/gdtoaimp.h
+++ b/legacy/evil/src/lib/gdtoa/gdtoaimp.h
@@ -570,10 +570,14 @@ extern Bigint *diff (Bigint*, Bigint*);
570extern int gethex (const char**, FPI*, Long*, Bigint**, int); 570extern int gethex (const char**, FPI*, Long*, Bigint**, int);
571extern void hexdig_init_D2A(void); 571extern void hexdig_init_D2A(void);
572extern int hexnan (const char**, FPI*, ULong*); 572extern int hexnan (const char**, FPI*, ULong*);
573#ifndef __GNUC__
573extern int hi0bits_D2A (ULong); 574extern int hi0bits_D2A (ULong);
575#endif
574extern Bigint *i2b (int); 576extern Bigint *i2b (int);
575extern Bigint *increment (Bigint*); 577extern Bigint *increment (Bigint*);
578#ifndef __GNUC__
576extern int lo0bits (ULong*); 579extern int lo0bits (ULong*);
580#endif
577extern Bigint *lshift (Bigint*, int); 581extern Bigint *lshift (Bigint*, int);
578extern int match (const char**, char*); 582extern int match (const char**, char*);
579extern Bigint *mult (Bigint*, Bigint*); 583extern Bigint *mult (Bigint*, Bigint*);