diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-03-23 06:47:55 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-03-23 06:55:33 +0100 |
| commit | 6f660af40c5eda366e7b439e568be2c70f630a55 (patch) | |
| tree | 42c14301e85fc80a1b65c8b5f91e95388d638ccb | |
| parent | db2d78023aaf2814b28afd6ce488d98b1100aec5 (diff) | |
| download | gnutls-6f660af40c5eda366e7b439e568be2c70f630a55.tar.gz | |
Makefile.am: reduce automake warnings and corrected version
That is, avoid using the := syntax, set the right version variable
and use a hidden file for abi-check cache stamp.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
| -rw-r--r-- | Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 5b2c979a32..2269637acd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,9 +68,9 @@ abi-dump: ABI_TMPCLONEDIR="gnutls-prev-abi.tmp" ABI_TMPFILE_CUR="abi-temp-cur.xml" ABI_TMPFILE_PRE="abi-temp-prev.xml" -ABIREF := $(shell git for-each-ref --sort=taggerdate --format '%(refname)' refs/tags|tail -1) -ABIVER := $(shell git for-each-ref --sort=taggerdate --format '%(refname)' refs/tags|tail -1|cut -d '/' -f 3|sed -e 's/gnutls_//' -e 's/_/./g') -prev-tag-abi.stamp: +ABIREF=$(shell git for-each-ref --sort=taggerdate --format '%(refname)' refs/tags|tail -1) +ABIVER=$(shell git for-each-ref --sort=taggerdate --format '%(refname)' refs/tags|tail -1|cut -d '/' -f 3|sed -e 's/gnutls_//' -e 's/_/./g') +.prev-tag-abi.stamp: @rm -rf $(ABI_TMPCLONEDIR) @git clone -l . $(ABI_TMPCLONEDIR) @echo "Creating ABI for $(ABIVER)" @@ -80,14 +80,14 @@ prev-tag-abi.stamp: $(MAKE) -j$$(nproc) -C gl && $(MAKE) -j$$(nproc) -C lib && $(MAKE) -j$$(nproc) -C libdane touch $@ -abi-check: prev-tag-abi.stamp +abi-check: .prev-tag-abi.stamp @rm -f $(ABI_TMPFILE_CUR) $(ABI_TMPFILE_PRE) @echo "Checking libgnutls ABI" @echo "<version>$(VERSION)</version>" >$(ABI_TMPFILE_CUR) @echo "<headers>$(srcdir)/lib/includes/gnutls" >>$(ABI_TMPFILE_CUR) @echo "$(builddir)/lib/includes/gnutls</headers>" >>$(ABI_TMPFILE_CUR) @echo "<libs>$(builddir)/lib/.libs</libs>" >>$(ABI_TMPFILE_CUR) - @echo "<version>$(ABIVER)</version>" >$(ABI_TMPFILE_PRE) + @echo "<version>$(VERSION)</version>" >$(ABI_TMPFILE_PRE) @echo "<headers>$(builddir)/$(ABI_TMPCLONEDIR)/lib/includes/gnutls" >>$(ABI_TMPFILE_PRE) @echo "$(builddir)/$(ABI_TMPCLONEDIR)/lib/includes/gnutls</headers>" >>$(ABI_TMPFILE_PRE) @echo "<libs>$(builddir)/$(ABI_TMPCLONEDIR)/lib/.libs</libs>" >>$(ABI_TMPFILE_PRE) @@ -99,7 +99,7 @@ abi-check: prev-tag-abi.stamp @echo "$(srcdir)/lib/includes/gnutls" >>$(ABI_TMPFILE_CUR) @echo "$(builddir)/lib/includes/gnutls</headers>" >>$(ABI_TMPFILE_CUR) @echo "<libs>$(builddir)/libdane/.libs</libs>" >>$(ABI_TMPFILE_CUR) - @echo "<version>3.5.0</version>" >$(ABI_TMPFILE_PRE) + @echo "<version>$(ABIVER)</version>" >$(ABI_TMPFILE_PRE) @echo "<headers>$(builddir)/$(ABI_TMPCLONEDIR)/libdane/includes/gnutls" >>$(ABI_TMPFILE_PRE) @echo "$(builddir)/$(ABI_TMPCLONEDIR)/lib/includes/gnutls" >>$(ABI_TMPFILE_PRE) @echo "$(builddir)/$(ABI_TMPCLONEDIR)/lib/includes/gnutls</headers>" >>$(ABI_TMPFILE_PRE) |