Commit Graph

75 Commits

Author SHA1 Message Date
Guy Harris 75b9062c44 Get rid of "dtd_grammar.out" on a "make distclean".
Get rid of all the Flex-generated (and Lemon-generated) files on a
"nmake -f Makefile.nmake distclean".

svn path=/trunk/; revision=15770
2005-09-12 19:50:45 +00:00
Ulf Lamping 78a5252c83 fix MSVC slash/backslash and other such problems, now getting:
dtd_preparse.obj : error LNK2001: Nichtaufgeloestes externes Symbol _fgetln

MSVC doesn't support fgetln!

svn path=/trunk/; revision=15749
2005-09-10 18:33:32 +00:00
Luis Ontanon c32307b90d Make sure lemon is built before trying to use it
svn path=/trunk/; revision=15748
2005-09-10 18:00:28 +00:00
Luis Ontanon 022d9e23c5 nmake does not have the $^ macro
svn path=/trunk/; revision=15746
2005-09-10 17:47:02 +00:00
Luis Ontanon 96326c0b86 the dtd parser (still missing the glue) and few fixes to packet-xml.c
svn path=/trunk/; revision=15745
2005-09-10 17:29:15 +00:00
Gerald Combs adce5ed6a5 Set "COPYCMD=/Y" and remove the "/Y" from each XCOPY command in order
to fix compilation under Windows NT.  This should fix bug 403.

The changes were made using "find . -name Makefile.nmake | xargs perl
-pi.bak -e 's: /y::i'".  They appear to work under XP, but if anything
broke I blame Larry Wall.

svn path=/trunk/; revision=15710
2005-09-07 13:26:23 +00:00
Guy Harris 3d1dfa4f67 Put in comments explaining why we're removing some generated files with
"make distclean", even though they come with the distribution, and
make the one in plugins/xml/Makefile.nmake match the one in some other
files.

svn path=/trunk/; revision=15214
2005-08-04 22:22:53 +00:00
Luis Ontanon 05c7ac167e Autogenerate the sminmpec.c file from iana's enterprise-numbers file
svn path=/trunk/; revision=15033
2005-07-24 03:36:21 +00:00
Ulf Lamping 84424bb2da add radius_dict.c to the distclean target, don't know how to do this for Makefile.am
svn path=/trunk/; revision=14944
2005-07-17 13:39:24 +00:00
Luis Ontanon 853501a452 Radius Dictionary Support
Part 3: the makefiles


