Commit Graph

208 Commits

Author SHA1 Message Date
Jaap Keuter 827eb58b04 From David Arnold:
Replace use of INCLUDES with AM_CPPFLAGS in all Makefiles to placate recent autotools.

svn path=/trunk/; revision=48261
2013-03-12 06:53:39 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Balint Reczey d2e0724afc Add dumpabi targets to CMake builds
Also update automake generated targets to match CMake generated ones

svn path=/trunk/; revision=47879
2013-02-25 18:12:20 +00:00
Gilbert Ramirez 486c6d5445 Fix the grammar.h/grammar.c/grammar.lemon dependency so that
grammar.h is not always out of date. Use the same pattern as in the
Makefile.nmake files

svn path=/trunk/; revision=47643
2013-02-12 17:25:28 +00:00
Guy Harris a13d58a509 Put NODIST_ at the beginning of macro names, as was done for the plugins
directory.

svn path=/trunk/; revision=47599
2013-02-09 23:35:30 +00:00
Guy Harris 9eba2ea90a Don't distribute the results of running Lemon, as we distribute Lemon
ourselves.

Clean up various bits of "distribute" vs. "don't distribute" stuff in
the process - use similar names, and make the "distribute vs. don't
distribute" distinction the same as the "don't clean with "make
distclean" vs. clean with "make distclean"" distinction.

svn path=/trunk/; revision=47485
2013-02-05 06:09:17 +00:00
Gerald Combs 5130da6935 More silent build support.
svn path=/trunk/; revision=47472
2013-02-04 17:49:54 +00:00
Gerald Combs c0ca6220ef Prettify more build output.
svn path=/trunk/; revision=47469
2013-02-04 17:22:32 +00:00
Gerald Combs 7187abf120 Add $(AM_V_GEN) in a few more places.
svn path=/trunk/; revision=47434
2013-02-01 22:57:41 +00:00
Gerald Combs 8984a38512 Enable more build silence.
svn path=/trunk/; revision=47432
2013-02-01 22:13:43 +00:00
Gerald Combs c97b7912fa Go far enough down a rabbit hole and you will encounter libtool. See
if changing .o to .lo works.

svn path=/trunk/; revision=47430
2013-02-01 20:16:31 +00:00
Gerald Combs 34df2dbe54 Change some "<x>.c : <y>.h" rules to "<x>.o : <y>.h" in order to fix
distcheck. Add some rules recommended by the Automake manual in order
to avoid duplicate actions.

svn path=/trunk/; revision=47429
2013-02-01 18:20:17 +00:00
Gerald Combs f0d670afb3 Fix a couple of dependencies.
svn path=/trunk/; revision=47369
2013-01-30 19:58:12 +00:00
Gerald Combs ec880b7db3 Use readlink instead of ls.
svn path=/trunk/; revision=47338
2013-01-29 01:06:24 +00:00
Balint Reczey c6f9d4c131 make dumpabi target build with multiple digits in library version numbers
svn path=/trunk/; revision=47329
2013-01-28 21:45:44 +00:00
Evan Huus 84cc3daa3b Basic skeleton for wmem.
https://www.wireshark.org/lists/wireshark-dev/201210/msg00178.html

svn path=/trunk/; revision=45746
2012-10-24 02:04:40 +00:00
Guy Harris c16ff99f81 Make register_all_wiretap_modules() and register_all_codecs() static;
they're only used internally to epan/plugins.c.

svn path=/trunk/; revision=44815
2012-09-08 17:16:51 +00:00
Guy Harris 4c77fc1fca Include wspython if we *do* have libpy, not if we *don't*.
svn path=/trunk/; revision=44809
2012-09-07 19:40:10 +00:00
Anders Broman ef3bcb9c84 Revert 44804 as it fails on most OSX and Windows buildbots
svn path=/trunk/; revision=44804
2012-09-07 05:41:54 +00:00
Jeff Morriss 6dc8a84eab From pi-rho via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7403 :
Correct a logic error which filtered out the Python-related library symbols
when Python is enabled.

Actually expose some Python-related symbols (which get filtered out if it's
not enabled).

svn path=/trunk/; revision=44803
2012-09-07 02:20:29 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Gerald Combs 1a7470c6be 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
2012-06-08 23:54:22 +00:00
Gerald Combs a0c9661fa5 There doesn't appear to be a way to convey the message "This library is
under development. Maybe you should use a stable version." via the
version number. Use the next best thing and set each number to zero.

svn path=/trunk/; revision=43073
2012-06-04 18:33:21 +00:00
Gerald Combs e5cd6c087e 1.7.1 → 1.7.2.
svn path=/trunk/; revision=41971
2012-04-06 17:27:20 +00:00
Jeff Morriss 75c3c92f19 Add a "-build" argument to checkAPIs.pl. Use that argument when building
from makefiles (and thus from the buildbot).

The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.

As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.

svn path=/trunk/; revision=41943
2012-04-04 20:46:49 +00:00
Guy Harris b252f2e632 OK, to heck with it - link reassemble_test with libwireshark. Trying to
selectively pick up particular object files is just too much of a mess.

Alas, this requires that we add some additional symbols to the list
exported by libwireshark; the DCE RPC ones shouldn't be global, but
reassemble_test uses them, so....

Get rid of stubs in reassemble_test.c - they just stub out routines from
libwireshark, but that's not necessary any more.

