Merge pull request #155 in FS/freeswitch from…

Merge pull request #155 in FS/freeswitch from bugfix/FS-7122-several-libs-do-not-have-the-subdirs to master

* commit '51f2442a':
  resolve an automake warning about subdirs on latest automake

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
 

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 \

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
 

libs/libcodec2/Makefile.am

 AM_CFLAGS = -Isrc -fPIC -Wall -O3 -lm
-AUTOMAKE_OPTS = gnu
+AUTOMAKE_OPTIONS = gnu subdir-objects
 NAME = codec2
 AM_CPPFLAGS = $(AM_CFLAGS)
 

libs/libcodec2/src/Makefile.am

 AM_CFLAGS = -I../src -fPIC -Wall -O3 -g
-AUTOMAKE_OPTS = gnu
+AUTOMAKE_OPTIONS = gnu subdir-objects
 NAME = codec2
 AM_CPPFLAGS = $(AM_CFLAGS)
 

libs/libcodec2/unittest/Makefile.am

 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)
 

libs/libdingaling/Makefile.am

 EXTRA_DIST =
 SUBDIRS = 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign subdir-objects
 NAME=dingaling
 PREFIX=$(prefix)
 TOUCH_TARGET=@if test -f "$@" ; then touch "$@" ; fi ;

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 = \

libs/silk/Makefile.am

 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)
 

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 \

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
 

libs/srtp/Makefile.am

-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

libs/srtp/test/Makefile.am

-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