svn path=/trunk/; revision=14926
2005-07-15 21:18:32 +00:00
Ronnie Sahlberg 0f66df8509 BACAPP updates
svn path=/trunk/; revision=14188
2005-04-26 08:03:22 +00:00
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 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 38863005ae EXTRA_OBJECTS are needed for ethereal.lib (only used if ENABLE_LIBETHEREAL isn't set)
svn path=/trunk/; revision=11893
2004-09-04 11:21:20 +00:00
Gerald Combs 81be1fbe77 From Graham Bloice: Allow libethereal.dll to be built after recent changes.
svn path=/trunk/; revision=11644
2004-08-10 15:10:45 +00:00
Guy Harris 9d81b834d7 Add LIBETHEREAL_SRC and LIBETHEREAL_INCLUDES to epan/Makefile.common,
and have epan/Makefile.am and epan/Makefile.nmake use them.

svn path=/trunk/; revision=11641
2004-08-10 07:52:11 +00:00
Gerald Combs ed2befc8b7 Merge the "resolv" rename changes with the trunk.
svn path=/trunk/; revision=11638
2004-08-09 22:31:21 +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 21cb72b093 Partial fix after some files being moved between directories.
There is still a problem with MSVC builds as 3 objects get built twice (once
at the top level, and once in epan: xmlstub.obj, print.obj and ps.obj).

This fix allows to compile again with MSVC if debug symbols are NOT enabled
while building Ethereal.  Do this by editing config.nmake and replacing
"LOCAL_LDFLAGS=/DEBUG" with "LOCAL_LDFLAGS=". In other words: Ethereal CANNOT
be built right now with debug symbols in the object code, for MSVC builds.

svn path=/trunk/; revision=11557
2004-07-28 22:41:19 +00:00
Guy Harris 74fda1d8ab From Lars Roland:
clean up the message printed when building libethereal.dll;

	have "make distclean" clean out the "dissectors" subdirectory.

Clean up indentation.

svn path=/trunk/; revision=11540
2004-07-27 18:56:50 +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
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
Ulf Lamping 7c73a1552b remove doxygen output dir "html" on make clean
svn path=/trunk/; revision=11332
2004-07-07 16:23:13 +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
Jörg Mayer 392a0d43c0 doxygen changes:
- moved doxygen.cfg to doxygen.cfg.in and let configure to the substitution
  on unix. Adapted the namke files accordingly.
- Don't add doxygen as a dependency for libethereal and libui: As doxygen is
  an unconditional target, this would cause the applications to be rebuild
  every time make was called, even when nothing changed in the meantime.
  This means that by now we need to do "make doxygen" manually in case we
  want updated documentation.

svn path=/trunk/; revision=11238
2004-06-25 07:10:55 +00:00
Ulf Lamping b0dd8e1e49 use sed to create a temporary doxygen config file,
to get the version number from ..\config.nmake

svn path=/trunk/; revision=10865
2004-05-13 10:10:28 +00:00
Ulf Lamping 576c374213 adding a doxygen target
svn path=/trunk/; revision=10842
2004-05-11 00:53:12 +00:00
Guy Harris cb6f40213b From Lars Roland: fix some MSVC build problems.
svn path=/trunk/; revision=10835
2004-05-09 18:54:00 +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
Gerald Combs 233dadebd3 From Lars Roland: Fix a couple of MSVC build problems.
svn path=/trunk/; revision=10439
2004-03-22 20:35:07 +00:00
Olivier Biot 11f9232336 From Lars Roland: Move timestamp_type into libethereal and provide accessor
methods for getting and setting the timestamp type.

This is a move towards a real libethereal shared library.

svn path=/trunk/; revision=10402
2004-03-18 19:04:33 +00:00
Guy Harris 27656155b7 Add routines to process IPv{4,6}-address-and-prefix-length pairs,
masking out the appropriate bits in the address.

Use them in the BGP and EIGRP dissectors.

svn path=/trunk/; revision=10327
2004-03-06 03:25:10 +00:00
Ulf Lamping f1df01f866 from Lars Roland: fix Makefiles.nmake after changes from Joerg
svn path=/trunk/; revision=10277
2004-03-02 18:55:30 +00:00
Jörg Mayer 4a6e73c84a Move the dissectors into libethereal (no static/shared lib changes):
- Create epan/Makefile.common
- Move dissector_src and helper files from Makefile.common to
  epan/Makefile.common
- Create register.c in epan/
- link all the files into libethereal
- put plugin_src into epan/Makefile.am

Try to make rpms build with rpm v4 again (sorry, I've forgotten who to
attribute this to).

svn path=/trunk/; revision=10273
2004-03-02 01:21:56 +00:00
Ulf Lamping cd85423556 epan don't need GTK_CFLAGS as GTK isn't used,
GLIB_CFLAGS are just enough

svn path=/trunk/; revision=9779
2004-01-22 19:27:59 +00:00
Gerald Combs 409948eced Add PCRE support to the Windows build.
svn path=/trunk/; revision=9185
2003-12-07 00:04:32 +00:00
Guy Harris be4197e744 From Ulf Lamping: add some missing "cd .."s. (I guess the current
directory in nmake files persists across targets; presumably all
commands, or, at least, all "cd" commands, are run in the same process.)

svn path=/trunk/; revision=8682
2003-10-13 19:04:56 +00:00
Guy Harris 02e1d2680a Give every Makefile.nmake file a "distclean" rule, and have "distclean"
recurse into subdirectories doing "nmake -f Makefile.nmake distclean".

Have "nmake -f Makefile.nmake clean" not remove stuff that "make clean"
doesn't remove (such as Flex/Bison output and config.h files) - and have
"nmake -f Makefile.nmake distclean" remove stuff that "make distclean"
removes, including "tethereal-tap-register.c" and
"ethereal-tap-register.c".

svn path=/trunk/; revision=8672
2003-10-10 21:31:53 +00:00
Guy Harris 0bdb498bdb Do all the tests for whether ADNS_DIR is defined or not in
"config.nmake", and just use the variables set based on the results of
those tests in various "Makefile.nmake" files.

svn path=/trunk/; revision=7891
2003-06-15 23:04:47 +00:00
Guy Harris 8178db4980 Define GLIB_LIBS and GTK_LIBS variables in config.nmake (based on
variables the user configures - the user isn't expected to change
GLIB_LIBS or GTK_LIBS, and there's a comment nothing that users
shouldn't have to do so), which contain the appropriate libraries for
building stuff that requires only GLib, and stuff that required GTK+ and
GLib, respectively, and use those macros in the Makefile.nmake files.

svn path=/trunk/; revision=7885
2003-06-14 20:45:29 +00:00
Guy Harris 71424053cd Define GLIB_CFLAGS and GTK_CFLAGS variables in config.nmake (based on
variables the user configures - the user isn't expected to change
GLIB_CFLAGS or GTK_CFLAGS, and there's a comment nothing that users
shouldn't have to do so), which contain the appropriate "/I" flags for
building stuff that requires only GLib, and stuff that required GTK+ and
GLib, respectively, and use those macros in the Makefile.nmake files.

svn path=/trunk/; revision=7884
2003-06-14 20:36:04 +00:00
Guy Harris 117cd421e4 From Lars Roland: don't use ADNS_DIR if it's not defined.
svn path=/trunk/; revision=7881
2003-06-13 22:45:15 +00:00