kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
William King 2014-12-31 11:52:06 -08:00
parent 23c1829382
commit 51f2442a9e
13 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/broadvoice/Makefile.am
View File

@ -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

1
libs/broadvoice/src/Makefile.am
View File

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

2
libs/freetdm/Makefile.am
View File

@ -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

2
libs/libcodec2/Makefile.am
View File

@ -1,5 +1,5 @@
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)

2
libs/libcodec2/src/Makefile.am
View File

@ -1,5 +1,5 @@
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)

2
libs/libcodec2/unittest/Makefile.am
View File

@ -1,5 +1,5 @@
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)

2
libs/libdingaling/Makefile.am
View File

@ -1,6 +1,6 @@
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 ;

1
libs/libzrtp/Makefile.am
View File

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

2
libs/silk/Makefile.am
View File

@ -1,5 +1,5 @@
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)

2
libs/sofia-sip/Makefile.am
View File

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

2
libs/sofia-sip/s2check/Makefile.am
View File

@ -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

2
libs/srtp/Makefile.am
View File

@ -1,4 +1,4 @@
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

2
libs/srtp/test/Makefile.am
View File

@ -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_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