Commit bb5ca2da authored by Ghislain MARY's avatar Ghislain MARY

Clean sources before building and fix verbose parameter for subprojects using autotools.

parent ca092abb
......@@ -15,4 +15,9 @@ export LDFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_LDFLAGS@ @EP_linphone_EXTRA_LDFLAGS@
export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
make V=@CMAKE_VERBOSE_MAKEFILE@
if [ "x@LINPHONE_BUILDER_AUTOTOOLS_ONCE@" = "xno" ] && [ -f config.h ]
then
make clean
fi
make V=@AUTOTOOLS_VERBOSE_MAKEFILE@
......@@ -15,4 +15,9 @@ export LDFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_LDFLAGS@ @EP_opus_EXTRA_LDFLAGS@"
export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
make V=@CMAKE_VERBOSE_MAKEFILE@
if [ "x@LINPHONE_BUILDER_AUTOTOOLS_ONCE@" = "xno" ] && [ -f config.h ]
then
make clean
fi
make V=@AUTOTOOLS_VERBOSE_MAKEFILE@
......@@ -15,4 +15,9 @@ export LDFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_LDFLAGS@ @EP_xml2_EXTRA_LDFLAGS@"
export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
make V=@CMAKE_VERBOSE_MAKEFILE@
if [ "x@LINPHONE_BUILDER_AUTOTOOLS_ONCE@" = "xno" ] && [ -f config.h ]
then
make clean
fi
make V=@AUTOTOOLS_VERBOSE_MAKEFILE@
......@@ -23,17 +23,23 @@
include(ExternalProject)
set(LINPHONE_BUILDER_PKG_CONFIG_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
option(LINPHONE_BUILDER_AUTOTOOLS_ONCE "Run configure stage only once for subprojects built with the autotools." OFF)
if(NOT "${LINPHONE_BUILDER_AUTOTOOLS_ONCE}" STREQUAL "")
if(${LINPHONE_BUILDER_AUTOTOOLS_ONCE})
set(LINPHONE_BUILDER_AUTOTOOLS_ONCE "yes")
else()
set(LINPHONE_BUILDER_AUTOTOOLS_ONCE "no")
endif()
else()
if(${LINPHONE_BUILDER_AUTOTOOLS_ONCE})
set(LINPHONE_BUILDER_AUTOTOOLS_ONCE "yes")
else(${LINPHONE_BUILDER_AUTOTOOLS_ONCE})
set(LINPHONE_BUILDER_AUTOTOOLS_ONCE "no")
endif()
endif(${LINPHONE_BUILDER_AUTOTOOLS_ONCE})
if(${CMAKE_VERBOSE_MAKEFILE})
set(AUTOTOOLS_VERBOSE_MAKEFILE 1)
else(${CMAKE_VERBOSE_MAKEFILE})
set(AUTOTOOLS_VERBOSE_MAKEFILE 0)
endif(${CMAKE_VERBOSE_MAKEFILE})
set(LINPHONE_BUILDER_PKG_CONFIG_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
set(LINPHONE_BUILDER_EP_VARS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment