Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup of Makefiles

This commit is contained in:
Frank Celler 2014-12-19 00:13:51 +01:00
parent 1e2cfd0fa4
commit aabfdc5669
9 changed files with 82 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdParty/Makefile.all-in-one-libev → 3rdParty/Makefile.libev vendored
View File

@ -20,7 +20,7 @@ BUILT_SOURCES += @LIBEV_LIBS@
@echo
mkdir @top_srcdir@/3rdParty/libev/BUILD || true
cd @top_srcdir@/3rdParty/libev/BUILD && CC="" CFLAGS="" ../configure --disable-shared
cd @top_srcdir@/3rdParty/libev/BUILD && CC="$(CC)" CFLAGS="" ../configure --disable-shared
cd @top_srcdir@/3rdParty/libev/BUILD && $(MAKE) CFLAGS="-D EV_CHILD_ENABLE=0"
touch @srcdir@/.libev-build-@TRI_BITS@

0
3rdParty/Makefile.all-in-one-mruby → 3rdParty/Makefile.mruby vendored
View File

0
3rdParty/Makefile.all-in-one-v8 → 3rdParty/Makefile.v8 vendored
View File

6
Makefile.am
View File

@ -516,21 +516,21 @@ endif
### @brief libev
################################################################################
include 3rdParty/Makefile.all-in-one-libev
include 3rdParty/Makefile.libev
################################################################################
### @brief mruby
################################################################################
if ENABLE_MRUBY
include 3rdParty/Makefile.all-in-one-mruby
include 3rdParty/Makefile.mruby
endif
################################################################################
### @brief V8
################################################################################
include 3rdParty/Makefile.all-in-one-v8
include 3rdParty/Makefile.v8
################################################################################
### @brief zlib

104
configure.ac
View File

