diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | common/Makefile.am | 4 | ||||
| -rw-r--r-- | common/collection/Makefile.am | 4 | ||||
| -rw-r--r-- | common/dhash/Makefile.am | 4 | ||||
| -rw-r--r-- | common/elapi/Makefile.am | 4 | ||||
| -rw-r--r-- | common/elapi/elapi_test/Makefile.am | 2 | ||||
| -rw-r--r-- | common/ini/Makefile.am | 3 | ||||
| -rw-r--r-- | common/path_utils/Makefile.am | 4 | ||||
| -rw-r--r-- | server/Makefile.am | 3 | ||||
| -rw-r--r-- | sss_client/Makefile.am | 3 |
10 files changed, 25 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 15cca2246..86fd10c03 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,7 @@ RPMBUILD ?= $(PWD)/rpmbuild builddir ?= . dist_noinst_DATA = \ + m4 \ contrib/sssd.spec.in \ BUILD.txt \ COPYING diff --git a/common/Makefile.am b/common/Makefile.am index ac759001e..1659e0d17 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 6102f65d2..323a5cb0e 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 71bc144f8..ced326952 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 7e487a2d6..d548a629d 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 1a0c6c93b..76f06e0c4 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 2679be373..bf993bcf6 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 3961a06d1..b738c3e69 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 = \ diff --git a/server/Makefile.am b/server/Makefile.am index 5b5242584..61145f3dc 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -287,7 +287,8 @@ dist_noinst_DATA = \ examples/sssdproxylocal \ examples/sssdproxytest \ examples/sudo \ - providers/sssd_be.exports + providers/sssd_be.exports \ + m4 ###################### # Command-line Tools # diff --git a/sss_client/Makefile.am b/sss_client/Makefile.am index a83111778..349e0499e 100644 --- a/sss_client/Makefile.am +++ b/sss_client/Makefile.am @@ -59,7 +59,8 @@ pam_test_client_LDFLAGS = -lpam -lpam_misc EXTRA_DIST = build/config.rpath dist_noinst_DATA = \ sss_nss.exports \ - sss_pam.exports + sss_pam.exports \ + m4 install-data-hook: mv $(DESTDIR)/$(nsslibdir)/libnss_sss.so $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2 |