From 38628e46f05bde5ccc0fbb997f79364860713b48 Mon Sep 17 00:00:00 2001 From: Petr Spacek Date: Thu, 20 Oct 2016 15:26:29 +0200 Subject: [PATCH] Build: split API/ACI checks into separate Makefile targets This is temporary workaround. makeapi/makeaci transitively import ipaplatform, which will not exist before configure is executed. On the other hand, configure requires version.m4, which is generated by current Makefile. This change works around this chicked-egg problem. It will disappear when we start using top-level configure to generate top-level Makefile. https://fedorahosted.org/freeipa/ticket/6418 Reviewed-By: Lukas Slebodnik Reviewed-By: Stanislav Laznicka Reviewed-By: Christian Heimes --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0ed77d63d..1286e6331 100644 --- a/Makefile +++ b/Makefile @@ -148,7 +148,7 @@ po-validate: jslint: cd install/ui; jsl -nologo -nosummary -nofilelisting -conf jsl.conf || $(LINT_IGNORE_FAIL) -lint: pylint po-validate jslint +lint: apilint acilint pylint po-validate jslint test: ./make-test @@ -198,10 +198,11 @@ version-update: release-update ipapython/version.py ipaplatform/__init__.py ipas sed -e s/__VERSION__/$(IPA_VERSION)/ client/version.m4.in \ > client/version.m4 - if [ "$(SKIP_API_VERSION_CHECK)" != "yes" ]; then \ - ./makeapi --validate && \ - ./makeaci --validate; \ - fi +apilint: bootstrap-autogen + ./makeapi --validate + +acilint: bootstrap-autogen + ./makeaci --validate server: version-update cd ipaserver && $(PYTHON) setup.py build