From 01b207bcd5ea53f7f588771c530318cab1f9d0ef Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Fri, 27 Mar 2020 12:45:17 +0200 Subject: [PATCH] Add 'api' and 'aci' targets to make 'makeapi' and 'makeaci' has to be run in a particular environment that forces IPA Python modules from the source tree used instead of what might be installed system-wide. Create 'make api' and 'make aci' targets to provide easy access to them. Make sure we run Python interpreter with PYTHONPATH set to force use of the source tree. Signed-off-by: Alexander Bokovoy Reviewed-By: Florence Blanc-Renaud Reviewed-By: Rob Crittenden --- Makefile.am | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9c273ee10..f52c8842a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -272,11 +272,23 @@ $(top_builddir)/ipapython/version.py: .PHONY: acilint acilint: $(GENERATED_PYTHON_FILES) - cd $(srcdir); $(PYTHON) ./makeaci --validate + cd $(srcdir); \ + PYTHONPATH=$(abspath $(top_srcdir)) $(PYTHON) ./makeaci --validate + +.PHONY: aci +aci: $(GENERATED_PYTHON_FILES) + cd $(srcdir); \ + PYTHONPATH=$(abspath $(top_srcdir)) $(PYTHON) ./makeaci .PHONY: apilint apilint: $(GENERATED_PYTHON_FILES) - cd $(srcdir); $(PYTHON) ./makeapi --validate + cd $(srcdir); \ + PYTHONPATH=$(abspath $(top_srcdir)) $(PYTHON) ./makeapi --validate + +.PHONY: api +api: $(GENERATED_PYTHON_FILES) + cd $(srcdir); \ + PYTHONPATH=$(abspath $(top_srcdir)) $(PYTHON) ./makeapi .PHONY: polint polint: