build: Fix issues with building dist packages

Change-Id: If61b288ffb2d12cd5c1ecb78f9a0d3a7f2045403
Signed-off-by: Amit Purwar <amit.purwar@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index f07ef83..9ab903e 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -426,7 +426,8 @@ unit_test_hog_LDADD = src/libshared-glib.la \
 
 unit_tests += unit/test-gattrib
 
-unit_test_gattrib_SOURCES = unit/test-gattrib.c attrib/gattrib.c $(btio_sources) src/log.h src/log.c
+unit_test_gattrib_SOURCES = unit/test-gattrib.c attrib/gattrib.c \
+                                       $(btio_sources) src/log.h src/log.c
 unit_test_gattrib_LDADD = lib/libbluetooth-internal.la \
                        src/libshared-glib.la \
                        @GLIB_LIBS@ @DBUS_LIBS@ -ldl -lrt
@@ -474,7 +475,6 @@ EXTRA_DIST += $(manual_pages:.1=.txt)
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --enable-library \
                                                --enable-health \
-                                               --enable-mesh \
                                                --enable-midi \
                                                --enable-manpages \
                                                --enable-android \

diff --git a/Makefile.tools b/Makefile.tools
index e07fd07..88313bd 100755 (executable)
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -71,8 +71,7 @@ endif
 if LOGGER
 libexec_PROGRAMS += tools/btmon-logger
 
-tools_btmon_logger_SOURCES = tools/btmon-logger.c src/systemd.c src/systemd.h \
-                               lib/monitor.h
+tools_btmon_logger_SOURCES = tools/btmon-logger.c src/systemd.c src/systemd.h
 tools_btmon_logger_LDADD = src/libshared-mainloop.la
 tools_btmon_logger_DEPENDENCIES = src/libshared-mainloop.la \
                                        tools/bluetooth-logger.service