Commit Graph

106 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 aa659985a5 Export libwiretap symbols using WS_DLL_PUBLIC define
TODO: hide flex-generated functions

svn path=/trunk/; revision=47948
2013-02-28 19:35:59 +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
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
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 ff0d1ec3fa ascend_scanner.c includes ascend.h. Add corresponding makefile
dependencies, otherwise we might have a race condition when doing
parallel makes. Hopefully this will fix intermitten buildbot failures
we've been getting lately.

svn path=/trunk/; revision=43387
2012-06-19 19:53:03 +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
Anders Broman 1932ff6734 Add more missing files.
svn path=/trunk/; revision=37593
2011-06-07 15:05:45 +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
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 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 84af13f080 (As in the Windows builds) don't have checkapi check the 'abort' group in wiretap.
svn path=/trunk/; revision=35797
2011-02-04 02:10:15 +00:00
Jeff Morriss fb83d1bba8 Fill out libwiretap's DEPENDENCIES line with the rest of the dependencies (from LIBADD).
svn path=/trunk/; revision=35146
2010-12-07 14:28:28 +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
Gerald Combs bc9f8d0cd7 Add Visual C++ project files to the distribution.
svn path=/trunk/; revision=33386
2010-06-30 23:20:03 +00:00
Jörg Mayer 952cbd7902 * Tue May 26 2009 cmorve69@yahoo.es
- made it compile with --as-needed

This patch was taken from the opensuse wireshark.spec file.
No thanks go to the author and the package maintainers of
this package for not sending this upstream - it would have
made it into 1.2.0.

svn path=/trunk/; revision=29326
2009-08-07 18:47:56 +00:00
Jörg Mayer 0d300bb6f5 Rename all of the ascend files:
That way we hopefully won't need the runlex.sh hack any
more. Also the ylwrap stuff is (hopefully) obsolete.

ascend.[hc]      -> ascendtext.[hc]
ascend-scanner.l -> ascend_scanner.l
ascend-grammar.y -> ascend.y


svn path=/trunk/; revision=28744
2009-06-15 18:56:46 +00:00
Jeff Morriss 98fd7b71df Link libwireshark and wiretap against libwsutil. That was the original intent
of adding libwsutil but somehow I missed it/got it wrong.  This should solve
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1677#c18

Also remove the _DEPENDENCIES lines in epan and wiretap (as was done in the
top-level Makefile in rev 25930) so that automake will automatically figure out
the dependencies for us.

