forked from enlightenment/efl
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
This commit is contained in:
parent
8d6dbed30d
commit
cba9a2a11c
|
@ -1,3 +1,14 @@
|
|||
2012-08-19 Vincent Torri <doursse at users dot sf dot net>
|
||||
|
||||
* configure.ac:
|
||||
* src/bin/Makefile.am:
|
||||
* src/lib/Makefile.am:
|
||||
* src/lib/dlfcn/:
|
||||
Less automake stuff.
|
||||
|
||||
* src/lib/gdtoa/gdtoaimp.h:
|
||||
fix redundant declarations.
|
||||
|
||||
2012-07-21 Vincent Torri <doursse at users dot sf dot net>
|
||||
|
||||
* src/lib/Makefile.am:
|
||||
|
|
|
@ -139,8 +139,6 @@ doc/Makefile
|
|||
src/Makefile
|
||||
src/bin/Makefile
|
||||
src/lib/Makefile
|
||||
src/lib/dlfcn/Makefile
|
||||
src/lib/gdtoa/Makefile
|
||||
])
|
||||
|
||||
AC_OUTPUT
|
||||
|
|
|
@ -5,7 +5,6 @@ AM_CPPFLAGS = \
|
|||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/bin \
|
||||
-I$(top_srcdir)/src/lib \
|
||||
-I$(top_srcdir)/src/lib/dlfcn \
|
||||
@win32_cppflags@
|
||||
|
||||
AM_CFLAGS = @win32_cflags@
|
||||
|
@ -46,7 +45,7 @@ evil_suite_SOURCES += memcpy_glibc_arm.S
|
|||
|
||||
endif
|
||||
|
||||
evil_suite_LDADD = $(top_builddir)/src/lib/dlfcn/libdl.la $(top_builddir)/src/lib/libevil.la -lm
|
||||
evil_suite_LDADD = $(top_builddir)/src/lib/libdl.la $(top_builddir)/src/lib/libevil.la -lm
|
||||
evil_suite_LDFLAGS = -Wl,--enable-auto-import
|
||||
|
||||
test_evil_SOURCES = test_evil.c
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
SUBDIRS = gdtoa . dlfcn
|
||||
|
||||
lib_LTLIBRARIES = libevil.la
|
||||
lib_LTLIBRARIES = libevil.la libdl.la
|
||||
|
||||
install_evilheadersdir = $(includedir)/evil-@VMAJ@
|
||||
dist_install_evilheaders_DATA = \
|
||||
|
@ -24,7 +22,7 @@ evil_unistd.h \
|
|||
evil_util.h
|
||||
|
||||
stdheadersdir = $(includedir)/evil-@VMAJ@
|
||||
nobase_dist_stdheaders_DATA = pwd.h sys/mman.h fnmatch.h dirent.h
|
||||
nobase_dist_stdheaders_DATA = pwd.h sys/mman.h fnmatch.h dirent.h dlfcn.h
|
||||
|
||||
if EVIL_HAVE_WINCE
|
||||
|
||||
|
@ -32,7 +30,36 @@ nobase_dist_stdheaders_DATA += mingw32ce/errno.h
|
|||
|
||||
endif
|
||||
|
||||
# gdtoa
|
||||
libevil_la_SOURCES = \
|
||||
gdtoa/arithchk.c \
|
||||
gdtoa/dmisc.c \
|
||||
gdtoa/dtoa.c \
|
||||
gdtoa/gd_arith.h \
|
||||
gdtoa/g_dfmt.c \
|
||||
gdtoa/gd_qnan.h \
|
||||
gdtoa/gdtoa.c \
|
||||
gdtoa/gdtoa_fltrnds.h \
|
||||
gdtoa/gdtoa.h \
|
||||
gdtoa/gdtoaimp.h \
|
||||
gdtoa/gethex.c \
|
||||
gdtoa/g_ffmt.c \
|
||||
gdtoa/g__fmt.c \
|
||||
gdtoa/gmisc.c \
|
||||
gdtoa/g_xfmt.c \
|
||||
gdtoa/hd_init.c \
|
||||
gdtoa/hexnan.c \
|
||||
gdtoa/misc.c \
|
||||
gdtoa/qnan.c \
|
||||
gdtoa/smisc.c \
|
||||
gdtoa/strtodg.c \
|
||||
gdtoa/strtof.c \
|
||||
gdtoa/strtopx.c \
|
||||
gdtoa/sum.c \
|
||||
gdtoa/ulp.c
|
||||
|
||||
#evil
|
||||
libevil_la_SOURCES += \
|
||||
evil_dirent.c \
|
||||
evil_fcntl.c \
|
||||
evil_fnmatch.c \
|
||||
|
@ -71,7 +98,7 @@ endif
|
|||
libevil_la_CPPFLAGS = @win32_cppflags@ -DEFL_EVIL_BUILD
|
||||
libevil_la_CFLAGS = @win32_cflags@
|
||||
libevil_la_CXXFLAGS = @win32_cxxflags@
|
||||
libevil_la_LIBADD = gdtoa/libgdtoa.la @win32_libs@ $(EFL_MPATROL_LIBS)
|
||||
libevil_la_LIBADD = @win32_libs@ $(EFL_MPATROL_LIBS)
|
||||
libevil_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
|
||||
|
||||
if EVIL_HAVE_WINCE
|
||||
|
@ -84,5 +111,14 @@ libevil_la_LINK = $(CXXLINK) $(libevil_la_LDFLAGS)
|
|||
|
||||
endif
|
||||
|
||||
libdl_la_SOURCES = dlfcn.c
|
||||
|
||||
libdl_la_CPPFLAGS = @win32_cppflags@ -DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1
|
||||
libdl_la_CFLAGS = @win32_cflags@
|
||||
libdl_la_LIBADD = $(top_builddir)/src/lib/libevil.la $(EFL_MPATROL_LIBS) @win32_dl_libs@
|
||||
libdl_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
|
||||
|
||||
EXTRA_DIST = gdtoa/README gdtoa/README.mingw
|
||||
|
||||
install-data-hook:
|
||||
rm -f $(libdir)/$(lib_LTLIBRARIES)
|
||||
rm -f $(libdir)/libevil.la $(libdir)/libdl.la
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
# include <psapi.h> /* EnumProcessModules(Ex) */
|
||||
#endif
|
||||
|
||||
#include "../Evil.h"
|
||||
#include "Evil.h"
|
||||
|
||||
#include "dlfcn.h"
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libgdtoa.la
|
||||
|
||||
libgdtoa_la_SOURCES = \
|
||||
arithchk.c \
|
||||
dmisc.c \
|
||||
dtoa.c \
|
||||
gd_arith.h \
|
||||
g_dfmt.c \
|
||||
gd_qnan.h \
|
||||
gdtoa.c \
|
||||
gdtoa_fltrnds.h \
|
||||
gdtoa.h \
|
||||
gdtoaimp.h \
|
||||
gethex.c \
|
||||
g_ffmt.c \
|
||||
g__fmt.c \
|
||||
gmisc.c \
|
||||
g_xfmt.c \
|
||||
hd_init.c \
|
||||
hexnan.c \
|
||||
misc.c \
|
||||
qnan.c \
|
||||
smisc.c \
|
||||
strtodg.c \
|
||||
strtof.c \
|
||||
strtopx.c \
|
||||
sum.c \
|
||||
ulp.c
|
||||
|
||||
libgdtoa_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import
|
||||
|
||||
EXTRA_DIST = README README.mingw
|
|
@ -570,10 +570,14 @@ extern Bigint *diff (Bigint*, Bigint*);
|
|||
extern int gethex (const char**, FPI*, Long*, Bigint**, int);
|
||||
extern void hexdig_init_D2A(void);
|
||||
extern int hexnan (const char**, FPI*, ULong*);
|
||||
#ifndef __GNUC__
|
||||
extern int hi0bits_D2A (ULong);
|
||||
#endif
|
||||
extern Bigint *i2b (int);
|
||||
extern Bigint *increment (Bigint*);
|
||||
#ifndef __GNUC__
|
||||
extern int lo0bits (ULong*);
|
||||
#endif
|
||||
extern Bigint *lshift (Bigint*, int);
|
||||
extern int match (const char**, char*);
|
||||
extern Bigint *mult (Bigint*, Bigint*);
|
||||
|
|
Loading…
Reference in New Issue