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

diff --git a/libs/broadvoice/Makefile.am b/libs/broadvoice/Makefile.am
index f99395399cc5c3a70c96a204ae173f6b4afa1a37..a681b8d4500be64988da143ddfbfce9d79202e82 100644 (file)
--- a/libs/broadvoice/Makefile.am
+++ b/libs/broadvoice/Makefile.am
@@ -20,6 +20,7 @@
 
 AM_CFLAGS = $(COMP_VENDOR_CFLAGS)
 AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS)
+AUTOMAKE_OPTIONS = subdir-objects
 
 noinst_SCRIPTS = broadvoice.spec
 

diff --git a/libs/broadvoice/src/Makefile.am b/libs/broadvoice/src/Makefile.am
index 9b197ba891780f49afc269326c373ff6b9af5e50..c96590e472dfdbad7680ae7976be4f4cb1715efd 100644 (file)
--- a/libs/broadvoice/src/Makefile.am
+++ b/libs/broadvoice/src/Makefile.am
@@ -21,6 +21,7 @@
 AM_CFLAGS = $(COMP_VENDOR_CFLAGS)
 AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS)
 
+AUTOMAKE_OPTIONS = subdir-objects
 MAINTAINERCLEANFILES = Makefile.in
 
 EXTRA_DIST = libbroadvoice.dsp \

diff --git a/libs/freetdm/Makefile.am b/libs/freetdm/Makefile.am
index f6211e58e8a6f9671236a9341ff89dfbf7bbf47f..5d2317f5b871ac640611a093573b1f59a14e7293 100644 (file)
--- a/libs/freetdm/Makefile.am
+++ b/libs/freetdm/Makefile.am
@@ -30,7 +30,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ACLOCAL_AMFLAGS  = -I build
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign subdir-objects
 
 SRC = src
 

diff --git a/libs/libcodec2/Makefile.am b/libs/libcodec2/Makefile.am
index f4b1bfb68efcbbc9eb73b18eeaf9b2e04469b5ca..8c24f42fe4bca4c1a7129b8ff3b4479f42a3b2af 100644 (file)
--- a/libs/libcodec2/Makefile.am
+++ b/libs/libcodec2/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS = -Isrc -fPIC -Wall -O3 -lm
-AUTOMAKE_OPTS = gnu
+AUTOMAKE_OPTIONS = gnu subdir-objects
 NAME = codec2
 AM_CPPFLAGS = $(AM_CFLAGS)
 

diff --git a/libs/libcodec2/src/Makefile.am b/libs/libcodec2/src/Makefile.am
index 5dae366d8bc5df68988a66c04ad0dfebd33a5a0d..f06c42e0f64a220fd269163826bed2c1913ae0d4 100644 (file)
--- a/libs/libcodec2/src/Makefile.am
+++ b/libs/libcodec2/src/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS = -I../src -fPIC -Wall -O3 -g
-AUTOMAKE_OPTS = gnu
+AUTOMAKE_OPTIONS = gnu subdir-objects
 NAME = codec2
 AM_CPPFLAGS = $(AM_CFLAGS)
 

diff --git a/libs/libcodec2/unittest/Makefile.am b/libs/libcodec2/unittest/Makefile.am
index 9e3494895d688b5f2486bb33c4a340af14d28b53..e9a216d48e20fcde8d45a86c655090c3ffa006af 100644 (file)
--- a/libs/libcodec2/unittest/Makefile.am
+++ b/libs/libcodec2/unittest/Makefile.am
@@ -1,5 +1,5 @@
 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
 AM_CPPFLAGS = $(AM_CFLAGS)
 

diff --git a/libs/libdingaling/Makefile.am b/libs/libdingaling/Makefile.am
index 37bf42cb310d64c5813020b512aab1fd61f20ede..5da1715ef458fc1aee1a8a8b59d26bebc2a65cc9 100644 (file)
--- a/libs/libdingaling/Makefile.am
+++ b/libs/libdingaling/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST =
 SUBDIRS = 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign subdir-objects
 NAME=dingaling
 PREFIX=$(prefix)
 TOUCH_TARGET=@if test -f "$@" ; then touch "$@" ; fi ;

