Commit Graph

465 Commits

Author SHA1 Message Date
Guy Harris 6616a3770c Make the "maintainer-clean" rules get rid of some additional generated
files.  Do this with GENERATED_HEADER_FILES, GENERATED_C_FILES, and
GENERATED_FILES macros in Makefile.common files, along the lines of what
wiretap/Makefile.common has.

Clean up "*~" files with "make clean" rather than only "make distclean"
in some additional places.

Add "maintainer-clean" rules to the Makefile.nmake files, paralelling
the ones in the automake-generated Makefile.in files, using the
GENERATED_FILES macros from Makefile.common files.  In some cases, move
the cleanup of files from "make distclean" to "make maintainer-clean",
and in other cases, put in a comment indicating why we're not doing that
(because some files that are distributed in the source tarballs, namely
Flex output, were built with a UN*X Flex and won't compile on Windows,
so we get rid of them with "make distclean" so you can clean up stuff
that *has* to be re-generated for Windows).

Clean up some *CLEANFILES definitions - get rid of ones that no longer
apply as files were moved or that add to the definition a name that's
already there.

svn path=/trunk/; revision=13402
2005-02-14 20:33:57 +00:00
Lars Roland f3294ee49a change nmake makefiles in /trunk and /trunk/epan so that
object code for libethereal.dll isn't generated by the
makefile in /trunk.

Having no code in /trunk linked into libethereal.dll
anymore, the definition of the macro _NEED_VAR_IMPORT_
can be moved from various source files in /trunk to /trunk/Makefile.nmake .
So do that, too.

svn path=/trunk/; revision=13389
2005-02-13 00:10:15 +00:00
Lars Roland 338bda08bd clean up makefiles.
especially /trunk/Makefile.nmake doesn't have to include
/trunk/epan/Makefile.common anymore.

svn path=/trunk/; revision=13368
2005-02-10 01:26:19 +00:00
Gerald Combs db4f10408c Switch the Windows build environment to GTK 2.4.14. Enable GTK-Wimp by
default in the installer.

svn path=/trunk/; revision=13087
2005-01-17 16:45:15 +00:00
Gerald Combs 21e89ed1a4 Replace a "cp" with three "xcopy"s.
svn path=/trunk/; revision=12946
2005-01-04 17:25:38 +00:00
Gerald Combs 1007a85912 If bash is run as a non-login shell, it doesn't read /etc/profile. Under
Cygwin this has the side effect of making the Windows "find" command appear 
first in the path instead of Cygwin's "find" command.  Call /usr/bin/find
explicitly in win32-setup.sh.

svn path=/trunk/; revision=12639
2004-12-01 16:56:37 +00:00
Guy Harris ffebed7a16 From Francisco Alcoba: link with setargv.obj so that wildcards are
expanded in the command line.

svn path=/trunk/; revision=12635
2004-12-01 11:35:27 +00:00
Gerald Combs 236f1a9717 Update to GTK+ 2.4.13.
svn path=/trunk/; revision=12581
2004-11-23 17:31:16 +00:00
Gerald Combs 5c665d64a7 Update the Windows build to zlib 1.2.2.
Have win32-setup.sh download from "2004-11-02" tag directory.

svn path=/trunk/; revision=12474
2004-11-02 19:07:52 +00:00
Ulf Lamping 0f80fa5c7d renamed capinfo to capinfos, as the former name capinfo was already used in a program called tcprelay, so that might confuse packaging managers and users. Hopefully I got all the places need to be changed.
svn path=/trunk/; revision=12358
2004-10-20 18:50:58 +00:00
Guy Harris 7e1521119f From Graeme Hewson: make AUTHORS-SHORT not include formatting codes,
with AUTHORS-SHORT-FORMAT containing the formatting codes.

svn path=/trunk/; revision=12334
2004-10-17 23:03:11 +00:00
Ulf Lamping 8912ad524b update setup target to latest win32 libs
svn path=/trunk/; revision=12316
2004-10-16 11:17:57 +00:00
Gerald Combs 6c2fcd2c92 Updates to reflect revision 4 of ethereal-win32-libs.
svn path=/trunk/; revision=12305
2004-10-15 18:30:05 +00:00
Gerald Combs fee16ab377 Add support for decoding DES3/CBC/MD5 keys. Make it disabled by default.
Whitespace cleanup.

svn path=/trunk/; revision=12304
2004-10-15 15:36:12 +00:00
Ulf Lamping 86b776b46c update setup target to latest GTK library files
svn path=/trunk/; revision=12249
2004-10-09 07:48:13 +00:00
Guy Harris 981c68cd51 From Lars Roland: don't link EXTRA_OBJECTS unnecessarily with
ethereal.exe, tethereal.exe and dftest.exe.  Export mkstemp() from
libethereal.dll instead.

