diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-11-22 12:32:27 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-29 15:28:24 +0100 |
| commit | ba6ae666acaf8b930d18f45efc7c9c9faad3526b (patch) | |
| tree | 25c938eeaa3596d0f81238ad22035d0e85271a27 | |
| parent | a260fd8058d757b631dd4eb39ee8a58b91cf2efb (diff) | |
| download | freeipa-ba6ae666acaf8b930d18f45efc7c9c9faad3526b.tar.gz freeipa-ba6ae666acaf8b930d18f45efc7c9c9faad3526b.tar.xz freeipa-ba6ae666acaf8b930d18f45efc7c9c9faad3526b.zip | |
Build: properly integrate ipa-version.h.in 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-- | configure.ac | 3 | ||||
| -rw-r--r-- | daemons/Makefile.am | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 8b8f556f9..c178b129b 100644 --- a/configure.ac +++ b/configure.ac @@ -372,6 +372,8 @@ AC_SUBST([NUM_VERSION], [IPA_NUM_VERSION]) AC_SUBST(VENDOR_SUFFIX) AC_SUBST([VERSION], [IPA_VERSION]) AC_SUBST([GIT_VERSION], [IPA_GIT_VERSION]) +# used by Makefile.am for files depending on templates +AC_SUBST([CONFIG_STATUS]) dnl --------------------------------------------------------------------------- dnl Finish @@ -506,7 +508,6 @@ AC_CONFIG_FILES([ daemons/ipa-slapi-plugins/ipa-sidgen/Makefile daemons/ipa-slapi-plugins/ipa-range-check/Makefile daemons/ipa-slapi-plugins/topology/Makefile - daemons/ipa-version.h freeipa.spec init/systemd/Makefile init/tmpfilesd/Makefile diff --git a/daemons/Makefile.am b/daemons/Makefile.am index a3d4d1daf..296791785 100644 --- a/daemons/Makefile.am +++ b/daemons/Makefile.am @@ -12,10 +12,21 @@ if HAVE_GCC endif export AM_CFLAGS +nodist_noinst_HEADERS = ipa-version.h +noinst_HEADERS = ipa-version.h.in + SUBDIRS = \ + . \ dnssec \ ipa-kdb \ ipa-slapi-plugins \ ipa-sam \ ipa-otpd \ $(NULL) + +ipa-version.h: ipa-version.h.in $(top_builddir)/$(CONFIG_STATUS) + $(AM_V_GEN)sed \ + -e 's|@DATA_VERSION[@]|$(DATA_VERSION)|g' \ + -e 's|@NUM_VERSION[@]|$(NUM_VERSION)|g' \ + -e 's|@VERSION[@]|$(VERSION)|g' \ + $< > $@ |