Since the those 2 libraries now link against libwsutil, don't make every
executable link against the library.  (If this works I think we can
significantly trim the list of libraries the executables link against and just
let the libraries pull in what they need--which is, apparently, the point of
the --as-needed flag: http://www.gentoo.org/proj/en/qa/asneeded.xml ).

svn path=/trunk/; revision=26218
2008-09-16 19:24:25 +00:00
Guy Harris a04774395f Add Makefile.common files for epan/dfilter and epan/ftypes.
Add checkapi rules to Makefile.am files.

svn path=/trunk/; revision=25656
2008-07-02 01:44:30 +00:00
Guy Harris 47e7477f22 file_util.c isn't part of Wiretap any more.
svn path=/trunk/; revision=25357
2008-05-23 00:54:59 +00:00
Jeff Morriss 58459d3fba Create a new "Wireshark utility" library and move the mpeg-audio stuff from
wiretap to this new libwsutil.  This solves
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1677 by making libwireshark
no longer depend on libwiretap.

svn path=/trunk/; revision=25330
2008-05-20 21:51:01 +00:00
Jeff Morriss 73c7570102 Undo rev 24518 and (re)fix http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2291 .
svn path=/trunk/; revision=25327
2008-05-20 14:30:01 +00:00
Jeff Morriss bc580e1aa0 All our programs link against glib so don't there's no need to link our libraries against it too. This should allow us to build Wireshark (with dynamic libs) with static glib (read: it should fix the OS X buildbot building with glib-1.2).
svn path=/trunk/; revision=24518
2008-03-01 12:14:38 +00:00
Jeff Morriss 0e62e093c1 From Peter via http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2291 : libwiretap uses glib so add it to LIBADD.
svn path=/trunk/; revision=24432
2008-02-22 20:42:35 +00:00
Jörg Mayer e7374fc016 _SOURCE has magic meaning and isn't to be used by non-wizards.
Aka: Newer autofoo tools broke because of the _SOURCE ending.

svn path=/trunk/; revision=23904
2007-12-17 23:35:02 +00:00
Guy Harris 8b14380c28 Run runlex.sh from the tools directory. Get rid of the extra copy in
the top-level directory.

Don't build config.h in the wiretap directory - it now uses config.h
from the top-level directory.  Get rid of the template config.h.win32 in
that directory.

Get rid of files that are no longer in the wiretap directory or are no
longer constructed in that directory.

svn path=/trunk/; revision=23797
2007-12-07 23:38:59 +00:00
Guy Harris 4e6eec17b1 Bug 1704 is fixed in the main branch by the simpler expedient of not
using modf() and thus not requiring libm.  In addition, adding -lm to
the dependencies upsets the build on at least some platforms because
"-lm" isn't a pathname.

svn path=/trunk/; revision=23210
2007-10-16 19:01:58 +00:00
Jörg Mayer f3c4a9def0 Add ascend-grammar.h explicitely to the generation rules, otherwise
make distclean on a really clean source tree will fail.


svn path=/trunk/; revision=22933
2007-09-24 06:58:23 +00:00
Jaap Keuter 171efad2b8 Fix for bug 1704:
libm required if C library is not libc (like uclibc)

svn path=/trunk/; revision=22475
2007-08-09 06:52:13 +00:00
Guy Harris 5be4499ad1 Add a script as a front-end for Flex, to work around various problems,
such as the fact that Flex strips all but the last component of the "-o"
argument, and that it doesn't generate a header file to declare routines
the generated lexical analyzer defines.  Use that script when building
lexical analyzers, and, for each lexical analyzer, include the generated
header file in the generated analyzer.

svn path=/trunk/; revision=22446
2007-08-04 02:13:52 +00:00
Guy Harris 159e795100 Add a Makefile.am.inc file, to hold rules etc. used by multiple
Makefile.am files; currently, it has the (F)lex-to-C rule.  Have
Makefile.am files with .l.c rules include Makefile.am.inc to get that
rule.

svn path=/trunk/; revision=22436
2007-08-01 20:35:05 +00:00
Guy Harris 968d363f11 Add comments to various %option items to explain what they're doing.
Move the %options to the beginning if they weren't already there, and
put them in the same order in all files.

Add "prefix=" options to .l files that don't already have them, so we
don't have to pass a "-P" option.

Add "never-interactive" and "noyywrap" options to our lexical analyzers,
to remove extra isatty() checks and to eliminate the need for yywrap()
from the Flex library.

Get rid of %option nostdinit - that's the default.

Add .l.c: rules to Makefile.am files, replacing the rules for specific
.l files.  Have those rules all check that $(LEX) is set.

Update the address for the FSF.

svn path=/trunk/; revision=22424
2007-07-30 20:22:37 +00:00
Sebastien Tandel e545636a4f include generator sources in EXTRA_DIST
svn path=/trunk/; revision=21820
2007-05-18 00:00:10 +00:00
Sebastien Tandel 8e9a3ba58d Since code generated by lex may trigger gcc warnings, we are now generating two
libraries.  A single library is generated with the lex code without the barrier
"stop on warning". An other library is generated from the remaining source
files with the "stop on warning" barrier.


svn path=/trunk/; revision=21817
2007-05-17 18:02:22 +00:00
Luis Ontanon d4fd968d50 add support for the text export format of textronix k1[25]
svn path=/trunk/; revision=21651
2007-05-02 20:09:42 +00:00
Guy Harris e7931530dd Grr. Flex. Can't make warnings errors yet - we'd have to keep that
from being done on Flex-generated files, or fix the problems that pop up
on some platforms.

svn path=/trunk/; revision=21520
2007-04-23 03:09:23 +00:00
Guy Harris f5b1131374 Make warnings errors when possible.
svn path=/trunk/; revision=21519
2007-04-23 02:48:40 +00:00
Sebastien Tandel aa17869bf7 remove "treat warnings as errors" barrier for every repo containing code
generated by $(LEX) until a solution is found to compile them separately.


svn path=/trunk/; revision=21432
2007-04-14 14:07:46 +00:00
Stephen Fisher 62f88a4a04 From Sebastien Tandel:
(Temporarily disable the warnings as errors default on Unix to get
to get the buildbots and people with gcc40 going again until those
additional warnings gcc40 generates can be fixed-I'm working on it
ASAP)

   Patch for configure.in which disables by default the treatment of
warnings as errors.
It can be enabled with './configure --with-warnings-as-errors'.
The macro will test first if GCC is present. If it's the case,
HAVE_WARNINGS_AS_ERRORS is defined. All the USING_GCC have been replaced
by HAVE_WARNINGS_AS_ERRORS.
With this switch, people won't suffer from unexpected warnings when
downloading svn sources during the transition time ;)


svn path=/trunk/; revision=21153
2007-03-23 17:49:59 +00:00
Stephen Fisher cdf47e536b Add -Werror when using GCC only to the Makefile.am of the base
directory and most of the plugins to match the same command 
put in the Makefile.nmake files for Windows compliations.  Fix
a few warnings when compiling under gcc 3.4.4 on FreeBSD.  Create
new automake file variable called USING_GCC in configure.in and
wiretap/configure.in to acomplish the above -Werror addition. 


svn path=/trunk/; revision=21127
2007-03-22 23:03:39 +00:00
Guy Harris bbdb2dd733 Automake variables ending with _LDFLAGS are special:
http://sources.redhat.com/ml/automake/2001-08/msg00046.html

so call it LDFLAGS_SHAREDLIB rather than SHAREDLIB_LDFLAGS.

svn path=/trunk/; revision=20410
2007-01-12 21:04:33 +00:00
Ulf Lamping f3235a259f second try for file_util.c ... (at least OS X didn't liked it)
svn path=/trunk/; revision=20403
2007-01-12 05:47:12 +00:00
Guy Harris 405b7189a4 On Darwin, build shared libraries with -Wl,-single_module to the LDFLAGS
used with shared libraries, to fix some error that shows up in some
cases; some Apple documentation recommends it for most shared libraries.

svn path=/trunk/; revision=20312
2007-01-04 20:47:43 +00:00
Guy Harris e773247138 If we have to use Lex or Flex, check whether we found it, first, and if
we didn't, report an error and fail, rather than blithely executing
commands with the command a blank string.

svn path=/trunk/; revision=19602
2006-10-19 07:45:10 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00