@ -18,6 +18,8 @@ AC_CONFIG_MACRO_DIR([m4])
CURRENT_DIR=`pwd`
AC_MSG_NOTICE([configure started in '$CURRENT_DIR])
AC_MSG_NOTICE([with CC='$CC'])
AC_MSG_NOTICE([with CXX='$CXX'])
AC_MSG_NOTICE([with CPPFLAGS='$CPPFLAGS'])
AC_MSG_NOTICE([with CFLAGS='$CFLAGS'])
AC_MSG_NOTICE([with CXXFLAGS='$CXXFLAGS'])
@ -147,10 +149,10 @@ dnl ============================================================================
dnl ----------------------------------------------------------------------------
dnl -lrt
dnl ----------------------------------------------------------------------------
m4_include([m4/clock_gettime])
AC_CLOCK()
dnl ----------------------------------------------------------------------------
dnl MATH
dnl ----------------------------------------------------------------------------
@ -169,39 +171,44 @@ dnl ----------------------------------------------------------------------------
m4_include([m4/external.openssl])
dnl ----------------------------------------------------------------------------
dnl ZLIB
dnl ----------------------------------------------------------------------------
m4_include([m4/all-in-one.zlib])
dnl ----------------------------------------------------------------------------
dnl MRUBY
dnl ----------------------------------------------------------------------------
m4_include([m4/all-in-one.mruby])
MRUBY_CPPFLAGS=""
MRUBY_LDLAGS=""
MRUBY_LIBSLAGS=""
dnl ----------------------------------------------------------------------------
dnl LIBEV
dnl ----------------------------------------------------------------------------
AC_ARG_ENABLE(mruby,
AS_HELP_STRING([--enable-mruby], [enable MRUBY (default: no)]),
[tr_MRUBY="${enableval:-yes}"],
[tr_MRUBY=no]
)
LIBEV_VERSION="4.11"
if test "x$tr_MRUBY" = "xyes"; then
MRUBY_VERSION="2013-08-22 (aa099f7f7d1f8c61db936fb7c39a3c734175af16)"
LIBEV_CPPFLAGS="-I${srcdir}/3rdParty/libev -DTRI_LIBEV_VERSION='\"${LIBEV_VERSION}\"'"
LIBEV_CPPFLAGS="${LIBEV_CPPFLAGS}"
LIBEV_LDFLAGS=""
LIBEV_LIBS="${srcdir}/3rdParty/libev/BUILD/.libs/libev.a"
MRUBY_CPPFLAGS="-I${srcdir}/3rdParty/mruby/include -DTRI_MRUBY_VERSION='\"${MRUBY_VERSION}\"'"
MRUBY_LDFLAGS=""
MRUBY_LIBS="${srcdir}/3rdParty/mruby/build/host/lib/libmruby.a"
fi
AC_SUBST(LIBEV_CPPFLAGS)
AC_SUBST(LIBEV_LDFLAGS)
AC_SUBST(LIBEV_LIBS)
AM_CONDITIONAL(ENABLE_MRUBY, test "x$tr_MRUBY" = "xyes")
LIB_INFO="$LIB_INFO|LIBEV: 3rdParty version"
LIB_INFO="$LIB_INFO|LIBEV VERSION: ${LIBEV_VERSION}"
AC_SUBST(MRUBY_CPPFLAGS)
AC_SUBST(MRUBY_LDFLAGS)
AC_SUBST(MRUBY_LIBS)
LIB_INFO="$LIB_INFO|LIBEV_CPPFLAGS: ${LIBEV_CPPFLAGS}"
LIB_INFO="$LIB_INFO|LIBEV_LDFLAGS: ${LIBEV_LDFLAGS}"
LIB_INFO="$LIB_INFO|LIBEV_LIBS: ${LIBEV_LIBS}"
if test "x$tr_MRUBY" = "xyes"; then
LIB_INFO="$LIB_INFO|MRUBY: 3rdParty version"
LIB_INFO="$LIB_INFO|MRUBY VERSION: ${TRI_MRUBY_VERSION}"
LIB_INFO="$LIB_INFO|MRUBY_CPPFLAGS: ${MRUBY_CPPFLAGS}"
LIB_INFO="$LIB_INFO|MRUBY_LDFLAGS: ${MRUBY_LDFLAGS}"
LIB_INFO="$LIB_INFO|MRUBY_LIBS: ${MRUBY_LIBS}"
else
LIB_INFO="$LIB_INFO|MRUBY: disabled"
fi
LIB_INFO="$LIB_INFO|."
@ -268,7 +275,6 @@ dnl ----------------------------------------------------------------------------
ICU_VERSION="52.2"
ICU_CPPFLAGS="-D_REENTRANT -I${srcdir}/3rdParty/V8/third_party/icu/source/common -I${srcdir}/3rdParty/V8/third_party/icu/source/i18n -I${srcdir}/3rdParty/V8/third_party/icu/source/io -DTRI_ICU_VERSION='\"${ICU_VERSION}\"'"
ICU_LDFLAGS=""
ICU_LIBS="-ldl -lm ${icu_lib_dir}/libicui18n.a ${icu_lib_dir}/libicuuc.a ${icu_lib_dir}/libicudata.a -ldl -lm"
if test "x$tr_DARWIN" = xyes; then
icu_lib_dir="${srcdir}/3rdParty/V8/out/$V8_TARGET"
@ -276,13 +282,14 @@ else
icu_lib_dir="${srcdir}/3rdParty/V8/out/$V8_TARGET/obj.target/third_party/icu"
fi
ICU_LIBS="-ldl -lm ${icu_lib_dir}/libicui18n.a ${icu_lib_dir}/libicuuc.a ${icu_lib_dir}/libicudata.a -ldl -lm"
AC_SUBST(ICU_CPPFLAGS)
AC_SUBST(ICU_LDFLAGS)
AC_SUBST(ICU_LIBS)
ICU_CPPFLAGS="${ICU_CPPFLAGS}"
LIB_INFO="$LIB_INFO|."
LIB_INFO="$LIB_INFO|ICU: 3rdParty version"
LIB_INFO="$LIB_INFO|ICU VERSION: ${ICU_VERSION}"
@ -292,6 +299,51 @@ LIB_INFO="$LIB_INFO|ICU_LIBS: ${ICU_LIBS}"
LIB_INFO="$LIB_INFO|."
dnl ----------------------------------------------------------------------------
dnl LIBEV
dnl ----------------------------------------------------------------------------
LIBEV_VERSION="4.11"
LIBEV_CPPFLAGS="-I${srcdir}/3rdParty/libev -DTRI_LIBEV_VERSION='\"${LIBEV_VERSION}\"'"
LIBEV_CPPFLAGS="${LIBEV_CPPFLAGS}"
LIBEV_LDFLAGS=""
LIBEV_LIBS="${srcdir}/3rdParty/libev/BUILD/.libs/libev.a"
AC_SUBST(LIBEV_CPPFLAGS)
AC_SUBST(LIBEV_LDFLAGS)
AC_SUBST(LIBEV_LIBS)
LIB_INFO="$LIB_INFO|LIBEV: 3rdParty version"
LIB_INFO="$LIB_INFO|LIBEV VERSION: ${LIBEV_VERSION}"
LIB_INFO="$LIB_INFO|LIBEV_CPPFLAGS: ${LIBEV_CPPFLAGS}"
LIB_INFO="$LIB_INFO|LIBEV_LDFLAGS: ${LIBEV_LDFLAGS}"
LIB_INFO="$LIB_INFO|LIBEV_LIBS: ${LIBEV_LIBS}"
LIB_INFO="$LIB_INFO|."
dnl ----------------------------------------------------------------------------
dnl ZLIB
dnl ----------------------------------------------------------------------------
ZLIB_VERSION="1.2.7"
ZLIB_CPPFLAGS=""
ZLIB_LDFLAGS=""
ZLIB_LIBS="${srcdir}/3rdParty/zlib-${ZLIB_VERSION}/libz.a"
AC_SUBST(ZLIB_CPPFLAGS)
AC_SUBST(ZLIB_LDFLAGS)
AC_SUBST(ZLIB_LIBS)
LIB_INFO="$LIB_INFO|ZLIB: 3rdParty version"
LIB_INFO="$LIB_INFO|ZLIB VERSION: ${ZLIB_VERSION}"
LIB_INFO="$LIB_INFO|ZLIB_CPPFLAGS: ${ZLIB_CPPFLAGS}"
LIB_INFO="$LIB_INFO|ZLIB_LDFLAGS: ${ZLIB_LDFLAGS}"
LIB_INFO="$LIB_INFO|ZLIB_LIBS: ${ZLIB_LIBS}"
dnl ============================================================================
dnl --SECTION-- GENERATE FILES
dnl ============================================================================

6
lib/Basics/local-configuration-win.h
View File

@ -81,12 +81,6 @@
/* #undef TRI_ENABLE_FAILURE_TESTS */
////////////////////////////////////////////////////////////////////////////////
/// @brief use MRUBY as alternative/addition to JavaScript
////////////////////////////////////////////////////////////////////////////////
/* #undef TRI_ENABLE_MRUBY */
////////////////////////////////////////////////////////////////////////////////
/// @brief configure command
////////////////////////////////////////////////////////////////////////////////

54
m4/all-in-one.icu
View File

@ -1,54 +0,0 @@
dnl -*- mode: Autoconf; -*-
dnl ----------------------------------------------------------------------------
dnl --SECTION-- V8
dnl ----------------------------------------------------------------------------
icu_build_dir="${V8_DIR}/third_party/icu"
if test "x$tr_DARWIN" = xyes; then
icu_lib_dir="${V8_DIR}/out/$V8_TARGET"
else
icu_lib_dir="${V8_DIR}/out/$V8_TARGET/obj.target/third_party/icu"
fi
ICU_CPPFLAGS="-D_REENTRANT -I${V8_DIR}/third_party/icu/source/common -I${V8_DIR}/third_party/icu/source/i18n/ -I${V8_DIR}/third_party/icu/source/io/"
ICU_LDFLAGS=""
ICU_LIBS=" -ldl -lm ${icu_lib_dir}/libicui18n.a \
${icu_lib_dir}/libicuuc.a \
${icu_lib_dir}/libicudata.a -ldl -lm "
TRI_ICU_VERSION="52.2"
dnl ----------------------------------------------------------------------------
dnl add substitutions
dnl ----------------------------------------------------------------------------
AC_SUBST(ICU_CPPFLAGS)
AC_SUBST(ICU_LDFLAGS)
AC_SUBST(ICU_LIBS)
ICU_CPPFLAGS="${ICU_CPPFLAGS} -DTRI_ICU_VERSION='\"${TRI_ICU_VERSION}\"'"
dnl ----------------------------------------------------------------------------
dnl informational output
dnl ----------------------------------------------------------------------------
LIB_INFO="$LIB_INFO|."
LIB_INFO="$LIB_INFO|ICU: 3rdParty version"
LIB_INFO="$LIB_INFO|ICU VERSION: ${TRI_ICU_VERSION}"
LIB_INFO="$LIB_INFO|ICU_CPPFLAGS: ${ICU_CPPFLAGS}"
LIB_INFO="$LIB_INFO|ICU_LDFLAGS: ${ICU_LDFLAGS}"
LIB_INFO="$LIB_INFO|ICU_LIBS: ${ICU_LIBS}"
dnl LIB_INFO="$LIB_INFO|."
dnl ----------------------------------------------------------------------------
dnl --SECTION-- END-OF-FILE
dnl ----------------------------------------------------------------------------
dnl Local Variables:
dnl mode: outline-minor
dnl outline-regexp: "^\\(dnl --SECTION--\\)"
dnl End:

63
m4/all-in-one.mruby
View File

@ -1,63 +0,0 @@
dnl -*- mode: Autoconf; -*-
dnl ----------------------------------------------------------------------------
dnl --SECTION-- MRUBY
dnl ----------------------------------------------------------------------------
MRUBY_CPPFLAGS=""
MRUBY_LDLAGS=""
MRUBY_LIBSLAGS=""
AC_ARG_ENABLE(mruby,
AS_HELP_STRING([--enable-mruby], [enable MRUBY (default: no)]),
[tr_MRUBY="${enableval:-yes}"],
[tr_MRUBY=no]
)
if test "x$tr_MRUBY" = "xyes"; then
MRUBY_CPPFLAGS="-I${srcdir}/3rdParty/mruby/include -DTRI_ENABLE_MRUBY=1"
MRUBY_LDFLAGS=""
MRUBY_LIBS="${srcdir}/3rdParty/mruby/build/host/lib/libmruby.a"
TRI_MRUBY_VERSION="2013-08-22 (aa099f7f7d1f8c61db936fb7c39a3c734175af16)"
AC_DEFINE_UNQUOTED(TRI_ENABLE_MRUBY, 1, [true if mruby should be used])
fi
AM_CONDITIONAL(ENABLE_MRUBY, test "x$tr_MRUBY" = "xyes")
dnl ----------------------------------------------------------------------------
dnl add substitutions
dnl ----------------------------------------------------------------------------
AC_SUBST(MRUBY_CPPFLAGS)
AC_SUBST(MRUBY_LDFLAGS)
AC_SUBST(MRUBY_LIBS)
MRUBY_CPPFLAGS="${MRUBY_CPPFLAGS} -DTRI_MRUBY_VERSION='\"${TRI_MRUBY_VERSION}\"'"
dnl ----------------------------------------------------------------------------
dnl informational output
dnl ----------------------------------------------------------------------------
if test "x$tr_MRUBY" = "xyes"; then
LIB_INFO="$LIB_INFO|MRUBY: 3rdParty version"
LIB_INFO="$LIB_INFO|MRUBY VERSION: ${TRI_MRUBY_VERSION}"
LIB_INFO="$LIB_INFO|MRUBY_CPPFLAGS: ${MRUBY_CPPFLAGS}"
LIB_INFO="$LIB_INFO|MRUBY_LDFLAGS: ${MRUBY_LDFLAGS}"
LIB_INFO="$LIB_INFO|MRUBY_LIBS: ${MRUBY_LIBS}"
else
LIB_INFO="$LIB_INFO|MRUBY: disabled"
fi
LIB_INFO="$LIB_INFO|."
dnl ----------------------------------------------------------------------------
dnl --SECTION-- END-OF-FILE
dnl ----------------------------------------------------------------------------
dnl Local Variables:
dnl mode: outline-minor
dnl outline-regexp: "^\\(dnl --SECTION--\\)"
dnl End:

41
m4/all-in-one.zlib
View File

@ -1,41 +0,0 @@
dnl -*- mode: Autoconf; -*-
dnl ----------------------------------------------------------------------------
dnl --SECTION-- LIBEV
dnl ----------------------------------------------------------------------------
TRI_ZLIB_VERSION="1.2.7"
ZLIB_CPPFLAGS=""
ZLIB_LDFLAGS=""
ZLIB_LIBS="${srcdir}/3rdParty/zlib-${TRI_ZLIB_VERSION}/libz.a"
dnl ----------------------------------------------------------------------------
dnl add substitutions
dnl ----------------------------------------------------------------------------
AC_SUBST(ZLIB_CPPFLAGS)
AC_SUBST(ZLIB_LDFLAGS)
AC_SUBST(ZLIB_LIBS)
dnl ----------------------------------------------------------------------------
dnl informational output
dnl ----------------------------------------------------------------------------
LIB_INFO="$LIB_INFO|ZLIB: 3rdParty version"
LIB_INFO="$LIB_INFO|ZLIB VERSION: ${TRI_ZLIB_VERSION}"
LIB_INFO="$LIB_INFO|ZLIB_CPPFLAGS: ${ZLIB_CPPFLAGS}"
LIB_INFO="$LIB_INFO|ZLIB_LDFLAGS: ${ZLIB_LDFLAGS}"
LIB_INFO="$LIB_INFO|ZLIB_LIBS: ${ZLIB_LIBS}"
LIB_INFO="$LIB_INFO|."
dnl ----------------------------------------------------------------------------
dnl --SECTION-- END-OF-FILE
dnl ----------------------------------------------------------------------------
dnl Local Variables:
dnl mode: outline-minor
dnl outline-regexp: "^\\(dnl --SECTION--\\)"
dnl End: