7 files changed, 20 insertions, 5 deletions
diff --git a/common/Makefile.am b/common/Makefile.am
index ac759001..1659e0d1 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,5 +1,9 @@
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = trace collection ini dhash path_utils elapi
+
+dist_noinst_DATA = \
+    m4
+
 if SINGLELIB
 # Build all components as a single shared library
 lib_LTLIBRARIES = libsssd_util.la
diff --git a/common/collection/Makefile.am b/common/collection/Makefile.am
index 6102f65d..323a5cb0 100644
--- a/common/collection/Makefile.am
+++ b/common/collection/Makefile.am
@@ -16,7 +16,9 @@ ACLOCAL_AMFLAGS = -I m4
 
 # Set up the pkg-config file
 pkgconfigdir = $(libdir)/pkgconfig
-dist_noinst_DATA = collection.pc
+dist_noinst_DATA = \
+    collection.pc \
+    m4
 
 # Build library
 noinst_LTLIBRARIES = libcollection.la
diff --git a/common/dhash/Makefile.am b/common/dhash/Makefile.am
index 71bc144f..ced32695 100644
--- a/common/dhash/Makefile.am
+++ b/common/dhash/Makefile.am
@@ -8,7 +8,9 @@ endif
 ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir = $(libdir)/pkgconfig
-dist_noinst_DATA = dhash.pc
+dist_noinst_DATA = \
+    dhash.pc \
+    m4
 
 noinst_LTLIBRARIES = libdhash.la
 libdhash_la_SOURCES = \
diff --git a/common/elapi/Makefile.am b/common/elapi/Makefile.am
index 7e487a2d..d548a629 100644
--- a/common/elapi/Makefile.am
+++ b/common/elapi/Makefile.am
@@ -28,7 +28,9 @@ ACLOCAL_AMFLAGS = -I m4
 
 # Set up the pkg-config file
 pkgconfigdir = $(libdir)/pkgconfig
-dist_noinst_DATA = elapi.pc
+dist_noinst_DATA = \
+    elapi.pc \
+    m4
 
 # Build libraries
 noinst_LTLIBRARIES = libelapibasic.la libprovider.la libelapi.la
diff --git a/common/elapi/elapi_test/Makefile.am b/common/elapi/elapi_test/Makefile.am
index 1a0c6c93..76f06e0c 100644
--- a/common/elapi/elapi_test/Makefile.am
+++ b/common/elapi/elapi_test/Makefile.am
@@ -18,6 +18,8 @@ AM_CPPFLAGS = -I$(topdir) -I$(topdir)/ini -I$(topdir)/trace -I$(topdir)/collecti
 
 ACLOCAL_AMFLAGS = -I m4
 
+dist_noinst_DATA = m4
+
 # Build library
 noinst_LTLIBRARIES = libelapi_test.la
 
diff --git a/common/ini/Makefile.am b/common/ini/Makefile.am
index 2679be37..bf993bcf 100644
--- a/common/ini/Makefile.am
+++ b/common/ini/Makefile.am
@@ -20,7 +20,8 @@ dist_noinst_DATA = \
     ini_config.pc \
     ini.conf \
     ini.d/real.conf \
-    ini.d/test.conf
+    ini.d/test.conf \
+    m4
 
 # Build library
 noinst_LTLIBRARIES = libini_config.la
diff --git a/common/path_utils/Makefile.am b/common/path_utils/Makefile.am
index 3961a06d..b738c3e6 100644
--- a/common/path_utils/Makefile.am
+++ b/common/path_utils/Makefile.am
@@ -8,7 +8,9 @@ endif
 ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir = $(libdir)/pkgconfig
-dist_noinst_DATA = path_utils.pc
+dist_noinst_DATA = \
+    path_utils.pc \
+    m4
 
 noinst_LTLIBRARIES = libpath_utils.la
 libpath_utils_la_SOURCES = \