FS-7322 #resolve

diff --git a/libs/libzrtp/Makefile.am b/libs/libzrtp/Makefile.am
index ff5002a69e1704a3bd6152d229c7e638b9def848..2d3b82421da3d7972553a9e3357a7daa58193139 100644 (file)
--- 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 3a5bbb0bafa769019ea540f313c69f9a7a36b05a..727969586575e3d41187172a945d548858c158dc 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 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 ae4d7502b263a78d6548ffe0607b7d74bb0c2066..a6332ac6810cd05bd527ca88a1fa0956927b2d7e 100644 (file)
--- 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