Skip to content
Snippets Groups Projects
Commit bfe7a844 authored by Maxim Cournoyer's avatar Maxim Cournoyer Committed by Adrien Béraud
Browse files

configure.ac: Do not set user variables. 

The CFLAGS, CXXFLAGS, LDFLAGS and other variables intended to be
overridden by the user should not directly be set by the package.
This change uses one of the approaches recommended by the Autoconf and
Automake manuals, which is to use custom variables to accumulate flags
in the configure script and add them to the make targets they apply
to.  This has the benefit of not cluttering the flags used during the
Autoconf tests, which has proved problematic (see the previous commit
for a demonstration).

* configure.ac: Replace CFLAGS, CXXFLAGS, CPPFLAGS and LDFLAGS by
DAEMONCFLAGS, DAEMONCXXFLAGS, DAEMONCPPFLAGS and DAEMONLDFLAGS,
respectively.
Use these custom variables as the default values of AM_CFLAGS,
AM_CXXFLAGS, AM_CPPFLAGS and AM_LDFLAGS, respectively.  Remove an
extraneous check on jsoncpp.
* bin/Makefile.am (ringcli_CXXFLAGS): Honor the the AM_CXXFLAGS variable.
globals.mk: Extend rather than override the AM_CPPFLAGS variable.
* src/Makefile.am (libring_la_LDFLAGS): Honor AM_LDFLAGS.
(libring_la_CFLAGS): Honor AM_CFLAGS.
(libring_la_CXXFLAGS): Honor AM_CXXFLAGS.
* src/client/Makefile.am (libclient_la_CXXFLAGS): Honor AM_CXXFLAGS.
* src/im/Makefile.am (libim_la_CXXFLAGS): Remove variable.
* src/jamidht/Makefile.am (libringacc_la_CXXFLAGS): Likewise.
* src/media/audio/Makefile.am (libaudio_la_CXXFLAGS): Honor
AM_CXXFLAGS.
(libaudio_la_LDFLAGS): Honor the AM_CXXFLAGS variable.
* src/media/audio/coreaudio/Makefile.am (libcoreaudiolayer_la_CXXFLAGS):
Likewise.
* src/media/video/Makefile.am (libvideo_la_CFLAGS): Honor the
AM_CFLAGS variable.
(libvideo_la_CXXFLAGS): Honor the AM_CXXFLAGS variable.
* src/media/video/v4l2/Makefile.am (AM_CXXFLAGS): Extend rather than
override.
* src/plugin/Makefile.am (libplugin_la_CXXFLAGS): Honor the
AM_CXXFLAGS variable.
* src/security/Makefile.am (libsecurity_la_CXXFLAGS): Likewise.
* src/sip/Makefile.am (libsiplink_la_CXXFLAGS): Likewise.
* src/upnp/Makefile.am (libupnpcontrol_la_CXXFLAGS): Remove variable.
* src/upnp/protocol/Makefile.am (libupnpprotocol_la_CXXFLAGS): Likewise.
* src/upnp/protocol/natpmp/Makefile.am (libnat_pmp_la_CXXFLAGS): Likewise.
* src/upnp/protocol/pupnp/Makefile.am (libpupnp_la_CXXFLAGS): Likewise.
* test/sip/Makefile.am (AM_CXXFLAGS, AM_LDFLAGS): Extend rather than override.
* test/unitTest/Makefile.am (AM_CXXFLAGS, AM_LDFLAGS): Likewise.

GitLab: #487
Change-Id: I18be9d812159f8156efb9f7849e7eac6d4c6b3ca

squash! configure.ac: Do not set user variables.