svn path=/trunk/; revision=12181
2004-10-02 01:54:35 +00:00
Guy Harris 444119dbcb From Lars Roland: add an option to link plugins with libethereal rather
than using the plugin address table.

svn path=/trunk/; revision=12139
2004-09-29 19:30:10 +00:00
Ulf Lamping 65f82a615f Use new win32 libs from anonsvn instead of webpage, including setup target. Use updated GTK 2.4.9 libraries. But still use wget.
svn path=/trunk/; revision=12086
2004-09-24 16:08:44 +00:00
Guy Harris 29753bf6b2 From Gisle Vanem: add support for pcap_datalink_val_to_name() for Win32.
Also add support for pcap_datalink_name_to_val(), and arrange that we
properly define HAVE_PCAP_DATALINK_NAME_TO_VAL and
HAVE_PCAP_DATALINK_VAL_TO_NAME for MSVC++ builds.

svn path=/trunk/; revision=12073
2004-09-23 17:54:49 +00:00
Ulf Lamping 0b30d8900b added a clean_setup target, to cleanup the unzipped files
svn path=/trunk/; revision=11977
2004-09-12 10:07:23 +00:00
Guy Harris 9c2ece3d96 From Graeme Hewson: translate accented UTF-8 characters to Pod E<>
escapes so they turn into *roff escapes and HTML entities in the output,
in case raw UTF-8 doesn't work.

svn path=/trunk/; revision=11975
2004-09-11 23:42:03 +00:00
Ulf Lamping 812bc6eade renamed REQUIRED_APPS to REQUIRED_TOOLS and verify_apps to verify_tools, as it seems much more appropriate
svn path=/trunk/; revision=11874
2004-09-01 11:53:28 +00:00
Gerald Combs 7d2c21e317 Bump the GTK+ 2.4 version up to 2.4.7, and bup GTK-Wimp up to 0.62.
svn path=/trunk/; revision=11842
2004-08-26 23:01:46 +00:00
Gerald Combs 490545d73f Update to GTK-Wimp 0.6.1.
svn path=/trunk/; revision=11721
2004-08-11 21:22:49 +00:00
Gerald Combs b1349d460d Change the "setup" target to download the updated GTK+ libraries described
at http://mail.gnome.org/archives/gtk-devel-list/2004-August/msg00058.html .

svn path=/trunk/; revision=11718
2004-08-11 20:34:42 +00:00
Gerald Combs 2cd81cb109 Update the "setup" target for GLib 2.4.5, GTK+ 2.4.4, and Pango-1.4.1.
svn path=/trunk/; revision=11612
2004-08-06 16:25:59 +00:00
Olivier Biot 26691ff1be From Lars Roland: MSVC make fixes.
Many people have recently reported many problems with the nmake build 
process. It seems that these problems come from using 
epan/makefile.nmake to compile the DISSECTOR_SUPPORT_SOURCES which are 
located in /trunk.

Nmake from MSVC6 puts the object code of the DISSECTOR_SUPPORT_SOURCES 
in /epan although Nmake expects the object code in /trunk when it 
checkes dependencies. Thus DISSECTOR_SUPPORT_OBJECTS are built every 
time even when they are already there.

Nmake Version 1.5 (MSVC 2003 Toolkit) puts the object code of the 
DISSECTOR_SUPPORT_SOURCES in /trunk instead.
This makes it impossible to use epan/makefile.nmake for compiling the 
DISSECTOR_SUPPORT_SOURCES and to make it work for both versions of nmake.

We have to use /trunk/makefile.nmake for compiling the 
DISSECTOR_SUPPORT_SOURCES to solve these issues.

It should also be possible to build ethereal without libethereal.dll again.

Once we have moved all DISSECTOR_SUPPORT_SOURCES into a subdirectory of 
epan we can get rid of this patchwork in the nmake makefiles.


