From 7b8543f02be40886b64d433c26c9399a83bebac3 Mon Sep 17 00:00:00 2001
From: Rob Caelers <rob.caelers@gmail.com>
Date: Sun, 2 Jun 2019 14:53:40 +0200
Subject: [PATCH] Fix distcheck errors

Signed-off-by: Rob Caelers <rob.caelers@gmail.com>
---
 configure.ac                       |  4 ++++
 libs/dbus/Makefile.am              |  2 +-
 libs/dbus/bin/Makefile.am          |  3 +++
 libs/dbus/data/Makefile.am         |  3 +++
 libs/dbus/include/Makefile.am      |  3 +++
 libs/dbus/include/dbus/Makefile.am |  3 +++
 libs/dbus/src/Makefile.am          |  2 +-
 po/POTFILES.in                     | 13 ++++++-------
 8 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 libs/dbus/bin/Makefile.am
 create mode 100644 libs/dbus/data/Makefile.am
 create mode 100644 libs/dbus/include/Makefile.am
 create mode 100644 libs/dbus/include/dbus/Makefile.am

diff --git a/configure.ac b/configure.ac
index f96430cfd..595970764 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1061,6 +1061,10 @@ AC_CONFIG_FILES([Makefile
              common/win32/harpoonHelper/src/Makefile
              libs/Makefile
              libs/dbus/Makefile
+             libs/dbus/bin/Makefile
+             libs/dbus/data/Makefile
+             libs/dbus/include/Makefile
+             libs/dbus/include/dbus/Makefile
              libs/dbus/src/Makefile
              frontend/Makefile
              frontend/common/Makefile
diff --git a/libs/dbus/Makefile.am b/libs/dbus/Makefile.am
index 75ca64d82..81c3bcdca 100644
--- a/libs/dbus/Makefile.am
+++ b/libs/dbus/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS =	src
+SUBDIRS =	bin data include src
diff --git a/libs/dbus/bin/Makefile.am b/libs/dbus/bin/Makefile.am
new file mode 100644
index 000000000..970d06c92
--- /dev/null
+++ b/libs/dbus/bin/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EXTRA_DIST = $(wildcard $(srcdir)/*.py)
diff --git a/libs/dbus/data/Makefile.am b/libs/dbus/data/Makefile.am
new file mode 100644
index 000000000..f201db5c4
--- /dev/null
+++ b/libs/dbus/data/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EXTRA_DIST = $(wildcard $(srcdir)/*.jinja)
diff --git a/libs/dbus/include/Makefile.am b/libs/dbus/include/Makefile.am
new file mode 100644
index 000000000..9d4e15bfb
--- /dev/null
+++ b/libs/dbus/include/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS =	dbus
diff --git a/libs/dbus/include/dbus/Makefile.am b/libs/dbus/include/dbus/Makefile.am
new file mode 100644
index 000000000..d63806ebd
--- /dev/null
+++ b/libs/dbus/include/dbus/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EXTRA_DIST = $(wildcard $(srcdir)/*.hh)
diff --git a/libs/dbus/src/Makefile.am b/libs/dbus/src/Makefile.am
index 1c8034d5f..54ff2ec37 100644
--- a/libs/dbus/src/Makefile.am
+++ b/libs/dbus/src/Makefile.am
@@ -16,6 +16,6 @@ libworkrave_dbus_la_LIBADD = ${ldadd_platform}
 AM_CPPFLAGS = 		-W -DWORKRAVE_PKGDATADIR="\"${pkgdatadir}\"" -DWORKRAVE_DATADIR="\"${datadir}\"" \
 			-D_XOPEN_SOURCE=600 @WR_COMMON_INCLUDES@ @GLIB_CFLAGS@
 
-EXTRA_DIST = $(wildcard $(srcdir)/*.hh) $(wildcard $(srcdir)/*.h) $(wildcard $(srcdir)/*.icc) locale.inc
+EXTRA_DIST = $(wildcard $(srcdir)/*.hh) $(wildcard $(srcdir)/*.h) $(wildcard $(srcdir)/*.icc)
 
 endif
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9c1a4df8f..2e13f77ab 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -38,13 +38,12 @@ backend/src/win32/W32Configurator.cc
 backend/src/win32/W32InputMonitor.cc
 backend/src/win32/W32InputMonitorFactory.cc
 backend/src/win32/W32LowLevelMonitor.cc
-common/bin/DBus-client-template-freedesktop.cc
-common/bin/DBus-template-freedesktop.cc
-common/bin/DBus-template-gio.cc
-common/src/DBus-freedesktop.cc
-common/src/DBus-gio.cc
-common/src/DBusBinding-freedesktop.cc
-common/src/DBusBinding-gio.cc
+libs/dbus/src/DBusDummy.cc
+libs/dbus/src/DBusGeneric.cc
+libs/dbus/src/DBusFactory.cc
+libs/dbus/src/DBusGio.cc
+libs/dbus/src/DBusBindingGio.cc
+libs/dbus/src/DBusException.cc
 common/src/GlibThread.cc
 common/src/Locale.cc
 common/src/StringUtil.cc