Change-Id: I1146ea15d6fb75fe53d3cbdd782e981c933e82a6
parent 5cca2625
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 155 additions and 144 deletions
bin/Makefile.am
+ 4
− 2
View file @ bfe7a844
...@@ -5,7 +5,8 @@ ringlib_PROGRAMS = ringcli ...@@ -5,7 +5,8 @@ ringlib_PROGRAMS = ringcli
ringcli_SOURCES = winmain.cpp ringcli_SOURCES = winmain.cpp
ringcli_CXXFLAGS = -I$(top_srcdir)/src \ ringcli_CXXFLAGS = -I$(top_srcdir)/src \
-I$(top_srcdir)/src/dring \ -I$(top_srcdir)/src/dring \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" \
$(AM_CXXFLAGS)
ringcli_LDADD = $(top_builddir)/src/libring.la ringcli_LDADD = $(top_builddir)/src/libring.la
endif endif
...@@ -14,7 +15,8 @@ ringlib_PROGRAMS = ringcli ...@@ -14,7 +15,8 @@ ringlib_PROGRAMS = ringcli
ringcli_SOURCES = osxmain.cpp ringcli_SOURCES = osxmain.cpp
ringcli_CXXFLAGS = -I$(top_srcdir)/src \ ringcli_CXXFLAGS = -I$(top_srcdir)/src \
-I$(top_srcdir)/src/dring \ -I$(top_srcdir)/src/dring \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" \
$(AM_CXXFLAGS)
ringcli_LDADD = $(top_builddir)/src/libring.la ringcli_LDADD = $(top_builddir)/src/libring.la
endif endif
......
configure.ac
+ 87
− 98
View file @ bfe7a844
...@@ -22,14 +22,17 @@ AC_CONFIG_HEADERS([config.h]) ...@@ -22,14 +22,17 @@ AC_CONFIG_HEADERS([config.h])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
dnl debug mode is default-disabled dnl debug mode is default-disabled
AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Build in debug mode, adds stricter warnings, disables optimization])) AC_ARG_ENABLE([debug],
AS_IF([test "x$enable_debug" = "xyes"], [ AS_HELP_STRING([--enable-debug],
CFLAGS="${CFLAGS} -g -fno-omit-frame-pointer -Wall -Wextra -Wnon-virtual-dtor -Wno-unknown-pragmas -Wformat=2 -O0" [Build in debug mode, adds stricter warnings, disables optimization]))
CXXFLAGS="${CXXFLAGS} -g -fno-omit-frame-pointer -Wall -Wextra -Wnon-virtual-dtor -Wno-unknown-pragmas -Wformat=2 -O0"
], [ AS_IF([test "x$enable_debug" = "xyes"],
CFLAGS="${CFLAGS} -DNDEBUG=1 -O3" [DAEMONCFLAGS+=" -g -fno-omit-frame-pointer -Wall -Wextra -Wnon-virtual-dtor \
CXXFLAGS="${CXXFLAGS} -DNDEBUG=1 -O3" -Wno-unknown-pragmas -Wformat=2 -O0"
]) DAEMONCXXFLAGS+=" -g -fno-omit-frame-pointer -Wall -Wextra -Wnon-virtual-dtor \
-Wno-unknown-pragmas -Wformat=2 -O0"],
[DAEMONCFLAGS+=" -DNDEBUG=1 -O3"
DAEMONCXXFLAGS+=" -DNDEBUG=1 -O3"])
dnl Check for programs dnl Check for programs
AC_PROG_CC AC_PROG_CC
...@@ -55,9 +58,9 @@ case "${host_os}" in ...@@ -55,9 +58,9 @@ case "${host_os}" in
linux*) linux*)
SYS=linux SYS=linux
# Necessary for linking .a to a .so # Necessary for linking .a to a .so
LDFLAGS+=" -Wl,-Bsymbolic" DAEMONLDFLAGS+=" -Wl,-Bsymbolic"
# Needed for plugin system # Needed for plugin system
LDFLAGS+=" -ldl" DAEMONLDFLAGS+=" -ldl"
;; ;;
darwin*) darwin*)
SYS=darwin SYS=darwin
...@@ -87,8 +90,8 @@ case "${host_os}" in ...@@ -87,8 +90,8 @@ case "${host_os}" in
AC_DEFINE([WIN32_LEAN_AND_MEAN],[1], [Define to limit the scope of <windows.h>.]) AC_DEFINE([WIN32_LEAN_AND_MEAN],[1], [Define to limit the scope of <windows.h>.])
CPPFLAGS+="-D_WIN32_WINNT=0x0601 -DWINVER=0x0601 -D__USE_MINGW_ANSI_STDIO=1" DAEMONCPPFLAGS+=" -D_WIN32_WINNT=0x0601 -DWINVER=0x0601 -D__USE_MINGW_ANSI_STDIO=1"
LDFLAGS+="-Wl,--nxcompat -Wl,--dynamicbase" DAEMONLDFLAGS+=" -Wl,--nxcompat -Wl,--dynamicbase"
LIBS+=" -lws2_32 -lwsock32 -lshlwapi" LIBS+=" -lws2_32 -lwsock32 -lshlwapi"
ac_default_prefix="`pwd`/_win32" ac_default_prefix="`pwd`/_win32"
DESTDIR="`pwd`/_win32/" DESTDIR="`pwd`/_win32/"
...@@ -134,11 +137,9 @@ AS_IF([test "$SYS" = linux],[ ...@@ -134,11 +137,9 @@ AS_IF([test "$SYS" = linux],[
]) ])
AM_CONDITIONAL(HAVE_ANDROID, test "${HAVE_ANDROID}" = "1") AM_CONDITIONAL(HAVE_ANDROID, test "${HAVE_ANDROID}" = "1")
AS_IF([test "$SYS" = linux && test "${HAVE_ANDROID}" != "1"],[ AS_IF([test "$SYS" = linux && test "${HAVE_ANDROID}" != "1"],
CFLAGS="${CFLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" [DAEMONCPPFLAGS+=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]
CXXFLAGS="${CXXFLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" [])
],[
])
dnl override platform specific check for dependent libraries dnl override platform specific check for dependent libraries
dnl otherwise libtool linking of shared libraries will dnl otherwise libtool linking of shared libraries will
...@@ -198,91 +199,67 @@ AC_MSG_RESULT([$CLANG]) ...@@ -198,91 +199,67 @@ AC_MSG_RESULT([$CLANG])
dnl define DRING_BUILD because we are building libring, not using it dnl define DRING_BUILD because we are building libring, not using it
dnl if building shared library, define dring_EXPORTS dnl if building shared library, define dring_EXPORTS
AC_MSG_CHECKING([if compiling shared library]) AC_MSG_CHECKING([if compiling shared library])
CPPFLAGS="${CPPFLAGS} -fvisibility=hidden -DDRING_BUILD " DAEMONCPPFLAGS+=" -fvisibility=hidden -DDRING_BUILD"
AS_IF([test "x$enable_shared" == "xyes"], [ AS_IF([test "x$enable_shared" == "xyes"],
RING_SHARED=yes [RING_SHARED=yes
CPPFLAGS="${CPPFLAGS} -Ddring_EXPORTS " DAEMONCPPFLAGS+=" -Ddring_EXPORTS"],
],[ [RING_SHARED=no])
RING_SHARED=no
])
AC_MSG_RESULT([$RING_SHARED]) AC_MSG_RESULT([$RING_SHARED])
CPPFLAGS="${CPPFLAGS} -DASIO_STANDALONE" DAEMONCPPFLAGS+=" -DASIO_STANDALONE"
dnl dnl
dnl Check for the contrib directory dnl Check for the contrib directory
dnl dnl
AC_ARG_WITH(contrib, AC_ARG_WITH(contrib,
[AS_HELP_STRING([--with-contrib[=DIR]], [AS_HELP_STRING([--with-contrib[=DIR]],
[search for 3rd party libraries in DIR/include and DIR/lib]) [search for 3rd party libraries in DIR/include and DIR/lib])])
])
AC_MSG_CHECKING([for 3rd party libraries path]) AC_MSG_CHECKING([for 3rd party libraries path])
AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [ AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"],
CONTRIB_DIR="${srcdir}/contrib/${host}" [CONTRIB_DIR="${srcdir}/contrib/${host}"
AS_IF([test ! -d "${CONTRIB_DIR}"], [ AS_IF([test ! -d "${CONTRIB_DIR}"],
echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD [echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
CONTRIB_DIR="${srcdir}/contrib/`$CC -dumpmachine`" CONTRIB_DIR="${srcdir}/contrib/`$CC -dumpmachine`"
AS_IF([test ! -d "${CONTRIB_DIR}"], [ AS_IF([test ! -d "${CONTRIB_DIR}"],
echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD [echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
CONTRIB_DIR="" CONTRIB_DIR=""
AC_MSG_RESULT([not found]) AC_MSG_RESULT([not found])])])],
]) [AS_IF([test "${with_contrib}" != "no"],
]) [CONTRIB_DIR="${with_contrib}"],
], [ [CONTRIB_DIR=""
AS_IF([test "${with_contrib}" != "no"], [ AC_MSG_RESULT([disabled])])])
CONTRIB_DIR="${with_contrib}"
], [ AS_IF([test -n "${CONTRIB_DIR}"],
CONTRIB_DIR="" [AS_IF([test -d "${CONTRIB_DIR}/lib"],
AC_MSG_RESULT([disabled]) [CONTRIB_DIR=`cd "${CONTRIB_DIR}" && pwd`],
]) [echo "${CONTRIB_DIR}/lib not found" >&AS_MESSAGE_LOG_FD
]) CONTRIB_DIR=""
AC_MSG_RESULT([not usable])])])
AS_IF([test -n "${CONTRIB_DIR}"], [
AS_IF([test -d "${CONTRIB_DIR}/lib"],[ AS_IF([test -n "${CONTRIB_DIR}"],
CONTRIB_DIR=`cd "${CONTRIB_DIR}" && pwd` [AC_MSG_RESULT([${CONTRIB_DIR}])
], [ export PATH=${CONTRIB_DIR}/bin:$PATH
echo "${CONTRIB_DIR}/lib not found" >&AS_MESSAGE_LOG_FD
CONTRIB_DIR="" DAEMONCPPFLAGS+=" -I${CONTRIB_DIR}/include -DPJ_AUTOCONF=1"
AC_MSG_RESULT([not usable])
]) AS_IF([test "${HAVE_WIN64}" = "1"],
]) [DAEMONCPPFLAGS+=" -DPJ_WIN64=1"])
AS_IF([test -n "${CONTRIB_DIR}"], [ AS_IF([test "${SYS}" = "mingw32"],
AC_MSG_RESULT([${CONTRIB_DIR}]) [PKG_CONFIG_PATH_CUSTOM="${CONTRIB_DIR}/lib/pkgconfig:\
export PATH=${CONTRIB_DIR}/bin:$PATH ${CONTRIB_DIR}/lib64/pkgconfig"
CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include" AC_SUBST(PKG_CONFIG_PATH_CUSTOM)
export PKG_CONFIG_PATH_CUSTOM])
CFLAGS="${CFLAGS} -DPJ_AUTOCONF=1 "
CXXFLAGS="${CXXFLAGS} -DPJ_AUTOCONF=1 " export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:\
AS_IF([test "${HAVE_WIN64}" = "1"],[ ${CONTRIB_DIR}/lib64/pkgconfig:$PKG_CONFIG_PATH"
CFLAGS+=" -DPJ_WIN64=1" DAEMONLDFLAGS+=" -L${CONTRIB_DIR}/lib"
CXXFLAGS+=" -DPJ_WIN64=1"
]) AS_IF([test "${SYS}" = "darwin"],
CFLAGS+=" -I${CONTRIB_DIR}/include" [export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH"
CXXFLAGS+=" -I${CONTRIB_DIR}/include" export DYLD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH"])],
[AS_IF([test -n "${with_contrib}" && test "${with_contrib}" != "no"],
OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include" [AC_MSG_ERROR([Third party libraries not found!])])])
AS_IF([test "${SYS}" = "mingw32"],[
PKG_CONFIG_PATH_CUSTOM="${CONTRIB_DIR}/lib/pkgconfig:${CONTRIB_DIR}/lib64/pkgconfig"
AC_SUBST(PKG_CONFIG_PATH_CUSTOM)
export PKG_CONFIG_PATH_CUSTOM
])
export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:${CONTRIB_DIR}/lib64/pkgconfig:$PKG_CONFIG_PATH"
LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib"
AS_IF([test "${SYS}" = "darwin"], [
export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH"
export DYLD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH"
], [
PKG_CHECK_MODULES([Jsoncpp], [jsoncpp >= 1.6.5])
CPPFLAGS="${CPPFLAGS} ${Jsoncpp_CFLAGS}"
LDFLAGS="${LDFLAGS} ${Jsoncpp_LIBS}"
])
], [
AS_IF([test -n "${with_contrib}" && test "${with_contrib}" != "no"], [
AC_MSG_ERROR([Third party libraries not found!])
])
])
AC_SUBST(CONTRIB_DIR) AC_SUBST(CONTRIB_DIR)
dnl Add extras/tools to the PATH dnl Add extras/tools to the PATH
...@@ -298,8 +275,13 @@ PKG_CHECK_MODULES(ZLIB, zlib,, AC_MSG_ERROR([zlib not found])) ...@@ -298,8 +275,13 @@ PKG_CHECK_MODULES(ZLIB, zlib,, AC_MSG_ERROR([zlib not found]))
dnl Check for pjproject dnl Check for pjproject
PKG_CHECK_MODULES(PJPROJECT, libpjproject,, AC_MSG_ERROR([Missing pjproject files])) PKG_CHECK_MODULES(PJPROJECT, libpjproject,, AC_MSG_ERROR([Missing pjproject files]))
PKG_CHECK_MODULES([YAMLCPP], [yaml-cpp >= 0.5.1],, AC_MSG_ERROR([yaml-cpp not found])) PKG_CHECK_MODULES([YAMLCPP], [yaml-cpp >= 0.5.1],,
PKG_CHECK_MODULES([JSONCPP], [jsoncpp >= 1.6.5],, AC_MSG_ERROR([jsoncpp not found])) AC_MSG_ERROR([yaml-cpp not found]))
PKG_CHECK_MODULES([JSONCPP], [jsoncpp >= 1.6.5],
[DAEMONCPPFLAGS+=" ${JSONCPP_CFLAGS}"
DAEMONLDFLAGS+=" ${JSONCPP_LIBS}"],
AC_MSG_ERROR([jsoncpp not found]))
if test "${HAVE_ANDROID}" = "1"; then if test "${HAVE_ANDROID}" = "1"; then
dnl Check for OpenSL dnl Check for OpenSL
...@@ -382,9 +364,9 @@ AM_CONDITIONAL(BUILD_JACK, test "x$have_jack" = "xyes") ...@@ -382,9 +364,9 @@ AM_CONDITIONAL(BUILD_JACK, test "x$have_jack" = "xyes")
dnl Coverage is default-disabled dnl Coverage is default-disabled
AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage], [Enable coverage])) AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage], [Enable coverage]))
AS_IF([test "x$enable_coverage" = "xyes"], [ AS_IF([test "x$enable_coverage" = "xyes"],
CXXFLAGS="${CXXFLAGS} --coverage" [DAEMONCXXFLAGS+=" --coverage"
LDFLAGS="${LDFLAGS} --coverage"]) DAEMONLDFLAGS+=" --coverage"])
# DBUSCPP # DBUSCPP
dnl Check for dbuscpp, the C++ bindings for D-Bus dnl Check for dbuscpp, the C++ bindings for D-Bus
...@@ -660,5 +642,12 @@ AC_CONFIG_FILES([Makefile \ ...@@ -660,5 +642,12 @@ AC_CONFIG_FILES([Makefile \
doc/Makefile \ doc/Makefile \
doc/doxygen/Makefile]) doc/doxygen/Makefile])
dnl Transfer the Automake variables set here to Makefile.in.
echo DAEMONCPPFLAGS=$DAEMONCPPFLAGS
AC_SUBST([AM_CPPFLAGS], [$DAEMONCPPFLAGS])
AC_SUBST([AM_CFLAGS], [$DAEMONCFLAGS])
AC_SUBST([AM_CXXFLAGS], [$DAEMONCXXFLAGS])
AC_SUBST([AM_LDFLAGS], [$DAEMONLDFLAGS])
# Go! # Go!
AC_OUTPUT AC_OUTPUT
globals.mk
+ 1
− 1
View file @ bfe7a844
...@@ -10,7 +10,7 @@ RING_DIRTY_REPO ?= $(shell git diff-index --quiet HEAD 2>/dev/null || echo dirty ...@@ -10,7 +10,7 @@ RING_DIRTY_REPO ?= $(shell git diff-index --quiet HEAD 2>/dev/null || echo dirty
RING_REVISION ?= $(shell git log -1 --format="%h" --abbrev=10 2>/dev/null) RING_REVISION ?= $(shell git log -1 --format="%h" --abbrev=10 2>/dev/null)
# Preprocessor flags # Preprocessor flags
AM_CPPFLAGS = \ AM_CPPFLAGS += \
-I$(src)/src \ -I$(src)/src \
-I$(src)/src/config \ -I$(src)/src/config \
-I$(src)/src/media \ -I$(src)/src/media \
......
src/Makefile.am
+ 5
− 3
View file @ bfe7a844
...@@ -78,7 +78,8 @@ libring_la_LDFLAGS = \ ...@@ -78,7 +78,8 @@ libring_la_LDFLAGS = \
@LIBSWSCALE_LIBS@ \ @LIBSWSCALE_LIBS@ \
@LIBAVUTIL_LIBS@ \ @LIBAVUTIL_LIBS@ \
@LIBS@ \ @LIBS@ \
@WEBRTC_LIBS@ @WEBRTC_LIBS@ \
$(AM_LDFLAGS)
if ENABLE_PLUGIN if ENABLE_PLUGIN
libring_la_LDFLAGS+= \ libring_la_LDFLAGS+= \
...@@ -111,9 +112,10 @@ libring_la_CFLAGS = \ ...@@ -111,9 +112,10 @@ libring_la_CFLAGS = \
@LIBAVFILTER_CFLAGS@ \ @LIBAVFILTER_CFLAGS@ \
@LIBSWRESAMPLE_CFLAGS@ \ @LIBSWRESAMPLE_CFLAGS@ \
@LIBSWSCALE_CFLAGS@ \ @LIBSWSCALE_CFLAGS@ \
@WEBRTC_CFLAGS@ @WEBRTC_CFLAGS@ \
$(AM_CFLAGS)
libring_la_CXXFLAGS = @JSONCPP_CFLAGS@ libring_la_CXXFLAGS = $(AM_CXXFLAGS)
if HAVE_LINUX if HAVE_LINUX
#needed to compile the .so #needed to compile the .so
......
src/client/Makefile.am
+ 2
− 1
View file @ bfe7a844
...@@ -29,4 +29,5 @@ libclient_la_CXXFLAGS = \ ...@@ -29,4 +29,5 @@ libclient_la_CXXFLAGS = \
-I./ \ -I./ \
-I../ \ -I../ \
-DPREFIX=\"$(prefix)\" \ -DPREFIX=\"$(prefix)\" \
-DPROGSHAREDIR=\"${datadir}/ring\" -DPROGSHAREDIR=\"${datadir}/ring\" \
$(AM_CXXFLAGS)
src/im/Makefile.am
+ 0
− 1
View file @ bfe7a844
...@@ -2,5 +2,4 @@ include $(top_srcdir)/globals.mk ...@@ -2,5 +2,4 @@ include $(top_srcdir)/globals.mk
noinst_LTLIBRARIES = libim.la noinst_LTLIBRARIES = libim.la
libim_la_CXXFLAGS = @JSONCPP_CFLAGS@
libim_la_SOURCES = instant_messaging.cpp message_engine.cpp instant_messaging.h message_engine.h libim_la_SOURCES = instant_messaging.cpp message_engine.cpp instant_messaging.h message_engine.h
src/jamidht/Makefile.am
+ 0
− 2
View file @ bfe7a844
...@@ -5,8 +5,6 @@ SUBDIRS = eth/libdevcore eth/libdevcrypto ...@@ -5,8 +5,6 @@ SUBDIRS = eth/libdevcore eth/libdevcrypto
AM_CPPFLAGS += -I$(top_srcdir)/src/jamidht/eth AM_CPPFLAGS += -I$(top_srcdir)/src/jamidht/eth
noinst_LTLIBRARIES = libringacc.la noinst_LTLIBRARIES = libringacc.la
libringacc_la_CXXFLAGS = @CXXFLAGS@ @JSONCPP_CFLAGS@
libringacc_la_LIBADD = $(DHT_LIBS) \ libringacc_la_LIBADD = $(DHT_LIBS) \
./eth/libdevcore/libdevcore.la \ ./eth/libdevcore/libdevcore.la \
./eth/libdevcrypto/libdevcrypto.la ./eth/libdevcrypto/libdevcrypto.la
......
src/media/audio/Makefile.am
+ 5
− 2
View file @ bfe7a844
...@@ -53,8 +53,11 @@ libaudio_la_SOURCES = \ ...@@ -53,8 +53,11 @@ libaudio_la_SOURCES = \
audio_rtp_session.cpp \ audio_rtp_session.cpp \
tonecontrol.cpp tonecontrol.cpp
libaudio_la_CXXFLAGS = -I$(top_srcdir)/src libaudio_la_CXXFLAGS = \
libaudio_la_LDFLAGS = -I$(top_srcdir)/src \
$(AM_CXXFLAGS)
libaudio_la_LDFLAGS = $(AM_LDFLAGS)
if BUILD_SPEEXDSP if BUILD_SPEEXDSP
libaudio_la_CXXFLAGS += @SPEEXDSP_CFLAGS@ libaudio_la_CXXFLAGS += @SPEEXDSP_CFLAGS@
......
src/media/audio/coreaudio/Makefile.am
+ 3
− 1
View file @ bfe7a844
...@@ -10,5 +10,7 @@ noinst_LTLIBRARIES = libcoreaudiolayer.la ...@@ -10,5 +10,7 @@ noinst_LTLIBRARIES = libcoreaudiolayer.la
libcoreaudiolayer_la_SOURCES = ios/corelayer.mm ios/corelayer.h libcoreaudiolayer_la_SOURCES = ios/corelayer.mm ios/corelayer.h
endif endif
libcoreaudiolayer_la_CXXFLAGS = -I$(top_srcdir)/src libcoreaudiolayer_la_CXXFLAGS = \
-I$(top_srcdir)/src \
$(AM_CXXFLAGS)
AM_OBJCXXFLAGS = -std=c++17 AM_OBJCXXFLAGS = -std=c++17
src/media/video/Makefile.am
+ 21
− 5
View file @ bfe7a844
...@@ -43,12 +43,28 @@ if RING_ACCEL ...@@ -43,12 +43,28 @@ if RING_ACCEL
libvideo_la_SOURCES += accel.cpp accel.h libvideo_la_SOURCES += accel.cpp accel.h
endif endif
libvideo_la_LIBADD = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@ libvideo_la_LIBADD = \
@LIBAVCODEC_LIBS@ \
@LIBAVFORMAT_LIBS@ \
@LIBAVDEVICE_LIBS@ \
@LIBSWSCALE_LIBS@ \
@LIBAVUTIL_LIBS@
AM_CXXFLAGS=@LIBAVCODEC_CFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVDEVICE_CFLAGS@ @LIBSWSCALE_CFLAGS@ libvideo_la_CFLAGS = \
AM_CFLAGS=@LIBAVCODEC_CFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVDEVICE_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVCODEC_CFLAGS@ \
@LIBAVFORMAT_CFLAGS@ \
@LIBAVDEVICE_CFLAGS@ \
@LIBSWSCALE_CFLAGS@ \
$(AM_CFLAGS)
libvideo_la_CXXFLAGS = \
@LIBAVCODEC_CFLAGS@ \
@LIBAVFORMAT_CFLAGS@ \
@LIBAVDEVICE_CFLAGS@ \
@LIBSWSCALE_CFLAGS@ \
$(AM_CXXFLAGS)
if HAVE_WIN32 if HAVE_WIN32
AM_CXXFLAGS+=-static libvideo_la_CXXFLAGS += -static
AM_CFLAGS+=-static libvideo_la_CFLAGS += -static
endif endif
src/media/video/v4l2/Makefile.am
+ 14
− 4
View file @ bfe7a844
...@@ -6,8 +6,18 @@ libv4l2_la_SOURCES = \ ...@@ -6,8 +6,18 @@ libv4l2_la_SOURCES = \
video_device_impl.cpp \ video_device_impl.cpp \
video_device_monitor_impl.cpp video_device_monitor_impl.cpp
AM_CXXFLAGS = @LIBAVCODEC_CFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVDEVICE_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ AM_CXXFLAGS += \
AM_CXXFLAGS += @UDEV_CFLAGS@ @LIBAVCODEC_CFLAGS@ \
@LIBAVFORMAT_CFLAGS@ \
@LIBAVDEVICE_CFLAGS@ \
@LIBSWSCALE_CFLAGS@ \
@LIBAVUTIL_CFLAGS@ \
@UDEV_CFLAGS@
libv4l2_la_LIBADD = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@ libv4l2_la_LIBADD = \
libv4l2_la_LIBADD += @UDEV_LIBS@ @LIBAVCODEC_LIBS@ \
@LIBAVFORMAT_LIBS@ \
@LIBAVDEVICE_LIBS@ \
@LIBSWSCALE_LIBS@ \
@LIBAVUTIL_LIBS@ \
@UDEV_LIBS@
src/plugin/Makefile.am
+ 2
− 1
View file @ bfe7a844
...@@ -31,4 +31,5 @@ libplugin_la_CXXFLAGS = \ ...@@ -31,4 +31,5 @@ libplugin_la_CXXFLAGS = \
-I./ \ -I./ \
-I../ \ -I../ \
-DPREFIX=\"$(prefix)\" \ -DPREFIX=\"$(prefix)\" \
-DPROGSHAREDIR=\"${datadir}/ring\" -DPROGSHAREDIR=\"${datadir}/ring\" \
$(AM_CXXFLAGS)
src/security/Makefile.am
+ 1
− 1
View file @ bfe7a844
include $(top_srcdir)/globals.mk include $(top_srcdir)/globals.mk
noinst_LTLIBRARIES = libsecurity.la noinst_LTLIBRARIES = libsecurity.la
libsecurity_la_CXXFLAGS = @CXXFLAGS@ -I$(top_srcdir)/src libsecurity_la_CXXFLAGS = -I$(top_srcdir)/src $(AM_CXXFLAGS)
libsecurity_la_SOURCES = \ libsecurity_la_SOURCES = \
tls_session.cpp \ tls_session.cpp \
......
src/sip/Makefile.am
+ 1
− 1
View file @ bfe7a844
include $(top_srcdir)/globals.mk include $(top_srcdir)/globals.mk
noinst_LTLIBRARIES = libsiplink.la noinst_LTLIBRARIES = libsiplink.la
libsiplink_la_CXXFLAGS = @CXXFLAGS@ -I$(top_srcdir)/src libsiplink_la_CXXFLAGS = -I$(top_srcdir)/src $(AM_CXXFLAGS)
libsiplink_la_SOURCES = \ libsiplink_la_SOURCES = \
sipaccountbase.cpp \ sipaccountbase.cpp \
......
src/upnp/Makefile.am
+ 1
− 4
View file @ bfe7a844
...@@ -4,9 +4,6 @@ noinst_LTLIBRARIES = libupnpcontrol.la ...@@ -4,9 +4,6 @@ noinst_LTLIBRARIES = libupnpcontrol.la
SUBDIRS = protocol SUBDIRS = protocol
libupnpcontrol_la_CXXFLAGS = \
@CXXFLAGS@
libupnpcontrol_la_SOURCES = \ libupnpcontrol_la_SOURCES = \
upnp_control.cpp \ upnp_control.cpp \
upnp_control.h \ upnp_control.h \
...@@ -14,4 +11,4 @@ libupnpcontrol_la_SOURCES = \ ...@@ -14,4 +11,4 @@ libupnpcontrol_la_SOURCES = \
upnp_context.h upnp_context.h
libupnpcontrol_la_LIBADD = \ libupnpcontrol_la_LIBADD = \
./protocol/libupnpprotocol.la ./protocol/libupnpprotocol.la
\ No newline at end of file
src/upnp/protocol/Makefile.am
+ 1
− 4
View file @ bfe7a844
...@@ -11,9 +11,6 @@ if BUILD_NATPMP ...@@ -11,9 +11,6 @@ if BUILD_NATPMP
SUBDIRS += natpmp SUBDIRS += natpmp
endif endif
libupnpprotocol_la_CXXFLAGS = \
@CXXFLAGS@
libupnpprotocol_la_SOURCES = \ libupnpprotocol_la_SOURCES = \
igd.h \ igd.h \
igd.cpp \ igd.cpp \
...@@ -30,4 +27,4 @@ endif ...@@ -30,4 +27,4 @@ endif
if BUILD_NATPMP if BUILD_NATPMP
libupnpprotocol_la_LIBADD += ./natpmp/libnat_pmp.la libupnpprotocol_la_LIBADD += ./natpmp/libnat_pmp.la
endif endif
\ No newline at end of file
src/upnp/protocol/natpmp/Makefile.am
+ 1
− 4
View file @ bfe7a844
...@@ -2,11 +2,8 @@ include $(top_srcdir)/globals.mk ...@@ -2,11 +2,8 @@ include $(top_srcdir)/globals.mk
noinst_LTLIBRARIES = libnat_pmp.la noinst_LTLIBRARIES = libnat_pmp.la
libnat_pmp_la_CXXFLAGS = \
@CXXFLAGS@
libnat_pmp_la_SOURCES = \ libnat_pmp_la_SOURCES = \
pmp_igd.h \ pmp_igd.h \
pmp_igd.cpp \ pmp_igd.cpp \
nat_pmp.h \ nat_pmp.h \
nat_pmp.cpp nat_pmp.cpp
\ No newline at end of file
src/upnp/protocol/pupnp/Makefile.am
+ 1
− 4
View file @ bfe7a844
...@@ -2,11 +2,8 @@ include $(top_srcdir)/globals.mk ...@@ -2,11 +2,8 @@ include $(top_srcdir)/globals.mk
noinst_LTLIBRARIES = libpupnp.la noinst_LTLIBRARIES = libpupnp.la
libpupnp_la_CXXFLAGS = \
@CXXFLAGS@
libpupnp_la_SOURCES = \ libpupnp_la_SOURCES = \
upnp_igd.h \ upnp_igd.h \
upnp_igd.cpp \ upnp_igd.cpp \
pupnp.h \ pupnp.h \
pupnp.cpp pupnp.cpp
\ No newline at end of file
test/sip/Makefile.am
+ 2
− 2
View file @ bfe7a844
# Rules for the test code (use `make check` to execute) # Rules for the test code (use `make check` to execute)
include $(top_srcdir)/globals.mk include $(top_srcdir)/globals.mk
AM_CXXFLAGS = -I$(top_srcdir)/src AM_CXXFLAGS += -I$(top_srcdir)/src
AM_LDFLAGS = $(CPPUNIT_LIBS) $(top_builddir)/src/libring.la AM_LDFLAGS += $(CPPUNIT_LIBS) $(top_builddir)/src/libring.la
check_PROGRAMS = ut_sip check_PROGRAMS = ut_sip
ut_sip_SOURCES = sip.cpp test_SIP.h test_SIP.cpp ut_sip_SOURCES = sip.cpp test_SIP.h test_SIP.cpp
......
test/unitTest/Makefile.am
+ 3
− 3
View file @ bfe7a844
# Rules for the test code (use `make check` to execute) # Rules for the test code (use `make check` to execute)
include $(top_srcdir)/globals.mk include $(top_srcdir)/globals.mk
AM_CXXFLAGS = -I$(top_srcdir)/src AM_CXXFLAGS += -I$(top_srcdir)/src
AM_LDFLAGS = $(CPPUNIT_LIBS) $(top_builddir)/src/libring.la AM_LDFLAGS += $(CPPUNIT_LIBS) $(top_builddir)/src/libring.la
check_PROGRAMS = check_PROGRAMS =
####### Unit Test ######## ####### Unit Test ########
...@@ -135,4 +135,4 @@ ut_connectionManager_SOURCES = connectionManager/connectionManager.cpp ...@@ -135,4 +135,4 @@ ut_connectionManager_SOURCES = connectionManager/connectionManager.cpp
check_PROGRAMS += ut_fileTransfer check_PROGRAMS += ut_fileTransfer
ut_fileTransfer_SOURCES = fileTransfer/fileTransfer.cpp ut_fileTransfer_SOURCES = fileTransfer/fileTransfer.cpp
TESTS = $(check_PROGRAMS) TESTS = $(check_PROGRAMS)
\ No newline at end of file
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