svn path=/trunk/; revision=11562
2004-07-29 07:25:11 +00:00
Olivier Biot 028fd26a0e Add the MSWIN RC information for capinfo.
svn path=/trunk/; revision=11556
2004-07-28 21:13:27 +00:00
Olivier Biot cb6b29786b From Ian Schorr: capinfo - provides capture file information.
svn path=/trunk/; revision=11555
2004-07-28 20:51:29 +00:00
Guy Harris f28323ba39 From Graham Bloice: add resources to wiretap.dll.
svn path=/trunk/; revision=11476
2004-07-23 06:11:50 +00:00
Gerald Combs 83b366536a Add doxygen.cfg to the "clean" target.
svn path=/trunk/; revision=11464
2004-07-21 22:12:49 +00:00
Gerald Combs e20430f876 Fixes (and ugly hacks) for Windows compilation.
svn path=/trunk/; revision=11435
2004-07-19 21:18:40 +00:00
Ulf Lamping 5c008e38ba Fix the win32 nmake generation for now (it will compile/link/run again). This will need more cleanup if the movements of the dissector sources are finished. Hopefully this doesn't broke the unix build.
svn path=/trunk/; revision=11423
2004-07-18 23:46:07 +00:00
Ulf Lamping 4fdb830569 first attempt to make Win32 generation (nmake) ready for the dissector movings (but still incomplete)
svn path=/trunk/; revision=11415
2004-07-18 20:21:20 +00:00
Gilbert Ramirez 669db206cb Move dissectors to epan/dissectors directory.
Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410
2004-07-18 18:06:47 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Ulf Lamping 31b5d74f55 Changed dependencies, so image dir will be generated before epan, otherwise the libethereal.res file will not be available when needed to link libethereal.dll
svn path=/trunk/; revision=11394
2004-07-17 12:49:34 +00:00
Guy Harris 506605d771 From Graham Bloice: add resource information to libethereal.dll.
svn path=/trunk/; revision=11388
2004-07-17 09:49:32 +00:00
Gerald Combs 8106dc0862 Convert make-version.pl and the associated cvsversion.h and CVSVERSION
definition to Subversion.  "svn info" prints out the last changed date
of the repository, so we don't have to go hunting through "CVS/Entries"
files anymore.


svn path=/trunk/; revision=11379
2004-07-15 21:09:33 +00:00
Gerald Combs 26da520614 Both epan/doxygen.cfg and gtk/doxygen.cfg depend on the root doxygen.cfg.
Build it before going into those directories.

svn path=/trunk/; revision=11375
2004-07-13 19:30:02 +00:00
Guy Harris 7737b1382d From Laurent Rabret: replace "lib" with "link /lib"; "lib" is just a
wrapper around "link /lib", and not all Microsoft C compiler
distributions provide "lib".

svn path=/trunk/; revision=11242
2004-06-26 02:16:16 +00:00
Ulf Lamping 2a6da1361c Add experimental feature of opening a webbrowser, to show some of the
webpages from http://www.ethereal.com. This functionality is copied from
the Gimp.
Win32 will use ShellExecute to use the system registered webbrowser.
On unix builds, currently the mozilla browser is hardcoded, we still need a
preference setting for this (I will add this later).

svn path=/trunk/; revision=11206
2004-06-21 17:27:35 +00:00
Gerald Combs c10d97d8e3 Change to GLib 2.4.2 and GTK+ 2.4.3.
svn path=/trunk/; revision=11204
2004-06-21 15:57:50 +00:00
Ulf Lamping 3e66de1895 add GTK2.4 and alike libs to the setup target,
depending on settings in config.nmake

svn path=/trunk/; revision=11200
2004-06-20 20:22:09 +00:00
Ulf Lamping a85e91903a add merge.obj to the linking of mergecap.exe
svn path=/trunk/; revision=11193
2004-06-20 09:49:36 +00:00
Ulf Lamping 86246e6851 convert AUTHORS file to a shorter version (without the tasks done)
for the about dialog

svn path=/trunk/; revision=10944
2004-05-21 17:25:32 +00:00
Ulf Lamping 3508e88563 GTK Wimp has it's own setting: GTK_WIMP_DIR,
the setup target should use it accordingly

svn path=/trunk/; revision=10894
2004-05-14 16:23:38 +00:00
Olivier Biot d5a08cdf9f Fix a typo (seperate should be separate).
svn path=/trunk/; revision=10878
2004-05-13 20:54:39 +00:00
Guy Harris 15af0f656f From Lars Roland: add support for building a libethereal.dll with MSVC:
add a config.nmake option to control whether to build
	libethereal.dll or not;

	remove "./wiretap" from PATH to prevent problems due to
	wrongly-loaded files;

	build dissector.lib with MSVC;

	move "print.c" and "ps.c" to the dissector helpers, as "print.c"
	imports variables from packet-frame.c and packet-data.c, which
	are in libethereal;

	move "g711.c" out of the dissector helpers, as they're used only
	by Ethereal in a tap, not in Tethereal or in any dissector;

	add a .def file for libethereal;

	arrange to declare global variables exported from libethereal
	with "__declspec(dllimport)" when building programs that import
	those variables;

	update the NSIS installer.

Make the "configure" script define ETH_VAR_IMPORT as "extern".

svn path=/trunk/; revision=10834
2004-05-09 10:03:41 +00:00
Olivier Biot 388aaadcb7 Get rid of epan/config.h.win32.
Fix a missing ZLIB_CFLAGS in epan/Makefile.nmake.

svn path=/trunk/; revision=10807
2004-05-06 20:48:36 +00:00