diff --git a/libs/libzrtp/Makefile.am b/libs/libzrtp/Makefile.am
index 2d3b82421da3d7972553a9e3357a7daa58193139..ff5002a69e1704a3bd6152d229c7e638b9def848 100644 (file)
--- a/libs/libzrtp/Makefile.am
+++ b/libs/libzrtp/Makefile.am
@@ -4,6 +4,7 @@
 # 
 # Viktor Krikun <v.krikun@soft-industry.com> <v.krikun@gmail.com>
 #
+AUTOMAKE_OPTIONS = subdir-objects
 
 libzrtp_includedir=$(includedir)/libzrtp
 libzrtp_include_HEADERS = \

diff --git a/libs/silk/Makefile.am b/libs/silk/Makefile.am
index f61fb02b228ab53bc1623b72ad06d926682acac9..a410e96998e9aca78147847805e0da0b91262d95 100644 (file)
--- a/libs/silk/Makefile.am
+++ b/libs/silk/Makefile.am
@@ -1,5 +1,5 @@
 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
 AM_CPPFLAGS = $(AM_CFLAGS)
 

diff --git a/libs/sofia-sip/Makefile.am b/libs/sofia-sip/Makefile.am
index 727969586575e3d41187172a945d548858c158dc..3a5bbb0bafa769019ea540f313c69f9a7a36b05a 100644 (file)
--- a/libs/sofia-sip/Makefile.am
+++ b/libs/sofia-sip/Makefile.am
@@ -5,7 +5,7 @@
 # Contact: Pekka Pessi <pekka.pessi@nokia.com>
 # 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
 DIST_SUBDIRS = s2check libsofia-sip-ua libsofia-sip-ua-glib utils packages \

diff --git a/libs/sofia-sip/s2check/Makefile.am b/libs/sofia-sip/s2check/Makefile.am
index b2851c591e83a9209811e16cef1ac36af1f443a5..179b13e3ba32ba9e3efc5045f07f2c4d5d021e97 100644 (file)
--- a/libs/sofia-sip/s2check/Makefile.am
+++ b/libs/sofia-sip/s2check/Makefile.am
@@ -5,6 +5,8 @@
 # Contact: Pekka Pessi <pekka.pessi@nokia.com>
 # Licensed under LGPL. See file COPYING.
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 # ----------------------------------------------------------------------
 # Header paths
 

diff --git a/libs/srtp/Makefile.am b/libs/srtp/Makefile.am
index 88be99b4e0e0a69f1dc0e22378dd21e31b95217b..4e89d96f26ccaaf11fb273fb464eb7a54ac2cf7c 100644 (file)
--- a/libs/srtp/Makefile.am
+++ b/libs/srtp/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = gnu
+AUTOMAKE_OPTIONS = gnu subdir-objects
 NAME=srtp
 
 AM_CFLAGS    = $(new_AM_CFLAGS) -I./src -Icrypto/include -I$(srcdir)/include -I$(srcdir)/crypto/include

diff --git a/libs/srtp/test/Makefile.am b/libs/srtp/test/Makefile.am
index 2651f2714fc02572411131812e76fca7147fc130..4af9005ac33d00396308d7d9240d7099c22b5fb2 100644 (file)
--- a/libs/srtp/test/Makefile.am
+++ b/libs/srtp/test/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = gnu
+AUTOMAKE_OPTIONS = gnu subdir-objects
 AM_CFLAGS    = $(new_AM_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/crypto/include
 AM_CPPFLAGS  = $(AM_CFLAGS)
 AM_LDFLAGS   = $(new_AM_LDFLAGS) -L$(srcdir) -lsrtp