diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2019-12-21 00:17:10 +0000 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2019-12-21 00:17:10 +0000 |
| commit | 2baf633b1c2ac488a6b65fcea3f15a3c46791738 (patch) | |
| tree | 0ea288db1e1c2eb5ba2cfadf3d08ff17e957d293 | |
| parent | 66f07a10beb3f62257d859ccad367902c93785d5 (diff) | |
| parent | 728a34bd150cd662db2eef937d8de904f0883ea9 (diff) | |
| download | gnutls-2baf633b1c2ac488a6b65fcea3f15a3c46791738.tar.gz | |
Merge branch 'abi-fix' into 'master'
abi-check: fix include paths
See merge request gnutls/gnutls!1139
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 405d2fdebf..ae5820c62d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -101,14 +101,14 @@ abi-dump-latest: lib/libgnutls.la libdane/libgnutls-dane.la abi-check-latest: lib/libgnutls.la libdane/libgnutls-dane.la @echo "Checking whether the latest ABI dump matches" - @abidiff --suppressions $(ABIGNORE_FILE) lib/.libs/libgnutls.so $(LIBGNUTLS_ABI_LAST_FILE) --hd2 "$(srcdir)/lib/includes/gnutls/"; if test $$? != 0;then \ + @abidiff --suppressions $(ABIGNORE_FILE) lib/.libs/libgnutls.so $(LIBGNUTLS_ABI_LAST_FILE) --hd2 "$(srcdir)/lib/includes/gnutls/" --hd2 $(builddir)/lib/includes/gnutls/ ; if test $$? != 0;then \ echo "*********************************************************"; \ echo "libgnutls ABI has changed; use 'make files-update' "; \ echo "and use 'git diff' to check correctness before committing"; \ echo "*********************************************************"; \ false; \ fi - @abidiff libdane/.libs/libgnutls-dane.so $(LIBDANE_ABI_LAST_FILE) --hd2 "$(srcdir)/libdane/includes/gnutls/"; if test $$? != 0;then \ + @abidiff libdane/.libs/libgnutls-dane.so $(LIBDANE_ABI_LAST_FILE) --hd2 "$(srcdir)/libdane/includes/gnutls/" --hd2 $(builddir)/lib/includes/gnutls/; if test $$? != 0;then \ echo "*********************************************************"; \ echo "libgnutls-dane ABI has changed; use 'make files-update' "; \ echo "and use 'git diff' to check correctness before committing"; \ @@ -123,7 +123,7 @@ ABICHECK_COMMON = --no-added-syms abi-check: lib/libgnutls.la libdane/libgnutls-dane.la @for file in $$(echo $(srcdir)/devel/libgnutls-*-$$(uname -m).abi);do \ echo "Comparing libgnutls with $$file"; \ - abidiff $${file} lib/.libs/libgnutls.so $(ABICHECK_COMMON) --suppressions $(ABIGNORE_FILE) --hd2 "$(srcdir)/lib/includes/gnutls/"; \ + abidiff $${file} lib/.libs/libgnutls.so $(ABICHECK_COMMON) --suppressions $(ABIGNORE_FILE) --hd2 "$(srcdir)/lib/includes/gnutls/" --hd2 $(builddir)/lib/includes/gnutls/; \ if test $$? != 0;then \ echo "****************************************************************************"; \ echo "ABI check failed; If intentional add suppression in devel/libgnutls.abignore"; \ @@ -133,7 +133,7 @@ abi-check: lib/libgnutls.la libdane/libgnutls-dane.la done @for file in $$(echo $(srcdir)/devel/libdane-*-$$(uname -m).abi);do \ echo "Comparing libgnutls-dane with $$file"; \ - abidiff $${file} libdane/.libs/libgnutls-dane.so $(ABICHECK_COMMON) --hd2 "$(srcdir)/libdane/includes/gnutls/"; \ + abidiff $${file} libdane/.libs/libgnutls-dane.so $(ABICHECK_COMMON) --hd2 "$(srcdir)/libdane/includes/gnutls/" --hd2 $(builddir)/lib/includes/gnutls/; \ if test $$? != 0;then \ echo "**********************************************"; \ echo "ABI check failed; If intentional add a "; \ |