From 4909cdb7fb658dcaa0f8043afe467b8be5f3e657 Mon Sep 17 00:00:00 2001 From: Brian West Date: Tue, 24 Feb 2015 14:58:26 -0600 Subject: [PATCH] FS-7322 #resolve --- libs/libzrtp/Makefile.am | 1 - libs/sofia-sip/Makefile.am | 2 +- libs/sofia-sip/s2check/Makefile.am | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) 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 # -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 # 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 # Licensed under LGPL. See file COPYING. -AUTOMAKE_OPTIONS = subdir-objects - # ---------------------------------------------------------------------- # Header paths