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>
This commit is contained in:
Petr Spacek authored and Martin Basti committed 2016-11-29 15:28:24 +01:00
1 parent 89739a6c91
commit 6fcfe689f4
3 files changed
+20 -5

No files matched your search

+7 -4
View File
@@ -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 \
-1
View File
@@ -539,7 +539,6 @@ AC_CONFIG_FILES([
ipalib/Makefile
ipaplatform/Makefile
ipapython/Makefile
ipapython/version.py
ipaserver/Makefile
ipasetup.py
ipatests/Makefile
+13
View File
@@ -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' \
$< > $@