From: Brian West <brian@freeswitch.org>
Date: Tue, 24 Feb 2015 20:58:26 +0000 (-0600)
Subject: FS-7322 #resolve
X-Git-Tag: v1.4.17~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4909cdb7fb658dcaa0f8043afe467b8be5f3e657;p=thirdparty%2Ffreeswitch.git

FS-7322 #resolve
---

diff --git a/libs/libzrtp/Makefile.am b/libs/libzrtp/Makefile.am
index ff5002a69e..2d3b82421d 100644
--- a/libs/libzrtp/Makefile.am
+++ b/libs/libzrtp/Makefile.am
@@ -4,7 +4,6 @@
 # 
 # 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/sofia-sip/Makefile.am b/libs/sofia-sip/Makefile.am
index 3a5bbb0baf..7279695865 100644
--- 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 subdir-objects
+AUTOMAKE_OPTIONS = foreign 1.7
 
 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 ae4d7502b2..a6332ac681 100644
--- a/libs/sofia-sip/s2check/Makefile.am
+++ b/libs/sofia-sip/s2check/Makefile.am
@@ -5,8 +5,6 @@
 # Contact: Pekka Pessi <pekka.pessi@nokia.com>
 # Licensed under LGPL. See file COPYING.
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 # ----------------------------------------------------------------------
 # Header paths