svn path=/trunk/; revision=41223
2012-02-28 09:00:05 +00:00
Guy Harris bf0275b5b3 reassemble_test now requires mark_frame_as_depended_upon(), so it
requires packet.c.  (If it requires any more, we should just make it
link with libwireshark in its entirety.)

svn path=/trunk/; revision=41219
2012-02-28 07:06:59 +00:00
Balint Reczey 26503be7dc fix compile errors found by dumpabi target
svn path=/trunk/; revision=40595
2012-01-19 22:55:37 +00:00
Anders Broman 22d5e8a8d1 From Eliot:
This patch adds the symbols to a filter expression, and should remove them if
you
are building without python.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6448

svn path=/trunk/; revision=39439
2011-10-16 17:24:50 +00:00
Stig Bjørlykke 5359494b1f Second try to move crc routines to libwsutil.
This time keep the tvb routines in epan.

Now we can use common crc routines outside epan.

svn path=/trunk/; revision=38810
2011-08-31 09:00:54 +00:00
Stig Bjørlykke 71f903b956 Revert r38800, as the crc routines contains some tvb functions.
svn path=/trunk/; revision=38803
2011-08-30 14:17:40 +00:00
Stig Bjørlykke 4132d40e50 Move all crc routines to libwsutil.
This way we can use the crc routines in wiretap.

svn path=/trunk/; revision=38800
2011-08-30 13:46:42 +00:00
Jakub Zawadzki ea06298d76 Fix one more undefined reference to `EBCDIC_to_ASCII'
svn path=/trunk/; revision=37883
2011-07-03 21:18:22 +00:00
Jakub Zawadzki 6667b33f3f Fix: tvbuff.obj : error LNK2019: unresolved external symbol _EBCDIC_to_ASCII referenced in function _tvb_get_ephemeral_string_enc
Remove duplicated EBCDIC_to_ASCII from libwireshark.def

svn path=/trunk/; revision=37879
2011-07-03 18:59:41 +00:00
Guy Harris 350ec69e9a Do the Python embedding similarly to other "default = yes, if available"
items.

Add some quoting to the zlib tests, just in case the argument contains
white space.

Clean up capitalization of Lua and Python.

Link programs that use libwireshark with the Python libraries, and build
Epan with the Python cflags.

svn path=/trunk/; revision=37652
2011-06-11 19:05:17 +00:00
Gerald Combs 349273944d Add links to libtool's recommendations for library versions.
svn path=/trunk/; revision=37582
2011-06-06 21:40:40 +00:00
Anders Broman 2bc6ecf4c1 From Michael Mann:
I made 2 changes when merging the source into a single file:
1. Changed filtername to "siii" to match display filter fields (was quicker
than changing all display filter fields to "sercosiii"
2. Converted the "ett_siii arrays" to a single value.   Each subtree doesn't
need its own ett_ value.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5990

svn path=/trunk/; revision=37574
2011-06-06 19:45:51 +00:00
Balint Reczey 9fe47db306 Reorganize dumpabi targets to keep temporary files
svn path=/trunk/; revision=37540
2011-06-04 16:44:37 +00:00
Balint Reczey 73e0c4b506 Dump ABI using all header files related to libwireshark
svn path=/trunk/; revision=37538
2011-06-04 14:23:49 +00:00
Balint Reczey 8ac6683629 Add dumpabi target to Makefiles in wsutil, epan and wiretap directories.
We can use the dumped ABI description for comparing ABI changes between revisions.

svn path=/trunk/; revision=37474
2011-05-31 12:07:25 +00:00
Jeff Morriss 59ca569c41 Make it work when we have plugins
svn path=/trunk/; revision=37125
2011-05-13 15:07:54 +00:00
Jeff Morriss d1f9422b2b Don't try to export the plugin symbols if we're not building with plugins.
svn path=/trunk/; revision=37124
2011-05-13 15:04:40 +00:00
Jeff Morriss 64afd4cfa9 declare_wslua.h is built, so we need to also search in the wslua build directory for it. (This fixes out-of-source-tree builds with Lua.)
svn path=/trunk/; revision=35421
2011-01-07 18:32:17 +00:00
Balint Reczey 9506ebf309 revert commit 35160 (filter out wlua_plugin_list from libwireshark.sym when compiling without Lua)
svn path=/trunk/; revision=35162
2010-12-09 15:19:28 +00:00
Balint Reczey 99e0a44dc3 filter out wlua_plugin_list from libwireshark.sym when compiling without Lua
svn path=/trunk/; revision=35160
2010-12-08 23:36:01 +00:00
Balint Reczey 8b4573f705 Make libtool export only symbols listed in *.def files
svn path=/trunk/; revision=35145
2010-12-07 13:38:15 +00:00
Jeff Morriss c755b2fd54 Oh yeah, there's a reason we don't put targets in Makefile.common: the first target in a makefile is what you get when you just run make (without a target). Revert 35073 and 35069.
svn path=/trunk/; revision=35075
2010-11-30 02:04:55 +00:00
Jeff Morriss f1c066bbee Move some checkapi targets into Makefile.common
svn path=/trunk/; revision=35073
2010-11-29 22:34:04 +00:00
Gerald Combs bc9f8d0cd7 Add Visual C++ project files to the distribution.
svn path=/trunk/; revision=33386
2010-06-30 23:20:03 +00:00
Jeff Morriss 79c2dae960 Remove a couple more references to the optional objects (that are now in wsutil)
svn path=/trunk/; revision=33015
2010-05-29 00:34:08 +00:00