From 38e026821cce2c6763a53ae6c675bbbaf68c8ff7 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mar 31 2020 15:55:35 +0000 Subject: 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: Rob Crittenden Reviewed-By: Florence Blanc-Renaud --- diff --git a/Makefile.am b/Makefile.am index 9c273ee..f52c884 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: