From 4e56cb08c772321b8a9bdf3eb758abf6e4a2c743 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Tue, 30 Sep 2014 00:02:57 -0400
Subject: [PATCH] daemon: fix make dist

Refs #53309

Change-Id: I3a4dba9b068e7c8bd6f444ca2ba541d195b1cc86
---
 daemon/Makefile.am            | 4 ++--
 daemon/bin/dbus/Makefile.am   | 5 ++---
 daemon/src/Makefile.am        | 4 ++--
 daemon/src/audio/Makefile.am  | 2 ++
 daemon/src/client/Makefile.am | 1 +
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 9059a9988..0569bf595 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -30,8 +30,8 @@ EXTRA_DIST = m4/libtool.m4 \
 			 m4/ltoptions.m4 \
 			 m4/ltsugar.m4 \
 			 m4/ltversion.m4 \
-			 ../contrib/bootstrap \
-			 ../contrib/src
+			 contrib/bootstrap \
+			 contrib/src
 
 coverage:
 	$(AM_V_at)lcov --directory $(top_builddir) --capture --output-file sflphone-coverage.info
diff --git a/daemon/bin/dbus/Makefile.am b/daemon/bin/dbus/Makefile.am
index 813902966..d3fcd9450 100644
--- a/daemon/bin/dbus/Makefile.am
+++ b/daemon/bin/dbus/Makefile.am
@@ -63,11 +63,10 @@ service_DATA = $(service_in_files:.service.in=.service)
 $(service_DATA): $(service_in_files) Makefile
 	sed -e "s|libexec|$(libdir)/sflphone|" $<> $@
 
-EXTRA_DIST = README $(service_in_files) \
+EXTRA_DIST = $(service_in_files) \
 			 callmanager-introspec.xml \
 			 configurationmanager-introspec.xml \
-			 instance-introspec.xml \
-			 org.freedesktop.NetworkManager.xml
+			 instance-introspec.xml
 
 if SFL_PRESENCE
 EXTRA_DIST += presencemanager-introspec.xml
diff --git a/daemon/src/Makefile.am b/daemon/src/Makefile.am
index 606ae7588..eadf36334 100644
--- a/daemon/src/Makefile.am
+++ b/daemon/src/Makefile.am
@@ -87,8 +87,8 @@ libsflphone_la_SOURCES = conference.cpp \
 		utf8_utils.cpp \
 		threadloop.h \
 		conference.h \
-		account factory.h \
-		call factory.h \
+		account_factory.h \
+		call_factory.h \
 		preferences.h \
 		managerimpl.h \
 		manager.h \
diff --git a/daemon/src/audio/Makefile.am b/daemon/src/audio/Makefile.am
index 0510d0cb8..9cb60c7ba 100644
--- a/daemon/src/audio/Makefile.am
+++ b/daemon/src/audio/Makefile.am
@@ -38,6 +38,8 @@ libaudio_la_SOURCES = \
 		$(SFL_SPEEXDSP_SRC) \
 		dcblocker.cpp
 
+libaudio_la_CXXFLAGS = -I$(top_srcdir)
+
 noinst_HEADERS = \
 		audiobuffer.h \
 		audioloop.h \
diff --git a/daemon/src/client/Makefile.am b/daemon/src/client/Makefile.am
index a1691d3d5..24a032a85 100644
--- a/daemon/src/client/Makefile.am
+++ b/daemon/src/client/Makefile.am
@@ -23,5 +23,6 @@ libclient_la_SOURCES = client.cpp                \
                        $(VIDEO_SRC)
 
 libclient_la_CXXFLAGS = -I./ \
+                        -I../ \
                         -DPREFIX=\"$(prefix)\" \
                         -DPROGSHAREDIR=\"${datadir}/sflphone\"
-- 
2.22.0