diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2012-08-19 08:59:51 +0000 |
---|---|---|
committer | Vincent Torri <vincent.torri@gmail.com> | 2012-08-19 08:59:51 +0000 |
commit | cba9a2a11c4cfcb622d2e7984f3ab93287be6388 (patch) | |
tree | 9332250bc7953c442198240073666c510f4dda21 /legacy/evil | |
parent | 8d6dbed30dfc0606dd9a8c027fd7de646b40fd2f (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')
-rw-r--r-- | legacy/evil/ChangeLog | 11 | ||||
-rw-r--r-- | legacy/evil/configure.ac | 2 | ||||
-rw-r--r-- | legacy/evil/src/bin/Makefile.am | 3 | ||||
-rw-r--r-- | legacy/evil/src/lib/Makefile.am | 48 | ||||
-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.am | 35 | ||||
-rw-r--r-- | legacy/evil/src/lib/gdtoa/gdtoaimp.h | 4 |
8 files changed, 59 insertions, 46 deletions
diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog index 0259c41067..80ed084671 100644 --- a/legacy/evil/ChangeLog +++ b/legacy/evil/ChangeLog | |||
@@ -1,3 +1,14 @@ | |||
1 | 2012-08-19 Vincent Torri <doursse at users dot sf dot net> | ||
2 | |||
3 | * configure.ac: | ||
4 | * src/bin/Makefile.am: | ||
5 | * src/lib/Makefile.am: | ||
6 | * src/lib/dlfcn/: | ||
7 | Less automake stuff. | ||
8 | |||
9 | * src/lib/gdtoa/gdtoaimp.h: | ||
10 | fix redundant declarations. | ||
11 | |||
1 | 2012-07-21 Vincent Torri <doursse at users dot sf dot net> | 12 | 2012-07-21 Vincent Torri <doursse at users dot sf dot net> |
2 | 13 | ||
3 | * src/lib/Makefile.am: | 14 | * src/lib/Makefile.am: |
diff --git a/legacy/evil/configure.ac b/legacy/evil/configure.ac index 8a9bd5325b..0682c70d59 100644 --- a/legacy/evil/configure.ac +++ b/legacy/evil/configure.ac | |||
@@ -139,8 +139,6 @@ doc/Makefile | |||
139 | src/Makefile | 139 | src/Makefile |
140 | src/bin/Makefile | 140 | src/bin/Makefile |
141 | src/lib/Makefile | 141 | src/lib/Makefile |
142 | src/lib/dlfcn/Makefile | ||
143 | src/lib/gdtoa/Makefile | ||
144 | ]) | 142 | ]) |
145 | 143 | ||
146 | AC_OUTPUT | 144 | AC_OUTPUT |
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 | ||
11 | AM_CFLAGS = @win32_cflags@ | 10 | AM_CFLAGS = @win32_cflags@ |
@@ -46,7 +45,7 @@ evil_suite_SOURCES += memcpy_glibc_arm.S | |||
46 | 45 | ||
47 | endif | 46 | endif |
48 | 47 | ||
49 | evil_suite_LDADD = $(top_builddir)/src/lib/dlfcn/libdl.la $(top_builddir)/src/lib/libevil.la -lm | 48 | evil_suite_LDADD = $(top_builddir)/src/lib/libdl.la $(top_builddir)/src/lib/libevil.la -lm |
50 | evil_suite_LDFLAGS = -Wl,--enable-auto-import | 49 | evil_suite_LDFLAGS = -Wl,--enable-auto-import |
51 | 50 | ||
52 | test_evil_SOURCES = test_evil.c | 51 | test_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 | ||
2 | MAINTAINERCLEANFILES = Makefile.in | 2 | MAINTAINERCLEANFILES = Makefile.in |
3 | 3 | ||
4 | SUBDIRS = gdtoa . dlfcn | 4 | lib_LTLIBRARIES = libevil.la libdl.la |
5 | |||
6 | lib_LTLIBRARIES = libevil.la | ||
7 | 5 | ||
8 | install_evilheadersdir = $(includedir)/evil-@VMAJ@ | 6 | install_evilheadersdir = $(includedir)/evil-@VMAJ@ |
9 | dist_install_evilheaders_DATA = \ | 7 | dist_install_evilheaders_DATA = \ |
@@ -24,7 +22,7 @@ evil_unistd.h \ | |||
24 | evil_util.h | 22 | evil_util.h |
25 | 23 | ||
26 | stdheadersdir = $(includedir)/evil-@VMAJ@ | 24 | stdheadersdir = $(includedir)/evil-@VMAJ@ |
27 | nobase_dist_stdheaders_DATA = pwd.h sys/mman.h fnmatch.h dirent.h | 25 | nobase_dist_stdheaders_DATA = pwd.h sys/mman.h fnmatch.h dirent.h dlfcn.h |
28 | 26 | ||
29 | if EVIL_HAVE_WINCE | 27 | if EVIL_HAVE_WINCE |
30 | 28 | ||
@@ -32,7 +30,36 @@ nobase_dist_stdheaders_DATA += mingw32ce/errno.h | |||
32 | 30 | ||
33 | endif | 31 | endif |
34 | 32 | ||
33 | # gdtoa | ||
35 | libevil_la_SOURCES = \ | 34 | libevil_la_SOURCES = \ |
35 | gdtoa/arithchk.c \ | ||
36 | gdtoa/dmisc.c \ | ||
37 | gdtoa/dtoa.c \ | ||
38 | gdtoa/gd_arith.h \ | ||
39 | gdtoa/g_dfmt.c \ | ||
40 | gdtoa/gd_qnan.h \ | ||
41 | gdtoa/gdtoa.c \ | ||
42 | gdtoa/gdtoa_fltrnds.h \ | ||
43 | gdtoa/gdtoa.h \ | ||
44 | gdtoa/gdtoaimp.h \ | ||
45 | gdtoa/gethex.c \ | ||
46 | gdtoa/g_ffmt.c \ | ||
47 | gdtoa/g__fmt.c \ | ||
48 | gdtoa/gmisc.c \ | ||
49 | gdtoa/g_xfmt.c \ | ||
50 | gdtoa/hd_init.c \ | ||
51 | gdtoa/hexnan.c \ | ||
52 | gdtoa/misc.c \ | ||
53 | gdtoa/qnan.c \ | ||
54 | gdtoa/smisc.c \ | ||
55 | gdtoa/strtodg.c \ | ||
56 | gdtoa/strtof.c \ | ||
57 | gdtoa/strtopx.c \ | ||
58 | gdtoa/sum.c \ | ||
59 | gdtoa/ulp.c | ||
60 | |||
61 | #evil | ||
62 | libevil_la_SOURCES += \ | ||
36 | evil_dirent.c \ | 63 | evil_dirent.c \ |
37 | evil_fcntl.c \ | 64 | evil_fcntl.c \ |
38 | evil_fnmatch.c \ | 65 | evil_fnmatch.c \ |
@@ -71,7 +98,7 @@ endif | |||
71 | libevil_la_CPPFLAGS = @win32_cppflags@ -DEFL_EVIL_BUILD | 98 | libevil_la_CPPFLAGS = @win32_cppflags@ -DEFL_EVIL_BUILD |
72 | libevil_la_CFLAGS = @win32_cflags@ | 99 | libevil_la_CFLAGS = @win32_cflags@ |
73 | libevil_la_CXXFLAGS = @win32_cxxflags@ | 100 | libevil_la_CXXFLAGS = @win32_cxxflags@ |
74 | libevil_la_LIBADD = gdtoa/libgdtoa.la @win32_libs@ $(EFL_MPATROL_LIBS) | 101 | libevil_la_LIBADD = @win32_libs@ $(EFL_MPATROL_LIBS) |
75 | 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@ |
76 | 103 | ||
77 | if EVIL_HAVE_WINCE | 104 | if EVIL_HAVE_WINCE |
@@ -84,5 +111,14 @@ libevil_la_LINK = $(CXXLINK) $(libevil_la_LDFLAGS) | |||
84 | 111 | ||
85 | endif | 112 | endif |
86 | 113 | ||
114 | libdl_la_SOURCES = dlfcn.c | ||
115 | |||
116 | libdl_la_CPPFLAGS = @win32_cppflags@ -DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1 | ||
117 | libdl_la_CFLAGS = @win32_cflags@ | ||
118 | libdl_la_LIBADD = $(top_builddir)/src/lib/libevil.la $(EFL_MPATROL_LIBS) @win32_dl_libs@ | ||
119 | libdl_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@ | ||
120 | |||
121 | EXTRA_DIST = gdtoa/README gdtoa/README.mingw | ||
122 | |||
87 | install-data-hook: | 123 | install-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 | |||
2 | MAINTAINERCLEANFILES = Makefile.in | ||
3 | |||
4 | noinst_LTLIBRARIES = libgdtoa.la | ||
5 | |||
6 | libgdtoa_la_SOURCES = \ | ||
7 | arithchk.c \ | ||
8 | dmisc.c \ | ||
9 | dtoa.c \ | ||
10 | gd_arith.h \ | ||
11 | g_dfmt.c \ | ||
12 | gd_qnan.h \ | ||
13 | gdtoa.c \ | ||
14 | gdtoa_fltrnds.h \ | ||
15 | gdtoa.h \ | ||
16 | gdtoaimp.h \ | ||
17 | gethex.c \ | ||
18 | g_ffmt.c \ | ||
19 | g__fmt.c \ | ||
20 | gmisc.c \ | ||
21 | g_xfmt.c \ | ||
22 | hd_init.c \ | ||
23 | hexnan.c \ | ||
24 | misc.c \ | ||
25 | qnan.c \ | ||
26 | smisc.c \ | ||
27 | strtodg.c \ | ||
28 | strtof.c \ | ||
29 | strtopx.c \ | ||
30 | sum.c \ | ||
31 | ulp.c | ||
32 | |||
33 | libgdtoa_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import | ||
34 | |||
35 | EXTRA_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*); | |||
570 | extern int gethex (const char**, FPI*, Long*, Bigint**, int); | 570 | extern int gethex (const char**, FPI*, Long*, Bigint**, int); |
571 | extern void hexdig_init_D2A(void); | 571 | extern void hexdig_init_D2A(void); |
572 | extern int hexnan (const char**, FPI*, ULong*); | 572 | extern int hexnan (const char**, FPI*, ULong*); |
573 | #ifndef __GNUC__ | ||
573 | extern int hi0bits_D2A (ULong); | 574 | extern int hi0bits_D2A (ULong); |
575 | #endif | ||
574 | extern Bigint *i2b (int); | 576 | extern Bigint *i2b (int); |
575 | extern Bigint *increment (Bigint*); | 577 | extern Bigint *increment (Bigint*); |
578 | #ifndef __GNUC__ | ||
576 | extern int lo0bits (ULong*); | 579 | extern int lo0bits (ULong*); |
580 | #endif | ||
577 | extern Bigint *lshift (Bigint*, int); | 581 | extern Bigint *lshift (Bigint*, int); |
578 | extern int match (const char**, char*); | 582 | extern int match (const char**, char*); |
579 | extern Bigint *mult (Bigint*, Bigint*); | 583 | extern Bigint *mult (Bigint*, Bigint*); |