diff --git a/libs/broadvoice/Makefile.am b/libs/broadvoice/Makefile.am index f99395399c..a681b8d450 100644 --- 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 9b197ba891..c96590e472 100644 --- 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 f6211e58e8..5d2317f5b8 100644 --- 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 f4b1bfb68e..8c24f42fe4 100644 --- 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 5dae366d8b..f06c42e0f6 100644 --- 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 9e3494895d..e9a216d48e 100644 --- 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 37bf42cb31..5da1715ef4 100644 --- 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 2d3b82421d..ff5002a69e 100644 --- a/libs/libzrtp/Makefile.am +++ b/libs/libzrtp/Makefile.am @@ -4,6 +4,7 @@ # # Viktor Krikun # +AUTOMAKE_OPTIONS = subdir-objects libzrtp_includedir=$(includedir)/libzrtp libzrtp_include_HEADERS = \ diff --git a/libs/silk/Makefile.am b/libs/silk/Makefile.am index f61fb02b22..a410e96998 100644 --- 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 7279695865..3a5bbb0baf 100644 --- a/libs/sofia-sip/Makefile.am +++ b/libs/sofia-sip/Makefile.am @@ -5,7 +5,7 @@ # Contact: Pekka Pessi # 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 b2851c591e..179b13e3ba 100644 --- a/libs/sofia-sip/s2check/Makefile.am +++ b/libs/sofia-sip/s2check/Makefile.am @@ -5,6 +5,8 @@ # Contact: Pekka Pessi # 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 88be99b4e0..4e89d96f26 100644 --- 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 2651f2714f..4af9005ac3 100644 --- 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