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 /epan/Makefile.am | |
| parent | be965bff75dc5afde81e74c8a01395af9b14e963 (diff) | |
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 'epan/Makefile.am')
| -rw-r--r-- | epan/Makefile.am | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index 0662397d54..2af0672210 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -310,21 +310,29 @@ endif # HAVE_DOXYGEN # 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 ../color.h ../config.h ../register.h abi-check-headers/; \ - mkdir abi-check-headers/epan; cp *.h abi-check-headers/epan; \ - mkdir abi-check-headers/crypt; cp crypt/*.h abi-check-headers/crypt; \ - mkdir abi-check-headers/dfilter; cp dfilter/*.h ../tools/lemon/cppmagic.h abi-check-headers/dfilter; \ - mkdir abi-check-headers/dissectors; cp dissectors/*.h abi-check-headers/dissectors; \ - rm abi-check-headers/dissectors/x11-extension-implementation.h \ - abi-check-headers/dissectors/packet-rtps2.h \ - abi-check-headers/dissectors/x11-glx-render-enum.h \ - abi-check-headers/dissectors/x11-register-info.h \ - abi-check-headers/dissectors/packet-idmp.h; \ - mkdir abi-check-headers/ftypes; cp ftypes/*.h abi-check-headers/ftypes; \ + mkdir abi-check-headers + cp ../color.h ../config.h ../register.h abi-check-headers/ + mkdir abi-check-headers/epan + cp *.h abi-check-headers/epan + mkdir abi-check-headers/crypt + cp crypt/*.h abi-check-headers/crypt + mkdir abi-check-headers/dfilter + cp dfilter/*.h ../tools/lemon/cppmagic.h abi-check-headers/dfilter + mkdir abi-check-headers/dissectors + cp dissectors/*.h abi-check-headers/dissectors + rm \ + abi-check-headers/dissectors/x11-extension-implementation.h \ + abi-check-headers/dissectors/packet-rtps2.h \ + abi-check-headers/dissectors/x11-glx-render-enum.h \ + abi-check-headers/dissectors/x11-register-info.h \ + abi-check-headers/dissectors/packet-idmp.h + mkdir abi-check-headers/ftypes + cp ftypes/*.h abi-check-headers/ftypes abi-compliance-checker -l libwireshark -v1 `ls .libs/libwireshark.so.?.?.?|sed 's/.*\.so\.//'` \ - -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml && \ - cp -f abi_dumps/libwireshark/libwireshark_* .libs/; \ - cd .libs; ln -sf libwireshark_*.abi.tar.gz libwireshark.abi.tar.gz + -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \ + cat logs/libwireshark/[0-9]*/log.txt + cp -f abi_dumps/libwireshark/libwireshark_* .libs/ + cd .libs && ln -sf libwireshark_*.abi.tar.gz libwireshark.abi.tar.gz checkapi: $(PERL) ../tools/checkAPIs.pl -g termoutput -build $(LIBWIRESHARK_SRC) |