URL: https://github.com/freeipa/freeipa/pull/236 Author: pspacek Title: #236: Build phase 7: cleanup Action: synchronized
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 665d22bf8435e390bfbb71aca7a0e0cbac744e3a Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 15:24:50 +0100 Subject: [PATCH 1/6] 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 acf9774bfbd4688586cb18f354382dcf197721e2 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Fri, 11 Nov 2016 12:37:03 +0100 Subject: [PATCH 2/6] 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 c568b0a008d99aa10740d1f77c55aaf50560ae92 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Fri, 11 Nov 2016 12:46:00 +0100 Subject: [PATCH 3/6] 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 105f3ebecd0270a77caac1b76c8355f4638013cf Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Fri, 11 Nov 2016 14:37:18 +0100 Subject: [PATCH 4/6] 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 832d9379dd475d0a1a9d67cbd7d1fd94e267b45c Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Fri, 11 Nov 2016 15:32:29 +0100 Subject: [PATCH 5/6] 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 5a5fab22e879a4aaefd9086d88f1e76bf9969250 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Fri, 11 Nov 2016 15:43:14 +0100 Subject: [PATCH 6/6] 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
-- 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
