diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-06-08 23:54:22 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-06-08 23:54:22 +0000 |
| commit | 1a7470c6be25e157d8323011acae47478bcdf1ab (patch) | |
| tree | ad0e86a3b37cb350d4ffe3823efd2eca482de1a1 /wiretap/Makefile.am | |
| parent | be965bff75dc5afde81e74c8a01395af9b14e963 (diff) | |
| download | wireshark-1a7470c6be25e157d8323011acae47478bcdf1ab.tar.gz | |
Forward-port r43165 and r43168 from trunk-1.6.
------------------------------------------------------------------------
r43165 | gerald | 2012-06-08 14:23:25 -0700 (Fri, 08 Jun 2012) | 4 lines
Changed paths:
M /trunk-1.6/epan/Makefile.am
M /trunk-1.6/wiretap/Makefile.am
M /trunk-1.6/wsutil/Makefile.am
Use separate commands in the dumpabi recipes instead a big huge long
chain. If abi-compliance-checker fails print the contents of its
log file.
------------------------------------------------------------------------
r43168 | gerald | 2012-06-08 15:43:50 -0700 (Fri, 08 Jun 2012) | 2 lines
Changed paths:
M /trunk-1.6/epan/Makefile.am
M /trunk-1.6/wiretap/Makefile.am
M /trunk-1.6/wsutil/Makefile.am
Make sure ln happens in the right directory.
------------------------------------------------------------------------
We don't currently have a usable tag for "git describe --tags
--abbrev=0" to latch onto so just use the first 1.9 commit.
svn path=/trunk/; revision=43170
Diffstat (limited to 'wiretap/Makefile.am')
| -rw-r--r-- | wiretap/Makefile.am | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 390c885397..c18f3d6318 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -92,12 +92,14 @@ ascend.c ascend.h: ascend.y # http://ispras.linux-foundation.org/index.php/ABI_compliance_checker # Checked using version 1.21.12 dumpabi: all abi-descriptor.xml - rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz; \ - mkdir abi-check-headers; cp *.h abi-check-headers/; \ + rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz + mkdir abi-check-headers + cp *.h abi-check-headers/ abi-compliance-checker -l libwiretap -v1 `ls .libs/libwiretap.so.?.?.?|sed 's/.*\.so\.//'` \ - -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml && \ - cp -f abi_dumps/libwiretap/libwiretap_* .libs/; \ - cd .libs; ln -sf libwiretap_*.abi.tar.gz libwiretap.abi.tar.gz + -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \ + cat logs/libwiretap/[0-9]*/log.txt + cp -f abi_dumps/libwiretap/libwiretap_* .libs/ + cd .libs && ln -sf libwiretap_*.abi.tar.gz libwiretap.abi.tar.gz checkapi: ## 'abort' checking disabled for now pending resolution of existing use of g_assert & g_error |