diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-11-22 17:00:04 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-29 15:28:24 +0100 |
| commit | 6fcfe689f47a02df023de69f62c889d9b4dc26fe (patch) | |
| tree | e5b143f987f563797e1e86abfe5892c74ea73576 | |
| parent | 89739a6c910461a3cac3abc1bf2ff162c7c5bc82 (diff) | |
| download | freeipa-6fcfe689f47a02df023de69f62c889d9b4dc26fe.tar.gz freeipa-6fcfe689f47a02df023de69f62c889d9b4dc26fe.tar.xz freeipa-6fcfe689f47a02df023de69f62c889d9b4dc26fe.zip | |
Build: properly integrate version.py into build system
AC_CONFIG_FILES in configure.ac works well only with Makefiles.
Other files have to be handled by Makefile.am so depedencies
are tracked properly.
https://fedorahosted.org/freeipa/ticket/6498
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | ipapython/Makefile.am | 13 |
3 files changed, 20 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index ad0ccd349..56521e4e8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,11 +127,11 @@ endif WITH_JSLINT lint: acilint apilint $(POLINT_TARGET) $(PYLINT_TARGET) $(JSLINT_TARGET) .PHONY: acilint -acilint: +acilint: $(top_builddir)/ipapython/version.py cd $(srcdir); ./makeaci --validate .PHONY: apilint -apilint: +apilint: $(top_builddir)/ipapython/version.py cd $(srcdir); ./makeapi --validate .PHONY: polint @@ -142,8 +142,11 @@ polint: # folders rpmbuild, freeipa-* and dist. Skip (match, but don't print) .*, # *.in, *~. Finally print all python files, including scripts that do not # have python extension. -.PHONY: pylint -pylint: +.PHONY: pylint $(top_builddir)/ipapython/version.py +$(top_builddir)/ipapython/version.py: + (cd $(top_builddir)/ipapython && make version.py) + +pylint: $(top_builddir)/ipapython/version.py FILES=`find $(top_srcdir) \ -type d -exec test -e '{}/__init__.py' \; -print -prune -o \ -path './rpmbuild' -prune -o \ diff --git a/configure.ac b/configure.ac index 2712452ea..bcc62817a 100644 --- a/configure.ac +++ b/configure.ac @@ -539,7 +539,6 @@ AC_CONFIG_FILES([ ipalib/Makefile ipaplatform/Makefile ipapython/Makefile - ipapython/version.py ipaserver/Makefile ipasetup.py ipatests/Makefile diff --git a/ipapython/Makefile.am b/ipapython/Makefile.am index 8be72b25d..bf2538a5b 100644 --- a/ipapython/Makefile.am +++ b/ipapython/Makefile.am @@ -1 +1,14 @@ include $(top_srcdir)/Makefile.python.am + +EXTRA_DIST = version.py.in + +all-local: version.py +dist-hook: version.py + +version.py: version.py.in $(top_builddir)/$(CONFIG_STATUS) + $(AM_V_GEN)sed \ + -e 's|@API_VERSION[@]|$(API_VERSION)|g' \ + -e 's|@NUM_VERSION[@]|$(NUM_VERSION)|g' \ + -e 's|@VERSION[@]|$(VERSION)|g' \ + -e 's|@VENDOR_SUFFIX[@]|$(VENDOR_SUFFIX)|g' \ + $< > $@ |