提交 51f2442a authored 作者: William King's avatar William King

resolve an automake warning about subdirs on latest automake

Latest automake will detect then warn if the Makefile uses source
files that are in subdirectories, but the subdirs option is not
set. In the FreeSWITCH build system the current expected behavior is
to expect the subdirs option to be enabled.

FS-7122 #resolve
上级 23c18293
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
AM_CFLAGS = $(COMP_VENDOR_CFLAGS) AM_CFLAGS = $(COMP_VENDOR_CFLAGS)
AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS) AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS)
AUTOMAKE_OPTIONS = subdir-objects
noinst_SCRIPTS = broadvoice.spec noinst_SCRIPTS = broadvoice.spec
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
AM_CFLAGS = $(COMP_VENDOR_CFLAGS) AM_CFLAGS = $(COMP_VENDOR_CFLAGS)
AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS) AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS)
AUTOMAKE_OPTIONS = subdir-objects
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = libbroadvoice.dsp \ EXTRA_DIST = libbroadvoice.dsp \
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
ACLOCAL_AMFLAGS = -I build ACLOCAL_AMFLAGS = -I build
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign subdir-objects
SRC = src SRC = src
......
AM_CFLAGS = -Isrc -fPIC -Wall -O3 -lm AM_CFLAGS = -Isrc -fPIC -Wall -O3 -lm
AUTOMAKE_OPTS = gnu AUTOMAKE_OPTIONS = gnu subdir-objects
NAME = codec2 NAME = codec2
AM_CPPFLAGS = $(AM_CFLAGS) AM_CPPFLAGS = $(AM_CFLAGS)
......
AM_CFLAGS = -I../src -fPIC -Wall -O3 -g AM_CFLAGS = -I../src -fPIC -Wall -O3 -g
AUTOMAKE_OPTS = gnu AUTOMAKE_OPTIONS = gnu subdir-objects
NAME = codec2 NAME = codec2
AM_CPPFLAGS = $(AM_CFLAGS) AM_CPPFLAGS = $(AM_CFLAGS)
......
AM_CFLAGS = -I../src -I$(abs_srcdir)/../src -fPIC -g -DFLOATING_POINT -DVAR_ARRAYS -O2 -Wall AM_CFLAGS = -I../src -I$(abs_srcdir)/../src -fPIC -g -DFLOATING_POINT -DVAR_ARRAYS -O2 -Wall
AUTOMAKE_OPTS = gnu AUTOMAKE_OPTIONS = gnu subdir-objects
NAME = libcodec2 NAME = libcodec2
AM_CPPFLAGS = $(AM_CFLAGS) AM_CPPFLAGS = $(AM_CFLAGS)
......
EXTRA_DIST = EXTRA_DIST =
SUBDIRS = SUBDIRS =
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign subdir-objects
NAME=dingaling NAME=dingaling
PREFIX=$(prefix) PREFIX=$(prefix)
TOUCH_TARGET=@if test -f "$@" ; then touch "$@" ; fi ; TOUCH_TARGET=@if test -f "$@" ; then touch "$@" ; fi ;
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
# #
# Viktor Krikun <v.krikun@soft-industry.com> <v.krikun@gmail.com> # Viktor Krikun <v.krikun@soft-industry.com> <v.krikun@gmail.com>
# #
AUTOMAKE_OPTIONS = subdir-objects
libzrtp_includedir=$(includedir)/libzrtp libzrtp_includedir=$(includedir)/libzrtp
libzrtp_include_HEADERS = \ libzrtp_include_HEADERS = \
......
AM_CFLAGS = -Isrc -I$(abs_srcdir)/src -Iinterface -I$(abs_srcdir)/interface -fPIC -O3 AM_CFLAGS = -Isrc -I$(abs_srcdir)/src -Iinterface -I$(abs_srcdir)/interface -fPIC -O3
AUTOMAKE_OPTIONS = gnu AUTOMAKE_OPTIONS = gnu subdir-objects
NAME = libSKP_SILK_SDK NAME = libSKP_SILK_SDK
AM_CPPFLAGS = $(AM_CFLAGS) AM_CPPFLAGS = $(AM_CFLAGS)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Contact: Pekka Pessi <pekka.pessi@nokia.com> # Contact: Pekka Pessi <pekka.pessi@nokia.com>
# Licensed under LGPL. See file COPYING. # Licensed under LGPL. See file COPYING.
AUTOMAKE_OPTIONS = foreign 1.7 AUTOMAKE_OPTIONS = foreign 1.7 subdir-objects
SUBDIRS = libsofia-sip-ua $(GLIB_SUBDIRS) packages # tests s2check utils SUBDIRS = libsofia-sip-ua $(GLIB_SUBDIRS) packages # tests s2check utils
DIST_SUBDIRS = s2check libsofia-sip-ua libsofia-sip-ua-glib utils packages \ DIST_SUBDIRS = s2check libsofia-sip-ua libsofia-sip-ua-glib utils packages \
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
# Contact: Pekka Pessi <pekka.pessi@nokia.com> # Contact: Pekka Pessi <pekka.pessi@nokia.com>
# Licensed under LGPL. See file COPYING. # Licensed under LGPL. See file COPYING.
AUTOMAKE_OPTIONS = subdir-objects
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Header paths # Header paths
......
AUTOMAKE_OPTIONS = gnu AUTOMAKE_OPTIONS = gnu subdir-objects
NAME=srtp NAME=srtp
AM_CFLAGS = $(new_AM_CFLAGS) -I./src -Icrypto/include -I$(srcdir)/include -I$(srcdir)/crypto/include AM_CFLAGS = $(new_AM_CFLAGS) -I./src -Icrypto/include -I$(srcdir)/include -I$(srcdir)/crypto/include
......
AUTOMAKE_OPTIONS = gnu AUTOMAKE_OPTIONS = gnu subdir-objects
AM_CFLAGS = $(new_AM_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/crypto/include AM_CFLAGS = $(new_AM_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/crypto/include
AM_CPPFLAGS = $(AM_CFLAGS) AM_CPPFLAGS = $(AM_CFLAGS)
AM_LDFLAGS = $(new_AM_LDFLAGS) -L$(srcdir) -lsrtp AM_LDFLAGS = $(new_AM_LDFLAGS) -L$(srcdir) -lsrtp
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论