Commit Graph

93 Commits

Author SHA1 Message Date
Luis Ontanon 88e699977c Although yet untested (but it compiles and is still unused) add UAT to the repo.
UAT is an API to handle User Accessible Tables,
an UAT is basically an array of arbitrary structs that has a file representation
as a mean for mantaining things like:
- the snmp_users_table
- dfilter macros
- ipsec/ssl key bindings
- k12 configuration,
- and many other table-like user modifiable preferences

comming soon gtk's uat_window() and prefs_add_uat()

uat.h is fairly doc[uo]m[m]?ented, a README with a simple example of how is to be used will be available as I write them


svn path=/trunk/; revision=20586
2007-01-28 10:31:32 +00:00
Ulf Lamping 47aaf7d9b7 on my way to fix #301:
add a function get_persdatafile_dir() that will return the users personal default data dir Win32:"My Documents" UNIX:"" (for the current dir)

svn path=/trunk/; revision=20431
2007-01-14 22:25:22 +00:00
Anders Broman a2e3afd76b load_snmp_users_file.c needs to be rebuilt after distclean to make tarballs work on Windows.
svn path=/trunk/; revision=20395
2007-01-11 20:05:05 +00:00
Luis Ontanon 7fd7fb4eea the forgotten file strikes again...
svn path=/trunk/; revision=20355
2007-01-09 19:58:18 +00:00
Ulf Lamping 59cebb950f remove the PDB_FILE setting from config.nmake - there's no real need for this info
add some missing files to the clean targets

svn path=/trunk/; revision=20290
2007-01-03 05:41:11 +00:00
Gerald Combs bd282b4114 Move the contents of airpdcap to epan/crypt. Try to fix the current
distcheck failure.  Move the nmake build targets for airpdcap from 
epan/dissectors to epan.  This will probably break the Windows build.

svn path=/trunk/; revision=20231
2006-12-28 17:22:12 +00:00
Bill Meier bf209eec73 Use 'igncr' as needed with Bash (workaround for bug report 1162);
Change usage of 'nmake' to $(MAKE) /$(MAKEFLAGS) in a few places;
Add one missing /$(MAKEFLAGS);


svn path=/trunk/; revision=20034
2006-12-04 05:41:53 +00:00
Gerald Combs f9915b8150 Don't try to build wslua if LUA_DIR isn't defined.
svn path=/trunk/; revision=19330
2006-09-26 22:51:04 +00:00
Luis Ontanon c8a95a0548 Lua 5.1.1 for windows
svn path=/trunk/; revision=19324
2006-09-26 03:31:00 +00:00
Ulf Lamping 9fee393b87 tweak the nmake build so the NET-SNMP library is in fact optional (as it is in the UNIX builds)
svn path=/trunk/; revision=19196
2006-09-11 22:47:57 +00:00
Ronnie Sahlberg db179bb768 config and makefile magic we need when we integrate kerberos for windows with the w32 build
disabled for now


svn path=/trunk/; revision=18838
2006-08-05 04:32:57 +00:00
Gerald Combs 4cd1774c69 ethereal -> wireshark.
svn path=/trunk/; revision=18836
2006-08-04 14:43:48 +00:00
Gerald Combs 20093fdaa4 snprintf -> g_snprintf. Fix up whitespace.
svn path=/trunk/; revision=18776
2006-07-20 21:29:45 +00:00
Ronnie Sahlberg 9647ea21f8 ethereal to wireshark change
svn path=/trunk/; revision=18497
2006-06-17 11:57:26 +00:00
Gerald Combs b15974d094 libethereal -> libwireshark. idl2eth -> idl2wrs. There are a _lot_ of
changes here.  It compiles OK on OS X, but hasn't been tested anywhere else.

svn path=/trunk/; revision=18260
2006-05-31 00:23:01 +00:00
Lars Roland b63ee69750 Add some dependencies for libethereal.dll, so it gets re-build, if someone just changes a source file in a subdirectory (e.g. a dissector)
svn path=/trunk/; revision=17661
2006-03-18 03:32:10 +00:00
Lars Roland 95ecdf78c1 From Bill Meier
The following patch prevents a windows nmake of Ethereal from
relinking libethereal.dll 
when DOXYGEN is not defined in config.nmake and
there are no changes to libethereal.dll dependents.

svn path=/trunk/; revision=17224
2006-02-09 07:03:54 +00:00
Guy Harris ad3cb359b6 From Paolo Abeni:
Set up to build on Windows if we have GNU TLS.

	Define "ssl_data_set()" regardless of whether we have GNU TLS or
	not, as it's used in either case.

	Get rid of an extra #include of epan/gnuc_format_check.h.

svn path=/trunk/; revision=17177
2006-02-06 09:09:06 +00:00
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