forked from enlightenment/efl
parent
37cfda6c14
commit
d2d31d5d56
12
Makefile.am
12
Makefile.am
|
@ -10,6 +10,7 @@ config.h.in \
|
||||||
config.h.in~ \
|
config.h.in~ \
|
||||||
config.sub \
|
config.sub \
|
||||||
configure \
|
configure \
|
||||||
|
depcomp \
|
||||||
install-sh \
|
install-sh \
|
||||||
ltmain.sh \
|
ltmain.sh \
|
||||||
missing \
|
missing \
|
||||||
|
@ -25,6 +26,17 @@ m4/efl_compiler.m4 \
|
||||||
m4/efl_doxygen.m4 \
|
m4/efl_doxygen.m4 \
|
||||||
m4/evil_windows.m4
|
m4/evil_windows.m4
|
||||||
|
|
||||||
|
if HAVE_WINDOWS
|
||||||
|
EXTRA_DIST += evil.pc
|
||||||
|
endif
|
||||||
|
|
||||||
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
|
pkgconfig_DATA =
|
||||||
|
|
||||||
|
if HAVE_WINDOWS
|
||||||
|
pkgconfig_DATA += evil.pc
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
.PHONY: doc
|
.PHONY: doc
|
||||||
|
|
||||||
|
|
|
@ -248,7 +248,7 @@ case "$host_os" in
|
||||||
EVIL_DLFCN_LIBS="-ltoolhelp"
|
EVIL_DLFCN_LIBS="-ltoolhelp"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
EVIL_LIBS="-lole32 -lws2_32 -lsecur32"
|
EVIL_LIBS="-luuid -lole32 -lws2_32 -lsecur32"
|
||||||
EVIL_DLFCN_LIBS="-lpsapi"
|
EVIL_DLFCN_LIBS="-lpsapi"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -267,6 +267,7 @@ AC_CHECK_HEADERS([errno.h])
|
||||||
### Checks for compiler characteristics
|
### Checks for compiler characteristics
|
||||||
|
|
||||||
EVIL_CPPFLAGS="-DEFL_EVIL_BUILD"
|
EVIL_CPPFLAGS="-DEFL_EVIL_BUILD"
|
||||||
|
EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1"
|
||||||
EVIL_CFLAGS="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -mms-bitfields"
|
EVIL_CFLAGS="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -mms-bitfields"
|
||||||
EVIL_CXXFLAGS=""
|
EVIL_CXXFLAGS=""
|
||||||
|
|
||||||
|
@ -276,6 +277,7 @@ if test "x${have_win32}" = "xyes" ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST([EVIL_CPPFLAGS])
|
AC_SUBST([EVIL_CPPFLAGS])
|
||||||
|
AC_SUBST([EVIL_DLFCN_CPPFLAGS])
|
||||||
AC_SUBST([EVIL_CFLAGS])
|
AC_SUBST([EVIL_CFLAGS])
|
||||||
AC_SUBST([EVIL_CXXFLAGS])
|
AC_SUBST([EVIL_CXXFLAGS])
|
||||||
|
|
||||||
|
@ -313,6 +315,7 @@ src/bin/Makefile
|
||||||
src/bin/evil/Makefile
|
src/bin/evil/Makefile
|
||||||
src/lib/Makefile
|
src/lib/Makefile
|
||||||
src/lib/evil/Makefile
|
src/lib/evil/Makefile
|
||||||
|
evil.pc
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir) \
|
-I. \
|
||||||
-I$(top_srcdir)/bin \
|
-I$(top_srcdir)/src/lib/evil \
|
||||||
-I$(top_srcdir)/src/lib \
|
-I$(top_builddir)/src/lib/evil \
|
||||||
@EVIL_CPPFLAGS@
|
@EVIL_CPPFLAGS@
|
||||||
|
|
||||||
AM_CFLAGS = @EVIL_CFLAGS@
|
AM_CFLAGS = @EVIL_CFLAGS@
|
||||||
|
@ -45,9 +45,9 @@ evil_suite_SOURCES += memcpy_glibc_arm.S
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
evil_suite_LDADD = $(top_builddir)/src/lib/libdl.la $(top_builddir)/src/lib/libevil.la -lm
|
evil_suite_LDADD = $(top_builddir)/src/lib/evil/libdl.la $(top_builddir)/src/lib/evil/libevil.la -lm
|
||||||
evil_suite_LDFLAGS = -Wl,--enable-auto-import
|
evil_suite_LDFLAGS = -Wl,--enable-auto-import
|
||||||
|
|
||||||
test_evil_SOURCES = test_evil.c
|
test_evil_SOURCES = test_evil.c
|
||||||
test_evil_LDADD = $(top_builddir)/src/lib/libevil.la
|
test_evil_LDADD = $(top_builddir)/src/lib/evil/libevil.la
|
||||||
test_evil_LDFLAGS = -Wl,--enable-auto-import
|
test_evil_LDFLAGS = -Wl,--enable-auto-import
|
||||||
|
|
|
@ -115,7 +115,7 @@ libdl_la_SOURCES = dlfcn.c
|
||||||
|
|
||||||
libdl_la_CPPFLAGS = @EVIL_DLFCN_CPPFLAGS@
|
libdl_la_CPPFLAGS = @EVIL_DLFCN_CPPFLAGS@
|
||||||
libdl_la_CFLAGS = @EVIL_CFLAGS@
|
libdl_la_CFLAGS = @EVIL_CFLAGS@
|
||||||
libdl_la_LIBADD = $(top_builddir)/src/lib/libevil.la @EVIL_DLFCN_LIBS@
|
libdl_la_LIBADD = $(top_builddir)/src/lib/evil/libevil.la @EVIL_DLFCN_LIBS@
|
||||||
libdl_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
|
libdl_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
|
||||||
|
|
||||||
EXTRA_DIST = gdtoa/README gdtoa/README.mingw
|
EXTRA_DIST = gdtoa/README gdtoa/README.mingw
|
||||||
|
|
Loading…
Reference in New Issue