URL: https://github.com/freeipa/freeipa/pull/236 Author: pspacek Title: #236: Build phase 7: cleanup Action: opened
PR body: """ Depends on PR #233. - Clean-up ancient leftovers and clean minor bugs here and there. - Support --enable-silent-rules and V=0 variable for make to make the build less verbose and warnings more visible. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/236/head:pr236 git checkout pr236
From c26ff5d4de8eaef7430382f5aacc9bc2df39b43c Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 12:07:03 +0100 Subject: [PATCH 01/11] Build: move client directory handling from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- client/Makefile.am | 3 +++ freeipa.spec.in | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index 0a451e5..4c29ee7 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -122,3 +122,6 @@ MAINTAINERCLEANFILES = \ version.m4 \ $(NULL) +install-data-hook: + $(INSTALL) -d -m 755 $(DESTDIR)$(IPA_SYSCONF_DIR)/nssdb + $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/lib/ipa-client/sysrestore diff --git a/freeipa.spec.in b/freeipa.spec.in index 7dbbf87..4e39b3c 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -804,11 +804,8 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup %endif # ONLY_CLIENT -mkdir -p %{buildroot}%{_sysconfdir}/ipa/ /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf /bin/touch %{buildroot}%{_sysconfdir}/ipa/ca.crt -mkdir -p %{buildroot}%{_sysconfdir}/ipa/nssdb -mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore %if ! %{ONLY_CLIENT} mkdir -p %{buildroot}%{_sysconfdir}/cron.d From efa9861cd95ff213f083db09cd68e16a16b01db3 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 12:45:26 +0100 Subject: [PATCH 02/11] Build: move server directory handling from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- freeipa.spec.in | 8 -------- install/Makefile.am | 11 +++++------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 4e39b3c..68fc2bc 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -741,8 +741,6 @@ sed -i -e'1s/python\(3\|$\)/python2/' %{buildroot}%{_bindir}/ipa %find_lang %{gettext_domain} -mkdir -p %{buildroot}%{_usr}/share/ipa - %if ! %{ONLY_CLIENT} # Remove .la files from libtool - we don't want to package # these files @@ -793,7 +791,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/html/ /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini /bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con -mkdir -p %{buildroot}%{_initrddir} # Web UI plugin dir mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins @@ -801,7 +798,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5 touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so -mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup %endif # ONLY_CLIENT /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf @@ -818,10 +814,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.d sed -e 's,\.py.*$,.*,g' | sort -u | \ sed -e 's,\./,%%{python_sitelib}/ipatests/,g' ) >tests-python.list -mkdir -p %{buildroot}%{_sysconfdir}/ipa/custodia - -mkdir -p %{buildroot}%{_usr}/share/ipa/schema.d - %endif # ONLY_CLIENT diff --git a/install/Makefile.am b/install/Makefile.am index 2dcd927..64219c5 100644 --- a/install/Makefile.am +++ b/install/Makefile.am @@ -19,12 +19,11 @@ SUBDIRS = \ $(NULL) install-exec-local: - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore - chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade - chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca - chmod 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca + $(INSTALL) -d -m 700 $(DESTDIR)$(IPA_SYSCONF_DIR)/custodia + $(INSTALL) -d -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/backup + $(INSTALL) -d -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore + $(INSTALL) -d -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade + $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca uninstall-local: -rmdir $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore From 68449e46ab7adb899161c107d16aa5d0f5145b4a Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 14:39:59 +0100 Subject: [PATCH 03/11] Build: move web UI file installation from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- freeipa.spec.in | 19 ------------------- install/html/Makefile.am | 14 ++++++++++++++ install/ui/Makefile.am | 3 +++ 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 68fc2bc..45d2896 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -763,28 +763,12 @@ rm %{buildroot}/%{plugin_dir}/libtopology.la rm %{buildroot}/%{_libdir}/krb5/plugins/kdb/ipadb.la rm %{buildroot}/%{_libdir}/samba/pdb/ipasam.la -# Some user-modifiable HTML files are provided. Move these to /etc -# and link back. -mkdir -p %{buildroot}/%{_sysconfdir}/ipa/html -mkdir %{buildroot}%{_usr}/share/ipa/html/ -ln -s ../../../..%{_sysconfdir}/ipa/html/ffconfig.js \ - %{buildroot}%{_usr}/share/ipa/html/ffconfig.js -ln -s ../../../..%{_sysconfdir}/ipa/html/ffconfig_page.js \ - %{buildroot}%{_usr}/share/ipa/html/ffconfig_page.js -ln -s ../../../..%{_sysconfdir}/ipa/html/ssbrowser.html \ - %{buildroot}%{_usr}/share/ipa/html/ssbrowser.html -ln -s ../../../..%{_sysconfdir}/ipa/html/unauthorized.html \ - %{buildroot}%{_usr}/share/ipa/html/unauthorized.html -ln -s ../../../..%{_sysconfdir}/ipa/html/browserconfig.html \ - %{buildroot}%{_usr}/share/ipa/html/browserconfig.html - # So we can own our Apache configuration mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/ /bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa.conf /bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-kdc-proxy.conf /bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-pki-proxy.conf /bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf -mkdir -p %{buildroot}%{_usr}/share/ipa/html/ /bin/touch %{buildroot}%{_usr}/share/ipa/html/ca.crt /bin/touch %{buildroot}%{_usr}/share/ipa/html/kerberosauth.xpi /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.con @@ -792,9 +776,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/html/ /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini /bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con -# Web UI plugin dir -mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins - mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5 touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so diff --git a/install/html/Makefile.am b/install/html/Makefile.am index c487f9f..c65ec26 100644 --- a/install/html/Makefile.am +++ b/install/html/Makefile.am @@ -16,3 +16,17 @@ EXTRA_DIST = \ MAINTAINERCLEANFILES = \ *~ \ Makefile.in + +# Default user-modifiable HTML files are installed into /etc. +# /usr points to these modifiable files in /etc +# This is ugly but we do not have time to change it right now. +# Relative paths must be used to ensure that symlinks created in buildroot +# work after installation. +htmldatadir = $(datarootdir)/ipa/html +install-data-hook: + $(INSTALL) -d -m 755 $(DESTDIR)$(htmldatadir) + for FILE in $(app_DATA); do \ + $(LN_S) --force --relative \ + $(DESTDIR)$(appdir)/$${FILE} \ + $(DESTDIR)$(htmldatadir)/$${FILE}; \ + done diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am index 18fb9b4..c81eceb 100644 --- a/install/ui/Makefile.am +++ b/install/ui/Makefile.am @@ -34,3 +34,6 @@ MAINTAINERCLEANFILES = \ *~ \ Makefile.in $(NULL) + +install-data-hook: + $(INSTALL) -d -m 755 $(DESTDIR)$(appdir)/js/plugins From 37e4df19b7647cfb3d9c7566088963939640e5a3 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Fri, 11 Nov 2016 12:21:58 +0100 Subject: [PATCH 04/11] Build: document what should be in %install section of SPEC file https://fedorahosted.org/freeipa/ticket/6418 --- freeipa.spec.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/freeipa.spec.in b/freeipa.spec.in index 45d2896..b552dcd 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -702,6 +702,14 @@ make %{?_smp_mflags} client-check VERBOSE=yes LIBDIR=%{_libdir} %install +# Please put as much logic as possible into make install. It allows: +# - easier porting to other distributions +# - rapid devel & install cycle using make install +# (instead of full RPM build and installation each time) +# +# All files and directories created by spec install should be marked as ghost. +# (These are typically configuration files created by IPA installer.) +# All other artifacts should be created by make install. %make_install # remove files which are useful only for make uninstall find %{buildroot} -wholename '*/site-packages/*/install_files.txt' -exec rm {} \; From c5c05bff37070e3fa4b12e22c47ae72cc645c1ce Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 15:24:50 +0100 Subject: [PATCH 05/11] Build: workaround bug 1005235 related to Python paths in auto-generated Requires https://fedorahosted.org/freeipa/ticket/6418 --- freeipa.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/freeipa.spec.in b/freeipa.spec.in index b552dcd..6cacbac 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -689,6 +689,8 @@ This package contains tests that verify IPA functionality under Python 3. %build # UI compilation segfaulted on some arches when the stack was lower (#1040576) export JAVA_STACK_SIZE="8m" +# PATH is workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1005235 +export PATH=/usr/bin:/usr/sbin:$PATH %configure --with-vendor-suffix=-%{release} %make_build From 90198858751969e547930a738c57e69e067a8c14 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Fri, 11 Nov 2016 12:37:03 +0100 Subject: [PATCH 06/11] Build: support --enable-silent-rules for Python packages Setuptools will print only warnings. The option has to be used before setuptools command specification, otherwise it will not apply to sub-commands. https://fedorahosted.org/freeipa/ticket/6418 --- Makefile.python.am | 20 ++++++++++++++------ configure.ac | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Makefile.python.am b/Makefile.python.am index 0ea3fcf..c9c1a1f 100644 --- a/Makefile.python.am +++ b/Makefile.python.am @@ -1,18 +1,26 @@ pkgname = $(shell basename "$(abs_srcdir)") pkgpythondir = $(pythondir)/$(pkgname) +if VERBOSE_MAKE +VERBOSITY="--verbose" +else +VERBOSITY="--quiet" +endif !VERBOSE_MAKE + all-local: - cd $(srcdir); $(PYTHON) setup.py build \ - --build-base "$(abs_builddir)/build" \ - --verbose + cd $(srcdir); $(PYTHON) setup.py \ + $(VERBOSITY) \ + build \ + --build-base "$(abs_builddir)/build" install-exec-local: - $(PYTHON) $(srcdir)/setup.py install \ + $(PYTHON) $(srcdir)/setup.py \ + $(VERBOSITY) \ + install \ --prefix "$(DESTDIR)$(prefix)" \ --single-version-externally-managed \ --record "$(DESTDIR)$(pkgpythondir)/install_files.txt" \ - --optimize 1 \ - --verbose + --optimize 1 uninstall-local: cat "$(DESTDIR)$(pkgpythondir)/install_files.txt" | xargs rm -rf diff --git a/configure.ac b/configure.ac index 4d0b09c..b042455 100644 --- a/configure.ac +++ b/configure.ac @@ -419,6 +419,8 @@ else AC_MSG_RESULT(no) fi +AM_CONDITIONAL([VERBOSE_MAKE], [test "x${AM_DEFAULT_VERBOSITY}" == "x1"]) + dnl --------------------------------------------------------------------------- dnl Linters dnl --------------------------------------------------------------------------- From 3152bd2224dd1f970333f427a872dc7acfad5e9d Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Fri, 11 Nov 2016 12:46:00 +0100 Subject: [PATCH 07/11] Build: enable silent build in makerpms.sh Build called from makerpms.sh is not verbose by default anymore. It still prints all directories and files it builds but the long command lines are hidden by default. It has the advantage that compiler and other warnings are visible to developers right away. If you need to debug something, use --disable-silent-rules to override the default (or call configure manually). https://fedorahosted.org/freeipa/ticket/6418 --- makerpms.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makerpms.sh b/makerpms.sh index 775d18f..ee6ba8a 100755 --- a/makerpms.sh +++ b/makerpms.sh @@ -4,7 +4,7 @@ set -o errexit pushd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" test ! -x "configure" && autoreconf -i -test ! -f "Makefile" && ./configure "$@" +test ! -f "Makefile" && ./configure --enable-silent-rules "$@" make rpms popd From c89056b9eb6933cb023c9c95382a7f7b2bfd77f4 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Fri, 11 Nov 2016 14:37:18 +0100 Subject: [PATCH 08/11] Build: remove incorrect use of MAINTAINERCLEANFILES Automake manual section 13 What Gets Cleaned says that make maintainer-clean should not remove files necessary for subsequent runs of ./configure. It practically means that all usage of MAINTAINERCLEANFILES were incorrect so I've removed them. https://fedorahosted.org/freeipa/ticket/6418 --- client/Makefile.am | 23 -------------------- client/man/Makefile.am | 6 ------ daemons/Makefile.am | 25 ---------------------- daemons/ipa-kdb/Makefile.am | 4 ---- daemons/ipa-sam/Makefile.am | 4 ---- daemons/ipa-slapi-plugins/Makefile.am | 4 ---- daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am | 4 ---- daemons/ipa-slapi-plugins/ipa-dns/Makefile.am | 4 ---- .../ipa-slapi-plugins/ipa-enrollment/Makefile.am | 4 ---- .../ipa-slapi-plugins/ipa-extdom-extop/Makefile.am | 4 ---- daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am | 4 ---- daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am | 4 ---- .../ipa-slapi-plugins/ipa-otp-counter/Makefile.am | 1 - .../ipa-otp-lasttoken/Makefile.am | 1 - .../ipa-slapi-plugins/ipa-pwd-extop/Makefile.am | 1 - .../ipa-slapi-plugins/ipa-range-check/Makefile.am | 4 ---- daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am | 4 ---- daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am | 4 ---- daemons/ipa-slapi-plugins/ipa-version/Makefile.am | 4 ---- daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am | 4 ---- daemons/ipa-slapi-plugins/libotp/Makefile.am | 1 - daemons/ipa-slapi-plugins/topology/Makefile.am | 4 ---- install/Makefile.am | 25 ---------------------- install/certmonger/Makefile.am | 4 ---- install/conf/Makefile.am | 4 ---- install/html/Makefile.am | 4 ---- install/migration/Makefile.am | 4 ---- install/oddjob/Makefile.am | 4 ---- install/restart_scripts/Makefile.am | 4 ---- install/share/Makefile.am | 4 ---- install/share/advise/Makefile.am | 4 ---- install/share/advise/legacy/Makefile.am | 4 ---- install/share/profiles/Makefile.am | 4 ---- install/share/schema.d/Makefile.am | 4 ---- install/tools/Makefile.am | 4 ---- install/tools/man/Makefile.am | 4 ---- install/ui/Makefile.am | 5 ----- install/ui/build/Makefile.am | 5 ----- install/ui/build/dojo/Makefile.am | 4 ---- install/ui/build/freeipa/Makefile.am | 4 ---- install/ui/css/Makefile.am | 4 ---- install/ui/images/Makefile.am | 4 ---- install/ui/src/Makefile.am | 5 ----- install/ui/src/libs/Makefile.am | 4 ---- install/updates/Makefile.am | 4 ---- install/wsgi/Makefile.am | 4 ---- ipatests/man/Makefile.am | 4 ---- 47 files changed, 242 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index 4c29ee7..b6c9dea 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -99,29 +99,6 @@ EXTRA_DIST = \ $(sbin_SCRIPTS) \ $(NULL) -DISTCLEANFILES = \ - $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - intltool-*.in \ - compile \ - configure \ - COPYING \ - INSTALL \ - install-sh \ - missing \ - mkinstalldirs \ - config.guess \ - ltmain.sh \ - config.sub \ - depcomp \ - Makefile.in \ - config.h.* \ - aclocal.m4 \ - version.m4 \ - $(NULL) - install-data-hook: $(INSTALL) -d -m 755 $(DESTDIR)$(IPA_SYSCONF_DIR)/nssdb $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/lib/ipa-client/sysrestore diff --git a/client/man/Makefile.am b/client/man/Makefile.am index fbee4d3..566c429 100644 --- a/client/man/Makefile.am +++ b/client/man/Makefile.am @@ -2,8 +2,6 @@ AUTOMAKE_OPTIONS = 1.7 -NULL = - dist_man1_MANS = \ ipa-getkeytab.1 \ ipa-rmkeytab.1 \ @@ -15,7 +13,3 @@ dist_man1_MANS = \ dist_man5_MANS = \ default.conf.5 - -MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) diff --git a/daemons/Makefile.am b/daemons/Makefile.am index 7ae7b3c..a3d4d1d 100644 --- a/daemons/Makefile.am +++ b/daemons/Makefile.am @@ -19,28 +19,3 @@ SUBDIRS = \ ipa-sam \ ipa-otpd \ $(NULL) - -DISTCLEANFILES = \ - $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - intltool-*.in \ - compile \ - configure \ - COPYING \ - INSTALL \ - install-sh \ - missing \ - mkinstalldirs \ - config.guess \ - ltmain.sh \ - config.sub \ - depcomp \ - Makefile.in \ - config.h.* \ - aclocal.m4 \ - version.m4 \ - ipa-client.spec \ - py-compile \ - $(NULL) diff --git a/daemons/ipa-kdb/Makefile.am b/daemons/ipa-kdb/Makefile.am index 2b46e00..19583c9 100644 --- a/daemons/ipa-kdb/Makefile.am +++ b/daemons/ipa-kdb/Makefile.am @@ -89,7 +89,3 @@ EXTRA_DIST = \ README \ README.s4u2proxy.txt \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/daemons/ipa-sam/Makefile.am b/daemons/ipa-sam/Makefile.am index 790e175..2f90467 100644 --- a/daemons/ipa-sam/Makefile.am +++ b/daemons/ipa-sam/Makefile.am @@ -60,7 +60,3 @@ EXTRA_DIST = \ README \ ipa_sam.h \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/daemons/ipa-slapi-plugins/Makefile.am b/daemons/ipa-slapi-plugins/Makefile.am index 0ab45ac..216b2ad 100644 --- a/daemons/ipa-slapi-plugins/Makefile.am +++ b/daemons/ipa-slapi-plugins/Makefile.am @@ -25,7 +25,3 @@ noinst_HEADERS = \ EXTRA_DIST = \ README \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am b/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am index 037c0fc..f299b70 100644 --- a/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am @@ -61,7 +61,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am b/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am index f8f28d6..099708c 100644 --- a/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am @@ -38,7 +38,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am b/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am index 34b5cb7..4ce32c4 100644 --- a/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am @@ -38,7 +38,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am index a426353..c9f74f0 100644 --- a/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am @@ -70,7 +70,3 @@ EXTRA_DIST = \ test_data \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am b/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am index 89b5093..8d8c975 100644 --- a/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am @@ -38,7 +38,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am b/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am index 51feb5b..8efa155 100644 --- a/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am @@ -38,7 +38,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am b/daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am index 34fd778..dee3845 100644 --- a/daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am @@ -1,4 +1,3 @@ -MAINTAINERCLEANFILES = *~ Makefile.in PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ -I$(srcdir) \ diff --git a/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am b/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am index 8c2bf3d..e98e696 100644 --- a/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am @@ -1,4 +1,3 @@ -MAINTAINERCLEANFILES = *~ Makefile.in PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ -I$(srcdir) \ diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am index f9e32d9..43c99d9 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am @@ -1,6 +1,5 @@ NULL = -MAINTAINERCLEANFILES = *~ Makefile.in PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ diff --git a/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am b/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am index bf7b1f2..b9abc4a 100644 --- a/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am @@ -38,7 +38,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am b/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am index 60c63ea..a672e21 100644 --- a/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am @@ -56,7 +56,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am b/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am index ac86dd4..540325e 100644 --- a/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am @@ -39,7 +39,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/daemons/ipa-slapi-plugins/ipa-version/Makefile.am b/daemons/ipa-slapi-plugins/ipa-version/Makefile.am index 686c958..21bf9c2 100644 --- a/daemons/ipa-slapi-plugins/ipa-version/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-version/Makefile.am @@ -40,7 +40,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am b/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am index 0b32b84..3ac572d 100644 --- a/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am @@ -40,7 +40,3 @@ EXTRA_DIST = \ README \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/daemons/ipa-slapi-plugins/libotp/Makefile.am b/daemons/ipa-slapi-plugins/libotp/Makefile.am index 35e8d2a..3a89a67 100644 --- a/daemons/ipa-slapi-plugins/libotp/Makefile.am +++ b/daemons/ipa-slapi-plugins/libotp/Makefile.am @@ -1,4 +1,3 @@ -MAINTAINERCLEANFILES = *~ Makefile.in PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = -I/usr/include/dirsrv \ -I$(PLUGIN_COMMON_DIR) diff --git a/daemons/ipa-slapi-plugins/topology/Makefile.am b/daemons/ipa-slapi-plugins/topology/Makefile.am index 11fb02a..1d86bd0 100644 --- a/daemons/ipa-slapi-plugins/topology/Makefile.am +++ b/daemons/ipa-slapi-plugins/topology/Makefile.am @@ -44,7 +44,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/Makefile.am b/install/Makefile.am index 64219c5..845e751 100644 --- a/install/Makefile.am +++ b/install/Makefile.am @@ -31,28 +31,3 @@ uninstall-local: -rmdir $(DESTDIR)$(localstatedir)/lib/ipa EXTRA_DIST = README.schema - -DISTCLEANFILES = \ - $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - intltool-*.in \ - compile \ - configure \ - COPYING \ - INSTALL \ - install-sh \ - missing \ - mkinstalldirs \ - config.guess \ - ltmain.sh \ - config.sub \ - depcomp \ - Makefile.in \ - config.h.* \ - aclocal.m4 \ - version.m4 \ - ipa-client.spec \ - py-compile \ - $(NULL) diff --git a/install/certmonger/Makefile.am b/install/certmonger/Makefile.am index 2dc476f..63fd577 100644 --- a/install/certmonger/Makefile.am +++ b/install/certmonger/Makefile.am @@ -9,7 +9,3 @@ app_SCRIPTS = \ EXTRA_DIST = \ $(app_SCRIPTS) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/conf/Makefile.am b/install/conf/Makefile.am index 5daac77..751bb16 100644 --- a/install/conf/Makefile.am +++ b/install/conf/Makefile.am @@ -11,7 +11,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/html/Makefile.am b/install/html/Makefile.am index c65ec26..3b7a064 100644 --- a/install/html/Makefile.am +++ b/install/html/Makefile.am @@ -13,10 +13,6 @@ EXTRA_DIST = \ $(app_DATA) \ $(NULL) -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in - # Default user-modifiable HTML files are installed into /etc. # /usr points to these modifiable files in /etc # This is ugly but we do not have time to change it right now. diff --git a/install/migration/Makefile.am b/install/migration/Makefile.am index b905780..4d22de5 100644 --- a/install/migration/Makefile.am +++ b/install/migration/Makefile.am @@ -11,7 +11,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/oddjob/Makefile.am b/install/oddjob/Makefile.am index a477ed3..1dbd8fa 100644 --- a/install/oddjob/Makefile.am +++ b/install/oddjob/Makefile.am @@ -18,7 +18,3 @@ dist_oddjobconf_DATA = \ etc/oddjobd.conf.d/oddjobd-ipa-trust.conf \ etc/oddjobd.conf.d/ipa-server.conf \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/restart_scripts/Makefile.am b/install/restart_scripts/Makefile.am index dd949a9..04881b4 100644 --- a/install/restart_scripts/Makefile.am +++ b/install/restart_scripts/Makefile.am @@ -13,7 +13,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/share/Makefile.am b/install/share/Makefile.am index 776aaab..10de84d 100644 --- a/install/share/Makefile.am +++ b/install/share/Makefile.am @@ -90,7 +90,3 @@ dist_app_DATA = \ kdcproxyconfdir = $(IPA_SYSCONF_DIR)/kdcproxy dist_kdcproxyconf_DATA = \ kdcproxy.conf - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/share/advise/Makefile.am b/install/share/advise/Makefile.am index 877f91c..6d2a99b 100644 --- a/install/share/advise/Makefile.am +++ b/install/share/advise/Makefile.am @@ -11,7 +11,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/share/advise/legacy/Makefile.am b/install/share/advise/legacy/Makefile.am index 4121851..d238b29 100644 --- a/install/share/advise/legacy/Makefile.am +++ b/install/share/advise/legacy/Makefile.am @@ -11,7 +11,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/share/profiles/Makefile.am b/install/share/profiles/Makefile.am index b5ccb6e..d1c1bac 100644 --- a/install/share/profiles/Makefile.am +++ b/install/share/profiles/Makefile.am @@ -9,7 +9,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/share/schema.d/Makefile.am b/install/share/schema.d/Makefile.am index 0fef87f..6cd554e 100644 --- a/install/share/schema.d/Makefile.am +++ b/install/share/schema.d/Makefile.am @@ -10,7 +10,3 @@ app_DATA = README \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/tools/Makefile.am b/install/tools/Makefile.am index a440bcc..74f428e 100644 --- a/install/tools/Makefile.am +++ b/install/tools/Makefile.am @@ -36,7 +36,3 @@ dist_app_SCRIPTS = \ ipa-httpd-kdcproxy \ ipa-pki-retrieve-key \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/tools/man/Makefile.am b/install/tools/man/Makefile.am index d2b3195..b1fba6d 100644 --- a/install/tools/man/Makefile.am +++ b/install/tools/man/Makefile.am @@ -33,7 +33,3 @@ dist_man8_MANS = \ ipactl.8 \ ipa-upgradeconfig.8 \ $(NULL) - -MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am index c81eceb..7733958 100644 --- a/install/ui/Makefile.am +++ b/install/ui/Makefile.am @@ -30,10 +30,5 @@ EXTRA_DIST = \ $(app_DATA) \ $(NULL) -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in - $(NULL) - install-data-hook: $(INSTALL) -d -m 755 $(DESTDIR)$(appdir)/js/plugins diff --git a/install/ui/build/Makefile.am b/install/ui/build/Makefile.am index 0787e7f..33a3ade 100644 --- a/install/ui/build/Makefile.am +++ b/install/ui/build/Makefile.am @@ -9,8 +9,3 @@ SUBDIRS = \ EXTRA_DIST = \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in - $(NULL) diff --git a/install/ui/build/dojo/Makefile.am b/install/ui/build/dojo/Makefile.am index 666a49a..2df5f69 100644 --- a/install/ui/build/dojo/Makefile.am +++ b/install/ui/build/dojo/Makefile.am @@ -8,7 +8,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/ui/build/freeipa/Makefile.am b/install/ui/build/freeipa/Makefile.am index 35a3181..05e82f4 100644 --- a/install/ui/build/freeipa/Makefile.am +++ b/install/ui/build/freeipa/Makefile.am @@ -12,10 +12,6 @@ EXTRA_DIST = \ $(app_DATA) \ $(NULL) -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in - core := $(wildcard ../../src/freeipa/*.js) base := $(wildcard ../../src/freeipa/_base/*.js) widgets := $(wildcard ../../src/freeipa/widgets/*.js) diff --git a/install/ui/css/Makefile.am b/install/ui/css/Makefile.am index 2543145..3cc6968 100644 --- a/install/ui/css/Makefile.am +++ b/install/ui/css/Makefile.am @@ -15,10 +15,6 @@ EXTRA_DIST = \ $(app_DATA) \ $(NULL) -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in - ipa := $(wildcard ../less/*.less) ipa.css: $(ipa) diff --git a/install/ui/images/Makefile.am b/install/ui/images/Makefile.am index 7d85d7e..f922fd0 100644 --- a/install/ui/images/Makefile.am +++ b/install/ui/images/Makefile.am @@ -13,7 +13,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/ui/src/Makefile.am b/install/ui/src/Makefile.am index 4c70ba1..6182b7b 100644 --- a/install/ui/src/Makefile.am +++ b/install/ui/src/Makefile.am @@ -11,8 +11,3 @@ EXTRA_DIST = \ dojo.profile.js \ freeipa \ webui.profile.js - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in - $(NULL) diff --git a/install/ui/src/libs/Makefile.am b/install/ui/src/libs/Makefile.am index 1962c41..f5a9e0e 100644 --- a/install/ui/src/libs/Makefile.am +++ b/install/ui/src/libs/Makefile.am @@ -19,7 +19,3 @@ nodist_app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/updates/Makefile.am b/install/updates/Makefile.am index b1177d8..a80256f 100644 --- a/install/updates/Makefile.am +++ b/install/updates/Makefile.am @@ -66,7 +66,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/install/wsgi/Makefile.am b/install/wsgi/Makefile.am index a6211d6..f5f0f11 100644 --- a/install/wsgi/Makefile.am +++ b/install/wsgi/Makefile.am @@ -8,7 +8,3 @@ app_DATA = \ EXTRA_DIST = \ $(app_DATA) \ $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff --git a/ipatests/man/Makefile.am b/ipatests/man/Makefile.am index 6b79128..6d66699 100644 --- a/ipatests/man/Makefile.am +++ b/ipatests/man/Makefile.am @@ -9,7 +9,3 @@ dist_man1_MANS = \ ipa-test-config.1 \ ipa-test-task.1 \ $(NULL) - -MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) From 7d568c00c85054437465e532832e054a4f330710 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Fri, 11 Nov 2016 15:32:29 +0100 Subject: [PATCH 09/11] Build: update makerpms.sh to use same paths as rpmbuild This allows us to simply use makerpms.sh to configure the build tree, install RPMs to configure system for the first time and then use make install for rapid devel/test cycles. Configuration parameteres were taken from rpm-4.13.0-0.rc1.27.fc24.x86_64. https://fedorahosted.org/freeipa/ticket/6418 --- makerpms.sh | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/makerpms.sh b/makerpms.sh index ee6ba8a..bdf0231 100755 --- a/makerpms.sh +++ b/makerpms.sh @@ -4,7 +4,26 @@ set -o errexit pushd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" test ! -x "configure" && autoreconf -i -test ! -f "Makefile" && ./configure --enable-silent-rules "$@" +# run configure with the same parameters as RPM build +# this makes it easy to tweak files locally and use make install +test ! -f "Makefile" && ./configure --enable-silent-rules \ + --host=$(rpm -E %{_host}) \ + --build=$(rpm -E %{_build}) \ + --program-prefix=$(rpm -E %{?_program_prefix}) \ + --prefix=$(rpm -E %{_prefix}) \ + --exec-prefix=$(rpm -E %{_exec_prefix}) \ + --bindir=$(rpm -E %{_bindir}) \ + --sbindir=$(rpm -E %{_sbindir}) \ + --sysconfdir=$(rpm -E %{_sysconfdir}) \ + --datadir=$(rpm -E %{_datadir}) \ + --includedir=$(rpm -E %{_includedir}) \ + --libdir=$(rpm -E %{_libdir}) \ + --libexecdir=$(rpm -E %{_libexecdir}) \ + --localstatedir=$(rpm -E %{_localstatedir}) \ + --sharedstatedir=$(rpm -E %{_sharedstatedir}) \ + --mandir=$(rpm -E %{_mandir}) \ + --infodir=$(rpm -E %{_infodir}) \ + "$@" make rpms popd From 5092c6c5466aa5959bdcf1a7fa0dbea6219fa71b Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Fri, 11 Nov 2016 15:43:14 +0100 Subject: [PATCH 10/11] Build: fix file dependencies for make-css.sh Some of .less files included by ipa.less were not listed in the Makefile.am so some changes might not trigger rebuild. https://fedorahosted.org/freeipa/ticket/6418 --- install/ui/css/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install/ui/css/Makefile.am b/install/ui/css/Makefile.am index 3cc6968..33dc51e 100644 --- a/install/ui/css/Makefile.am +++ b/install/ui/css/Makefile.am @@ -15,7 +15,11 @@ EXTRA_DIST = \ $(app_DATA) \ $(NULL) -ipa := $(wildcard ../less/*.less) +ipa := $(wildcard ../less/*.less) \ + ../less/font-awesome/variables.less \ + ../less/patternfly/variables.less \ + ../less/bootstrap/variables.less \ + ../less/variables.less ipa.css: $(ipa) $(srcdir)/../util/make-css.sh From 42804d55833dbf60e61225443b2979bc577be8f4 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Fri, 11 Nov 2016 16:22:49 +0100 Subject: [PATCH 11/11] Build: clean-up spurious NULL variables from Makefile.am files I was not able to find any reason why NULLs should stay there. Google search returned only patches for other projects removing it and no results explaining why it is/was necessary. https://fedorahosted.org/freeipa/ticket/6418 --- client/Makefile.am | 40 +++++++--------------- daemons/Makefile.am | 10 ++---- daemons/ipa-kdb/Makefile.am | 25 +++++--------- daemons/ipa-sam/Makefile.am | 22 ++++-------- daemons/ipa-slapi-plugins/Makefile.am | 8 ++--- daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am | 31 ++++++----------- daemons/ipa-slapi-plugins/ipa-dns/Makefile.am | 20 ++++------- .../ipa-slapi-plugins/ipa-enrollment/Makefile.am | 20 ++++------- .../ipa-slapi-plugins/ipa-extdom-extop/Makefile.am | 31 ++++++----------- daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am | 20 ++++------- daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am | 20 ++++------- .../ipa-slapi-plugins/ipa-pwd-extop/Makefile.am | 20 ++++------- .../ipa-slapi-plugins/ipa-range-check/Makefile.am | 20 ++++------- daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am | 26 +++++--------- daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am | 20 ++++------- daemons/ipa-slapi-plugins/ipa-version/Makefile.am | 20 ++++------- daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am | 21 +++--------- daemons/ipa-slapi-plugins/topology/Makefile.am | 21 +++--------- install/Makefile.am | 5 +-- install/certmonger/Makefile.am | 8 ++--- install/conf/Makefile.am | 8 ++--- install/html/Makefile.am | 8 ++--- install/migration/Makefile.am | 8 ++--- install/oddjob/Makefile.am | 11 ++---- install/restart_scripts/Makefile.am | 8 ++--- install/share/Makefile.am | 5 +-- install/share/advise/Makefile.am | 13 +------ install/share/advise/legacy/Makefile.am | 8 ++--- install/share/profiles/Makefile.am | 8 ++--- install/share/schema.d/Makefile.am | 11 ++---- install/tools/Makefile.am | 11 ++---- install/tools/man/Makefile.am | 8 ++--- install/ui/Makefile.am | 11 ++---- install/ui/build/Makefile.am | 8 +---- install/ui/build/dojo/Makefile.am | 8 ++--- install/ui/build/freeipa/Makefile.am | 8 ++--- install/ui/css/Makefile.am | 8 ++--- install/ui/images/Makefile.am | 8 ++--- install/ui/src/Makefile.am | 5 +-- install/ui/src/libs/Makefile.am | 8 ++--- install/updates/Makefile.am | 8 ++--- install/wsgi/Makefile.am | 8 ++--- ipatests/man/Makefile.am | 5 +-- 43 files changed, 168 insertions(+), 432 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index b6c9dea..345ee7c 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -2,13 +2,10 @@ AUTOMAKE_OPTIONS = 1.7 subdir-objects -NULL = - -AM_CFLAGS = $(NULL) +AM_CFLAGS = if HAVE_GCC AM_CFLAGS += -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith \ - -Wcast-align -Werror-implicit-function-declaration \ - $(NULL) + -Wcast-align -Werror-implicit-function-declaration endif export AM_CFLAGS @@ -30,26 +27,22 @@ AM_CPPFLAGS = \ $(SASL_CFLAGS) \ $(POPT_CFLAGS) \ $(WARN_CFLAGS) \ - $(INI_CFLAGS) \ - $(NULL) + $(INI_CFLAGS) sbin_PROGRAMS = \ ipa-getkeytab \ ipa-rmkeytab \ - ipa-join \ - $(NULL) + ipa-join sbin_SCRIPTS = \ ipa-client-install \ ipa-client-automount \ - ipa-certupdate \ - $(NULL) + ipa-certupdate ipa_getkeytab_SOURCES = \ ipa-getkeytab.c \ ipa-client-common.c \ - $(KRB5_UTIL_SRCS) \ - $(NULL) + $(KRB5_UTIL_SRCS) ipa_getkeytab_LDADD = \ $(top_builddir)/asn1/libipaasn1.la \ @@ -59,25 +52,21 @@ ipa_getkeytab_LDADD = \ $(SASL_LIBS) \ $(POPT_LIBS) \ $(LIBINTL_LIBS) \ - $(INI_LIBS) \ - $(NULL) + $(INI_LIBS) ipa_rmkeytab_SOURCES = \ ipa-rmkeytab.c \ - ipa-client-common.c \ - $(NULL) + ipa-client-common.c ipa_rmkeytab_LDADD = \ $(KRB5_LIBS) \ $(POPT_LIBS) \ - $(LIBINTL_LIBS) \ - $(NULL) + $(LIBINTL_LIBS) ipa_join_SOURCES = \ config.c \ ipa-client-common.c \ - ipa-join.c \ - $(NULL) + ipa-join.c ipa_join_LDADD = \ $(KRB5_LIBS) \ @@ -85,19 +74,16 @@ ipa_join_LDADD = \ $(SASL_LIBS) \ $(XMLRPC_LIBS) \ $(POPT_LIBS) \ - $(LIBINTL_LIBS) \ - $(NULL) + $(LIBINTL_LIBS) SUBDIRS = \ - man \ - $(NULL) + man noinst_HEADERS = \ ipa-client-common.h EXTRA_DIST = \ - $(sbin_SCRIPTS) \ - $(NULL) + $(sbin_SCRIPTS) install-data-hook: $(INSTALL) -d -m 755 $(DESTDIR)$(IPA_SYSCONF_DIR)/nssdb diff --git a/daemons/Makefile.am b/daemons/Makefile.am index a3d4d1d..30f42d9 100644 --- a/daemons/Makefile.am +++ b/daemons/Makefile.am @@ -2,13 +2,10 @@ # AUTOMAKE_OPTIONS = 1.7 subdir-objects -NULL = - -AM_CFLAGS = $(NULL) +AM_CFLAGS = if HAVE_GCC AM_CFLAGS += -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith \ - -Wcast-align -Werror-implicit-function-declaration \ - $(NULL) + -Wcast-align -Werror-implicit-function-declaration endif export AM_CFLAGS @@ -17,5 +14,4 @@ SUBDIRS = \ ipa-kdb \ ipa-slapi-plugins \ ipa-sam \ - ipa-otpd \ - $(NULL) + ipa-otpd diff --git a/daemons/ipa-kdb/Makefile.am b/daemons/ipa-kdb/Makefile.am index 19583c9..5b0aa11 100644 --- a/daemons/ipa-kdb/Makefile.am +++ b/daemons/ipa-kdb/Makefile.am @@ -1,8 +1,5 @@ AUTOMAKE_OPTIONS = 1.7 subdir-objects -NULL = - - AM_CPPFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/util \ @@ -17,13 +14,11 @@ AM_CPPFLAGS = \ $(KRB5_CFLAGS) \ $(WARN_CFLAGS) \ $(NDRPAC_CFLAGS) \ - $(NSS_CFLAGS) \ - $(NULL) + $(NSS_CFLAGS) plugindir = $(libdir)/krb5/plugins/kdb plugin_LTLIBRARIES = \ - ipadb.la \ - $(NULL) + ipadb.la ipadb_la_SOURCES = \ ipa_kdb.c \ @@ -36,8 +31,7 @@ ipadb_la_SOURCES = \ ipa_kdb_mspac.c \ ipa_kdb_mspac_private.h \ ipa_kdb_delegation.c \ - ipa_kdb_audit_as.c \ - $(NULL) + ipa_kdb_audit_as.c ipadb_la_LDFLAGS = \ -avoid-version \ @@ -50,8 +44,7 @@ ipadb_la_LIBADD = \ $(NDRPAC_LIBS) \ $(UNISTRING_LIBS) \ $(NSS_LIBS) \ - $(top_builddir)/util/libutil.la \ - $(NULL) + $(top_builddir)/util/libutil.la if HAVE_CMOCKA TESTS = ipa_kdb_tests @@ -68,8 +61,8 @@ ipa_kdb_tests_SOURCES = \ ipa_kdb_pwdpolicy.c \ ipa_kdb_mspac.c \ ipa_kdb_delegation.c \ - ipa_kdb_audit_as.c \ - $(NULL) + ipa_kdb_audit_as.c + ipa_kdb_tests_CFLAGS = $(CMOCKA_CFLAGS) ipa_kdb_tests_LDADD = \ $(CMOCKA_LIBS) \ @@ -80,12 +73,10 @@ ipa_kdb_tests_LDADD = \ $(NSS_LIBS) \ $(top_builddir)/util/libutil.la \ -lkdb5 \ - -lsss_idmap \ - $(NULL) + -lsss_idmap dist_noinst_DATA = ipa_kdb.exports EXTRA_DIST = \ README \ - README.s4u2proxy.txt \ - $(NULL) + README.s4u2proxy.txt diff --git a/daemons/ipa-sam/Makefile.am b/daemons/ipa-sam/Makefile.am index 2f90467..16c40b5 100644 --- a/daemons/ipa-sam/Makefile.am +++ b/daemons/ipa-sam/Makefile.am @@ -1,10 +1,8 @@ -NULL = LIBPDB_NAME = @LIBPDB_NAME@ SAMBA40EXTRA_LIBS = $(SAMBA40EXTRA_LIBPATH) \ -lsmbldap \ -l$(LIBPDB_NAME) \ - -lsmbconf \ - $(NULL) + -lsmbconf AM_CPPFLAGS = \ -I$(srcdir) \ @@ -25,23 +23,19 @@ AM_CPPFLAGS = \ $(TALLOC_CFLAGS) \ $(SAMBAUTIL_CFLAGS) \ $(NDR_CFLAGS) \ - $(SSSIDMAP_CFLAGS) \ - $(NULL) + $(SSSIDMAP_CFLAGS) plugindir = $(libdir)/samba/pdb plugin_LTLIBRARIES = \ - ipasam.la \ - $(NULL) + ipasam.la ipasam_la_SOURCES = \ ipa_sam.c \ - $(KRB5_UTIL_SRCS) \ - $(NULL) + $(KRB5_UTIL_SRCS) ipasam_la_LDFLAGS = \ -avoid-version \ - -module \ - $(NULL) + -module ipasam_la_LIBADD = \ $(CRYPTO_LIBS) \ @@ -53,10 +47,8 @@ ipasam_la_LIBADD = \ $(SAMBA40EXTRA_LIBS) \ $(SSSIDMAP_LIBS) \ $(top_builddir)/asn1/libipaasn1.la \ - $(top_builddir)/util/libutil.la \ - $(NULL) + $(top_builddir)/util/libutil.la EXTRA_DIST = \ README \ - ipa_sam.h \ - $(NULL) + ipa_sam.h diff --git a/daemons/ipa-slapi-plugins/Makefile.am b/daemons/ipa-slapi-plugins/Makefile.am index 216b2ad..1610252 100644 --- a/daemons/ipa-slapi-plugins/Makefile.am +++ b/daemons/ipa-slapi-plugins/Makefile.am @@ -1,5 +1,3 @@ -NULL = - SUBDIRS = \ libotp \ ipa-cldap \ @@ -16,12 +14,10 @@ SUBDIRS = \ ipa-winsync \ ipa-sidgen \ ipa-range-check \ - topology \ - $(NULL) + topology noinst_HEADERS = \ common/util.h EXTRA_DIST = \ - README \ - $(NULL) + README diff --git a/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am b/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am index f299b70..2e70be4 100644 --- a/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am @@ -1,5 +1,3 @@ -NULL = - PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ @@ -12,27 +10,23 @@ AM_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ - $(NDRNBT_CFLAGS) \ - $(NULL) + $(NDRNBT_CFLAGS) plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = \ - libipa_cldap.la \ - $(NULL) + libipa_cldap.la libipa_cldap_la_SOURCES = \ ipa_cldap_netlogon.c \ ipa_cldap_worker.c \ ipa_cldap.c \ - ipa_cldap.h \ - $(NULL) + ipa_cldap.h libipa_cldap_la_LDFLAGS = -avoid-version libipa_cldap_la_LIBADD = \ $(LDAP_LIBS) \ - $(NDRNBT_LIBS) \ - $(NULL) + $(NDRNBT_LIBS) if HAVE_CMOCKA TESTS = ipa_cldap_tests @@ -41,23 +35,20 @@ endif ipa_cldap_tests_SOURCES = \ ipa_cldap_tests.c \ - ipa_cldap_netlogon.c \ - $(NULL) + ipa_cldap_netlogon.c + ipa_cldap_tests_CFLAGS = $(CMOCKA_FLAGS) ipa_cldap_tests_LDFLAGS = \ - -rpath $(shell pkg-config --libs-only-L dirsrv | sed -e 's/-L//') \ - $(NULL) + -rpath $(shell pkg-config --libs-only-L dirsrv | sed -e 's/-L//') + ipa_cldap_tests_LDADD = \ $(CMOCKA_LIBS) \ $(NDRNBT_LIBS) \ - $(DIRSRV_LIBS) \ - $(NULL) + $(DIRSRV_LIBS) appdir = $(IPA_DATA_DIR) app_DATA = \ - ipa-cldap-conf.ldif \ - $(NULL) + ipa-cldap-conf.ldif EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am b/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am index 099708c..8fefe2f 100644 --- a/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am @@ -1,5 +1,3 @@ -NULL = - PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ @@ -12,29 +10,23 @@ AM_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ $(LDAP_CFLAGS) \ - $(WARN_CFLAGS) \ - $(NULL) + $(WARN_CFLAGS) plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = \ - libipa_dns.la \ - $(NULL) + libipa_dns.la libipa_dns_la_SOURCES = \ - ipa_dns.c \ - $(NULL) + ipa_dns.c libipa_dns_la_LDFLAGS = -avoid-version libipa_dns_la_LIBADD = \ - $(LDAP_LIBS) \ - $(NULL) + $(LDAP_LIBS) appdir = $(IPA_DATA_DIR) app_DATA = \ - ipa-dns-conf.ldif \ - $(NULL) + ipa-dns-conf.ldif EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am b/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am index 4ce32c4..35e1abb 100644 --- a/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am @@ -1,5 +1,3 @@ -NULL = - PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ @@ -12,29 +10,23 @@ AM_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ $(LDAP_CFLAGS) \ $(KRB5_CFLAGS) \ - $(WARN_CFLAGS) \ - $(NULL) + $(WARN_CFLAGS) plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = \ - libipa_enrollment_extop.la \ - $(NULL) + libipa_enrollment_extop.la libipa_enrollment_extop_la_SOURCES = \ - ipa_enrollment.c \ - $(NULL) + ipa_enrollment.c libipa_enrollment_extop_la_LDFLAGS = -avoid-version libipa_enrollment_extop_la_LIBADD = \ - $(LDAP_LIBS) \ - $(NULL) + $(LDAP_LIBS) appdir = $(IPA_DATA_DIR) app_DATA = \ - enrollment-conf.ldif \ - $(NULL) + enrollment-conf.ldif EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am index c9f74f0..348b4a7 100644 --- a/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am @@ -1,5 +1,3 @@ -NULL = - PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ @@ -12,26 +10,22 @@ AM_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ - $(SSSNSSIDMAP_CFLAGS) \ - $(NULL) + $(SSSNSSIDMAP_CFLAGS) plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = \ - libipa_extdom_extop.la \ - $(NULL) + libipa_extdom_extop.la libipa_extdom_extop_la_SOURCES = \ ipa_extdom.h \ ipa_extdom_extop.c \ - ipa_extdom_common.c \ - $(NULL) + ipa_extdom_common.c libipa_extdom_extop_la_LDFLAGS = -avoid-version libipa_extdom_extop_la_LIBADD = \ $(LDAP_LIBS) \ - $(SSSNSSIDMAP_LIBS) \ - $(NULL) + $(SSSNSSIDMAP_LIBS) TESTS = check_PROGRAMS = @@ -46,27 +40,24 @@ endif extdom_cmocka_tests_SOURCES = \ ipa_extdom_cmocka_tests.c \ - ipa_extdom_common.c \ - $(NULL) + ipa_extdom_common.c + extdom_cmocka_tests_CFLAGS = $(CMOCKA_CFLAGS) extdom_cmocka_tests_LDFLAGS = \ - -rpath $(shell pkg-config --libs-only-L dirsrv | sed -e 's/-L//') \ - $(NULL) + -rpath $(shell pkg-config --libs-only-L dirsrv | sed -e 's/-L//') + extdom_cmocka_tests_LDADD = \ $(CMOCKA_LIBS) \ $(LDAP_LIBS) \ $(DIRSRV_LIBS) \ - $(SSSNSSIDMAP_LIBS) \ - $(NULL) + $(SSSNSSIDMAP_LIBS) appdir = $(IPA_DATA_DIR) app_DATA = \ - ipa-extdom-extop-conf.ldif \ - $(NULL) + ipa-extdom-extop-conf.ldif EXTRA_DIST = \ README \ test_data \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am b/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am index 8d8c975..baaff32 100644 --- a/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am @@ -1,5 +1,3 @@ -NULL = - PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ @@ -12,29 +10,23 @@ AM_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ $(LDAP_CFLAGS) \ - $(WARN_CFLAGS) \ - $(NULL) + $(WARN_CFLAGS) plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = \ - libipa_lockout.la \ - $(NULL) + libipa_lockout.la libipa_lockout_la_SOURCES = \ - ipa_lockout.c \ - $(NULL) + ipa_lockout.c libipa_lockout_la_LDFLAGS = -avoid-version libipa_lockout_la_LIBADD = \ - $(LDAP_LIBS) \ - $(NULL) + $(LDAP_LIBS) appdir = $(IPA_DATA_DIR) app_DATA = \ - lockout-conf.ldif \ - $(NULL) + lockout-conf.ldif EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am b/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am index 8efa155..ddbdbe4 100644 --- a/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am @@ -1,5 +1,3 @@ -NULL = - PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ @@ -12,29 +10,23 @@ AM_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ $(LDAP_CFLAGS) \ - $(WARN_CFLAGS) \ - $(NULL) + $(WARN_CFLAGS) plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = \ - libipa_modrdn.la \ - $(NULL) + libipa_modrdn.la libipa_modrdn_la_SOURCES = \ - ipa_modrdn.c \ - $(NULL) + ipa_modrdn.c libipa_modrdn_la_LDFLAGS = -avoid-version libipa_modrdn_la_LIBADD = \ - $(LDAP_LIBS) \ - $(NULL) + $(LDAP_LIBS) appdir = $(IPA_DATA_DIR) app_DATA = \ - modrdn-conf.ldif \ - $(NULL) + modrdn-conf.ldif EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am index 43c99d9..46a65c6 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am @@ -1,5 +1,3 @@ -NULL = - PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ @@ -16,8 +14,7 @@ AM_CPPFLAGS = \ $(LDAP_CFLAGS) \ $(KRB5_CFLAGS) \ $(NSS_CFLAGS) \ - $(WARN_CFLAGS) \ - $(NULL) + $(WARN_CFLAGS) AM_LDFLAGS = \ $(CRYPTO_LIBS) \ @@ -34,8 +31,8 @@ plugin_LTLIBRARIES = libipa_pwd_extop.la libipa_pwd_extop_la_LIBADD = \ $(builddir)/../libotp/libotp.la \ $(top_builddir)/asn1/libipaasn1.la \ - $(top_builddir)/util/libutil.la \ - $(NULL) + $(top_builddir)/util/libutil.la + libipa_pwd_extop_la_SOURCES = \ common.c \ encoding.c \ @@ -44,17 +41,12 @@ libipa_pwd_extop_la_SOURCES = \ ipapwd.h \ otpctrl.c \ otpctrl.h \ - $(KRB5_UTIL_SRCS) \ - $(NULL) + $(KRB5_UTIL_SRCS) appdir = $(IPA_DATA_DIR) app_DATA = \ - pwd-extop-conf.ldif \ - $(NULL) + pwd-extop-conf.ldif EXTRA_DIST = \ README \ - $(app_DATA) \ - $(NULL) - - + $(app_DATA) diff --git a/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am b/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am index b9abc4a..4f11d8b 100644 --- a/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am @@ -1,5 +1,3 @@ -NULL = - PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ @@ -12,29 +10,23 @@ AM_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ $(LDAP_CFLAGS) \ - $(WARN_CFLAGS) \ - $(NULL) + $(WARN_CFLAGS) plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = \ - libipa_range_check.la \ - $(NULL) + libipa_range_check.la libipa_range_check_la_SOURCES = \ - ipa_range_check.c \ - $(NULL) + ipa_range_check.c libipa_range_check_la_LDFLAGS = -avoid-version libipa_range_check_la_LIBADD = \ - $(LDAP_LIBS) \ - $(NULL) + $(LDAP_LIBS) appdir = $(IPA_DATA_DIR) app_DATA = \ - range-check-conf.ldif \ - $(NULL) + range-check-conf.ldif EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am b/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am index a672e21..357612c 100644 --- a/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am @@ -1,5 +1,3 @@ -NULL = - PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ @@ -12,36 +10,30 @@ AM_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ $(LDAP_CFLAGS) \ - $(WARN_CFLAGS) \ - $(NULL) + $(WARN_CFLAGS) plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = \ libipa_sidgen.la \ - libipa_sidgen_task.la \ - $(NULL) + libipa_sidgen_task.la libipa_sidgen_la_SOURCES = \ ipa_sidgen.c \ - ipa_sidgen_common.c \ - $(NULL) + ipa_sidgen_common.c libipa_sidgen_la_LDFLAGS = -avoid-version libipa_sidgen_la_LIBADD = \ - $(LDAP_LIBS) \ - $(NULL) + $(LDAP_LIBS) libipa_sidgen_task_la_SOURCES = \ ipa_sidgen_task.c \ - ipa_sidgen_common.c \ - $(NULL) + ipa_sidgen_common.c libipa_sidgen_task_la_LDFLAGS = -avoid-version libipa_sidgen_task_la_LIBADD = \ - $(LDAP_LIBS) \ - $(NULL) + $(LDAP_LIBS) noinst_HEADERS = \ ipa_sidgen.h @@ -50,9 +42,7 @@ appdir = $(IPA_DATA_DIR) app_DATA = \ ipa-sidgen-conf.ldif \ ipa-sidgen-task-conf.ldif \ - ipa-sidgen-task-run.ldif \ - $(NULL) + ipa-sidgen-task-run.ldif EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am b/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am index 540325e..418b867 100644 --- a/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am @@ -1,5 +1,3 @@ -NULL = - PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ @@ -12,30 +10,24 @@ AM_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ $(LDAP_CFLAGS) \ - $(WARN_CFLAGS) \ - $(NULL) + $(WARN_CFLAGS) plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = \ - libipa_uuid.la \ - $(NULL) + libipa_uuid.la libipa_uuid_la_SOURCES = \ - ipa_uuid.c \ - $(NULL) + ipa_uuid.c libipa_uuid_la_LDFLAGS = -avoid-version libipa_uuid_la_LIBADD = \ $(LDAP_LIBS) \ - $(UUID_LIBS) \ - $(NULL) + $(UUID_LIBS) appdir = $(IPA_DATA_DIR) app_DATA = \ - uuid-conf.ldif \ - $(NULL) + uuid-conf.ldif EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/daemons/ipa-slapi-plugins/ipa-version/Makefile.am b/daemons/ipa-slapi-plugins/ipa-version/Makefile.am index 21bf9c2..4a0caa7 100644 --- a/daemons/ipa-slapi-plugins/ipa-version/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-version/Makefile.am @@ -1,5 +1,3 @@ -NULL = - PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ @@ -14,29 +12,23 @@ AM_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ $(LDAP_CFLAGS) \ $(KRB5_CFLAGS) \ - $(WARN_CFLAGS) \ - $(NULL) + $(WARN_CFLAGS) plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = \ - libipa_repl_version.la \ - $(NULL) + libipa_repl_version.la libipa_repl_version_la_SOURCES = \ - ipa_repl_version.c \ - $(NULL) + ipa_repl_version.c libipa_repl_version_la_LDFLAGS = -avoid-version libipa_repl_version_la_LIBADD = \ - $(LDAP_LIBS) \ - $(NULL) + $(LDAP_LIBS) appdir = $(IPA_DATA_DIR) app_DATA = \ - version-conf.ldif \ - $(NULL) + version-conf.ldif EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am b/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am index 3ac572d..45e4ee5 100644 --- a/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am @@ -1,5 +1,3 @@ -NULL = - PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ @@ -11,32 +9,23 @@ AM_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ $(LDAP_CFLAGS) \ - $(WARN_CFLAGS) \ - $(NULL) + $(WARN_CFLAGS) plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = \ - libipa_winsync.la \ - $(NULL) + libipa_winsync.la libipa_winsync_la_SOURCES = \ ipa-winsync.c \ ipa-winsync.h \ - ipa-winsync-config.c \ - $(NULL) + ipa-winsync-config.c libipa_winsync_la_LDFLAGS = -avoid-version -#libipa_winsync_la_LIBADD = \ -# $(LDAP_LIBS) \ -# $(NULL) - appdir = $(IPA_DATA_DIR) app_DATA = \ - ipa-winsync-conf.ldif \ - $(NULL) + ipa-winsync-conf.ldif EXTRA_DIST = \ README \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/daemons/ipa-slapi-plugins/topology/Makefile.am b/daemons/ipa-slapi-plugins/topology/Makefile.am index 1d86bd0..c8ad2db 100644 --- a/daemons/ipa-slapi-plugins/topology/Makefile.am +++ b/daemons/ipa-slapi-plugins/topology/Makefile.am @@ -1,5 +1,3 @@ -NULL = - PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ @@ -12,13 +10,11 @@ AM_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ $(LDAP_CFLAGS) \ - $(WARN_CFLAGS) \ - $(NULL) + $(WARN_CFLAGS) plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = \ - libtopology.la \ - $(NULL) + libtopology.la libtopology_la_SOURCES = \ topology.h \ @@ -27,20 +23,13 @@ libtopology_la_SOURCES = \ topology_cfg.c \ topology_post.c \ topology_pre.c \ - topology_util.c \ - $(NULL) + topology_util.c libtopology_la_LDFLAGS = -avoid-version -#libtopology_la_LIBADD = \ -# $(LDAP_LIBS) \ -# $(NULL) - appdir = $(IPA_DATA_DIR) app_DATA = \ - ipa-topology-conf.ldif \ - $(NULL) + ipa-topology-conf.ldif EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/install/Makefile.am b/install/Makefile.am index 845e751..7d354bd 100644 --- a/install/Makefile.am +++ b/install/Makefile.am @@ -2,8 +2,6 @@ # AUTOMAKE_OPTIONS = 1.7 -NULL = - SUBDIRS = \ certmonger \ conf \ @@ -15,8 +13,7 @@ SUBDIRS = \ updates \ restart_scripts \ wsgi \ - oddjob \ - $(NULL) + oddjob install-exec-local: $(INSTALL) -d -m 700 $(DESTDIR)$(IPA_SYSCONF_DIR)/custodia diff --git a/install/certmonger/Makefile.am b/install/certmonger/Makefile.am index 63fd577..e687eaf 100644 --- a/install/certmonger/Makefile.am +++ b/install/certmonger/Makefile.am @@ -1,11 +1,7 @@ -NULL = - appdir = $(libexecdir)/certmonger/ app_SCRIPTS = \ dogtag-ipa-ca-renew-agent-submit \ - ipa-server-guard \ - $(NULL) + ipa-server-guard EXTRA_DIST = \ - $(app_SCRIPTS) \ - $(NULL) + $(app_SCRIPTS) diff --git a/install/conf/Makefile.am b/install/conf/Makefile.am index 751bb16..9c6d592 100644 --- a/install/conf/Makefile.am +++ b/install/conf/Makefile.am @@ -1,13 +1,9 @@ -NULL = - appdir = $(IPA_DATA_DIR) app_DATA = \ ipa.conf \ ipa-kdc-proxy.conf.template \ ipa-pki-proxy.conf \ - ipa-rewrite.conf \ - $(NULL) + ipa-rewrite.conf EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/install/html/Makefile.am b/install/html/Makefile.am index 3b7a064..6a3615c 100644 --- a/install/html/Makefile.am +++ b/install/html/Makefile.am @@ -1,17 +1,13 @@ -NULL = - appdir = $(IPA_SYSCONF_DIR)/html app_DATA = \ ffconfig.js \ ffconfig_page.js \ ssbrowser.html \ browserconfig.html \ - unauthorized.html \ - $(NULL) + unauthorized.html EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) # Default user-modifiable HTML files are installed into /etc. # /usr points to these modifiable files in /etc diff --git a/install/migration/Makefile.am b/install/migration/Makefile.am index 4d22de5..8a1f93d 100644 --- a/install/migration/Makefile.am +++ b/install/migration/Makefile.am @@ -1,13 +1,9 @@ -NULL = - appdir = $(IPA_DATA_DIR)/migration app_DATA = \ error.html \ index.html \ invalid.html \ - migration.py \ - $(NULL) + migration.py EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/install/oddjob/Makefile.am b/install/oddjob/Makefile.am index 1dbd8fa..73f4787 100644 --- a/install/oddjob/Makefile.am +++ b/install/oddjob/Makefile.am @@ -1,20 +1,15 @@ -NULL = - oddjobdir = $(libexecdir)/ipa/oddjob oddjobconfdir = $(sysconfdir)/oddjobd.conf.d dbusconfdir = $(sysconfdir)/dbus-1/system.d dist_oddjob_SCRIPTS = \ com.redhat.idm.trust-fetch-domains \ - org.freeipa.server.conncheck \ - $(NULL) + org.freeipa.server.conncheck dist_dbusconf_DATA = \ etc/dbus-1/system.d/oddjob-ipa-trust.conf \ - etc/dbus-1/system.d/org.freeipa.server.conf \ - $(NULL) + etc/dbus-1/system.d/org.freeipa.server.conf dist_oddjobconf_DATA = \ etc/oddjobd.conf.d/oddjobd-ipa-trust.conf \ - etc/oddjobd.conf.d/ipa-server.conf \ - $(NULL) + etc/oddjobd.conf.d/ipa-server.conf diff --git a/install/restart_scripts/Makefile.am b/install/restart_scripts/Makefile.am index 04881b4..bda5e3f 100644 --- a/install/restart_scripts/Makefile.am +++ b/install/restart_scripts/Makefile.am @@ -1,5 +1,3 @@ -NULL = - appdir = $(libexecdir)/ipa/certmonger app_DATA = \ restart_dirsrv \ @@ -7,9 +5,7 @@ app_DATA = \ renew_ca_cert \ renew_ra_cert \ stop_pkicad \ - renew_ra_cert_pre \ - $(NULL) + renew_ra_cert_pre EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/install/share/Makefile.am b/install/share/Makefile.am index 10de84d..8b06573 100644 --- a/install/share/Makefile.am +++ b/install/share/Makefile.am @@ -1,10 +1,7 @@ -NULL = - SUBDIRS = \ advise \ profiles \ - schema.d \ - $(NULL) + schema.d appdir = $(IPA_DATA_DIR) dist_app_DATA = \ diff --git a/install/share/advise/Makefile.am b/install/share/advise/Makefile.am index 6d2a99b..c4f7469 100644 --- a/install/share/advise/Makefile.am +++ b/install/share/advise/Makefile.am @@ -1,13 +1,2 @@ -NULL = - SUBDIRS = \ - legacy \ - $(NULL) - -appdir = $(IPA_DATA_DIR)/advise -app_DATA = \ - $(NULL) - -EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + legacy diff --git a/install/share/advise/legacy/Makefile.am b/install/share/advise/legacy/Makefile.am index d238b29..02f89f5 100644 --- a/install/share/advise/legacy/Makefile.am +++ b/install/share/advise/legacy/Makefile.am @@ -1,13 +1,9 @@ -NULL = - appdir = $(IPA_DATA_DIR)/advise/legacy app_DATA = \ sssd.conf.template \ pam.conf.sssd.template \ pam.conf.nss_pam_ldapd.template \ - pam_conf_sshd.template \ - $(NULL) + pam_conf_sshd.template EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/install/share/profiles/Makefile.am b/install/share/profiles/Makefile.am index d1c1bac..325b034 100644 --- a/install/share/profiles/Makefile.am +++ b/install/share/profiles/Makefile.am @@ -1,11 +1,7 @@ -NULL = - appdir = $(IPA_DATA_DIR)/profiles app_DATA = \ caIPAserviceCert.cfg \ - IECUserRoles.cfg \ - $(NULL) + IECUserRoles.cfg EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/install/share/schema.d/Makefile.am b/install/share/schema.d/Makefile.am index 6cd554e..67f5d95 100644 --- a/install/share/schema.d/Makefile.am +++ b/install/share/schema.d/Makefile.am @@ -1,12 +1,5 @@ -NULL = - -SUBDIRS = \ - $(NULL) - appdir = $(IPA_DATA_DIR)/schema.d -app_DATA = README \ - $(NULL) +app_DATA = README EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/install/tools/Makefile.am b/install/tools/Makefile.am index 74f428e..56ed940 100644 --- a/install/tools/Makefile.am +++ b/install/tools/Makefile.am @@ -1,8 +1,5 @@ -NULL = - SUBDIRS = \ - man \ - $(NULL) + man dist_sbin_SCRIPTS = \ ipa-ca-install \ @@ -28,11 +25,9 @@ dist_sbin_SCRIPTS = \ ipa-restore \ ipa-advise \ ipa-cacert-manage \ - ipa-winsync-migrate \ - $(NULL) + ipa-winsync-migrate appdir = $(libexecdir)/ipa/ dist_app_SCRIPTS = \ ipa-httpd-kdcproxy \ - ipa-pki-retrieve-key \ - $(NULL) + ipa-pki-retrieve-key diff --git a/install/tools/man/Makefile.am b/install/tools/man/Makefile.am index b1fba6d..4de02c0 100644 --- a/install/tools/man/Makefile.am +++ b/install/tools/man/Makefile.am @@ -2,8 +2,6 @@ AUTOMAKE_OPTIONS = 1.7 -NULL= - dist_man1_MANS = \ ipa-replica-conncheck.1 \ ipa-replica-install.1 \ @@ -26,10 +24,8 @@ dist_man1_MANS = \ ipa-advise.1 \ ipa-otptoken-import.1 \ ipa-cacert-manage.1 \ - ipa-winsync-migrate.1 \ - $(NULL) + ipa-winsync-migrate.1 dist_man8_MANS = \ ipactl.8 \ - ipa-upgradeconfig.8 \ - $(NULL) + ipa-upgradeconfig.8 diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am index 7733958..d4b5892 100644 --- a/install/ui/Makefile.am +++ b/install/ui/Makefile.am @@ -1,13 +1,10 @@ AUTOMAKE_OPTIONS = 1.7 -NULL = - SUBDIRS = \ build \ css \ images \ - src \ - $(NULL) + src appdir = $(IPA_DATA_DIR)/ui app_DATA = \ @@ -17,8 +14,7 @@ app_DATA = \ ipa.css \ reset_password.js \ reset_password.html \ - sync_otp.html \ - $(NULL) + sync_otp.html EXTRA_DIST = \ doc \ @@ -27,8 +23,7 @@ EXTRA_DIST = \ README-LICENSE.txt \ test \ util \ - $(app_DATA) \ - $(NULL) + $(app_DATA) install-data-hook: $(INSTALL) -d -m 755 $(DESTDIR)$(appdir)/js/plugins diff --git a/install/ui/build/Makefile.am b/install/ui/build/Makefile.am index 33a3ade..acd8d6d 100644 --- a/install/ui/build/Makefile.am +++ b/install/ui/build/Makefile.am @@ -1,11 +1,5 @@ AUTOMAKE_OPTIONS = 1.7 -NULL = - SUBDIRS = \ dojo \ - freeipa \ - $(NULL) - -EXTRA_DIST = \ - $(NULL) + freeipa diff --git a/install/ui/build/dojo/Makefile.am b/install/ui/build/dojo/Makefile.am index 2df5f69..8632f56 100644 --- a/install/ui/build/dojo/Makefile.am +++ b/install/ui/build/dojo/Makefile.am @@ -1,10 +1,6 @@ -NULL = - appdir = $(IPA_DATA_DIR)/ui/js/dojo app_DATA = \ - dojo.js \ - $(NULL) + dojo.js EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/install/ui/build/freeipa/Makefile.am b/install/ui/build/freeipa/Makefile.am index 05e82f4..ce238e4 100644 --- a/install/ui/build/freeipa/Makefile.am +++ b/install/ui/build/freeipa/Makefile.am @@ -1,16 +1,12 @@ -NULL = - appdir = $(IPA_DATA_DIR)/ui/js/freeipa nodist_app_DATA = \ app.js \ - core.js \ - $(NULL) + core.js CLEANFILES = $(nodist_app_DATA) EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) core := $(wildcard ../../src/freeipa/*.js) base := $(wildcard ../../src/freeipa/_base/*.js) diff --git a/install/ui/css/Makefile.am b/install/ui/css/Makefile.am index 33dc51e..ffddd73 100644 --- a/install/ui/css/Makefile.am +++ b/install/ui/css/Makefile.am @@ -1,10 +1,7 @@ -NULL = - appdir = $(IPA_DATA_DIR)/ui/css app_DATA = \ bootstrap-datepicker3.min.css \ - patternfly.css \ - $(NULL) + patternfly.css nodist_app_DATA = \ ipa.css @@ -12,8 +9,7 @@ nodist_app_DATA = \ CLEANFILES = $(nodist_app_DATA) EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) ipa := $(wildcard ../less/*.less) \ ../less/font-awesome/variables.less \ diff --git a/install/ui/images/Makefile.am b/install/ui/images/Makefile.am index f922fd0..a951876 100644 --- a/install/ui/images/Makefile.am +++ b/install/ui/images/Makefile.am @@ -1,5 +1,3 @@ -NULL = - appdir = $(IPA_DATA_DIR)/ui/images app_DATA = \ facet-tab-off.png \ @@ -7,9 +5,7 @@ app_DATA = \ header-logo.png \ login-screen-background.jpg \ login-screen-logo.png \ - product-name.png \ - $(NULL) + product-name.png EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/install/ui/src/Makefile.am b/install/ui/src/Makefile.am index 6182b7b..a66ad3e 100644 --- a/install/ui/src/Makefile.am +++ b/install/ui/src/Makefile.am @@ -1,10 +1,7 @@ AUTOMAKE_OPTIONS = 1.7 -NULL = - SUBDIRS = \ - libs \ - $(NULL) + libs EXTRA_DIST = \ build.profile.js \ diff --git a/install/ui/src/libs/Makefile.am b/install/ui/src/libs/Makefile.am index f5a9e0e..4ea5168 100644 --- a/install/ui/src/libs/Makefile.am +++ b/install/ui/src/libs/Makefile.am @@ -1,5 +1,3 @@ -NULL = - appdir = $(IPA_DATA_DIR)/ui/js/libs app_DATA = \ bootstrap.js \ @@ -10,12 +8,10 @@ app_DATA = \ jquery.ordered-map.js \ json2.js \ patternfly.js \ - qrcode.js \ - $(NULL) + qrcode.js nodist_app_DATA = \ loader.js EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/install/updates/Makefile.am b/install/updates/Makefile.am index a80256f..537ceef 100644 --- a/install/updates/Makefile.am +++ b/install/updates/Makefile.am @@ -1,5 +1,3 @@ -NULL = - appdir = $(IPA_DATA_DIR)/updates app_DATA = \ 05-pre_upgrade_plugins.update \ @@ -60,9 +58,7 @@ app_DATA = \ 72-domainlevels.update \ 73-custodia.update \ 73-winsync.update \ - 90-post_upgrade_plugins.update \ - $(NULL) + 90-post_upgrade_plugins.update EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/install/wsgi/Makefile.am b/install/wsgi/Makefile.am index f5f0f11..c2cdae8 100644 --- a/install/wsgi/Makefile.am +++ b/install/wsgi/Makefile.am @@ -1,10 +1,6 @@ -NULL = - appdir = $(IPA_DATA_DIR)/wsgi app_DATA = \ - plugins.py \ - $(NULL) + plugins.py EXTRA_DIST = \ - $(app_DATA) \ - $(NULL) + $(app_DATA) diff --git a/ipatests/man/Makefile.am b/ipatests/man/Makefile.am index 6d66699..7086873 100644 --- a/ipatests/man/Makefile.am +++ b/ipatests/man/Makefile.am @@ -2,10 +2,7 @@ AUTOMAKE_OPTIONS = 1.7 -NULL= - dist_man1_MANS = \ ipa-run-tests.1 \ ipa-test-config.1 \ - ipa-test-task.1 \ - $(NULL) + ipa-test-task.1
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
