Commit Graph

205 Commits

Author SHA1 Message Date
Gerald Combs fe79af8f42 From Kovarththanan Rajaratnam via bug 3500:
Sébastien's initial commit [1] didn't contain support for embedding Python on
Windows.

[1] http://anonsvn.wireshark.org/viewvc?view=rev&revision=28529


From me:

Comment out PYTHON_EMBED for now.

Start a list of known Python+CRT versions.

Add get_wspython_dir to libwireshark.def.

svn path=/trunk/; revision=33036
2010-06-01 22:20:15 +00:00
Jeff Morriss 47e2d75820 Move some code (including the optional objects) into libwsutil
svn path=/trunk/; revision=33012
2010-05-28 20:19:55 +00:00
Bill Meier 0303dfbf9f Manifests are not needed when building with VC10.
So: don't run mt program ("manifest-tool") when building Wireshark & etc with VC10.
See: http://msdn.microsoft.com/en-us/library/dd293574.aspx

svn path=/trunk/; revision=32540
2010-04-22 19:35:47 +00:00
Guy Harris ceb816e721 Put the object file lists for various test programs into variables, and
use the variables, so the list of dependencies and the list of object
files used in the link command are the same (and so that they're
complete; the dependencies were, the link command lists weren't).

svn path=/trunk/; revision=32067
2010-03-01 19:17:05 +00:00
Guy Harris 47ec37c44e tvbtest needs bytes_to_str() and bytes_to_str_punct(), and they're now
in to_str.c.

svn path=/trunk/; revision=32040
2010-02-27 22:42:01 +00:00
Kovarththanan Rajaratnam 70590c7613 Add new to_str.o/obj dependency to reassemble_test target
svn path=/trunk/; revision=31976
2010-02-24 08:13:58 +00:00
Kovarththanan Rajaratnam e6486705f7 Move make-sminmpec.pl to tools directory
svn path=/trunk/; revision=30511
2009-10-11 14:39:14 +00:00
Kovarththanan Rajaratnam 5417edcfdc Windows: remove all references to ICONV_DIR, because we use the statically linked win-iconv instead
svn path=/trunk/; revision=29580
2009-08-27 05:04:29 +00:00
Gerald Combs bfa7074d82 mkstemp cleanups.
svn path=/trunk/; revision=28923
2009-07-02 19:50:35 +00:00
Gerald Combs e2cd2bf4f2 Don't assemble asm_utils_win32_x86 on x64. Export a dummy read_keytab_file
if we're not using any encryption libraries on Windows.

This fixes the last Win64 compilation problems in epan.

svn path=/trunk/; revision=28008
2009-04-08 19:15:10 +00:00
Gerald Combs c86c61602a Add another Flex exception.
svn path=/trunk/; revision=28003
2009-04-08 18:10:32 +00:00
Gerald Combs 15f33eecbf Disable warnings-as-errors for Flex-generated output. Add a couple of gsize
casts.

svn path=/trunk/; revision=28002
2009-04-08 18:08:25 +00:00
Gerald Combs dd903ca9c8 Create an "epan/crc" directory for CRC code. Add crc-16-plain.[ch],
generated from pycrc. The command line used to generate the file is in
epan/crc/Makefile.common. I used "plain" to distinguish it from CCITT,
USB, and other 16-bit CRCs. Integrate the new CRC code into our
infrastructure.

Add crc16_plain_tvb_offset() to epan/crc16.[ch] and use it in
plugins/profinet/packet-pn-rt.c. This _should_ work correctly, but
hasn't been tested.

svn path=/trunk/; revision=27790
2009-03-18 21:59:30 +00:00
Gerald Combs 57dadc4664 More Windows compiler flag cleanups. Fix a problem with my last commit
that would break compilation for older compilers. Create a "DLL_LDFLAGS"
variable and use it in DLLs and plugins. Use PLUGIN_LDFLAGS and
DLL_LDFLAGS where needed. Don't force i386 code in the TPG plugin.

svn path=/trunk/; revision=27582
2009-03-02 21:33:11 +00:00
Gerald Combs c30c410fa5 Add GeoIP to the Windows build. Fix a remaining geoip_ -> geoip_db_
conversion.

svn path=/trunk/; revision=27098
2008-12-23 18:56:31 +00:00
Gerald Combs ba485a4163 Add /D_BIND_TO_CURRENT_CRT_VERSION=1 to LOCAL_CFLAGS in modern versions
of Visual C++. (How did this "feature" ever see the light of day?) Make
sure we use LOCAL_CFLAGS *everywhere*. This should fix problems with
building a usable installer under Visual Studio 2008 SP1.

Add comments with links to Visual C++'s idiotic handling of assemblies
and deployment using xcopy. Move to c-ares 1.5.3. Make sure we remove
all of our manifests in epan and packaging/u3/tools.

svn path=/trunk/; revision=26219
2008-09-16 21:08:18 +00:00
Gerald Combs 85fb7e2305 _MSC_VERs 1400 and greater require manifests. Check against
MSC_VER_REQUIRED when we run mt.exe instead of checking for each
individual MSVC_VARIANT. This fixes the current buildbot test failures
on Windows, which resulted from a missing check for MSVC2008. This
also keeps us from having to mess with a bunch of makefiles when we add
support for new Visual C++ versions.

svn path=/trunk/; revision=26052
2008-08-21 18:12:47 +00:00
Gerald Combs 021a926793 Add support for the c-ares asynchronous DNS resolution library to the
Windows build. Add support for async IPv6 lookups. Update the ADNS
code slightly.

This is not supported (yet) on the UNIX side.

svn path=/trunk/; revision=25953
2008-08-07 21:41:48 +00:00
Gerald Combs 7d8e29f501 From Pascal Quantin via bug 2719: Fix support for Microsoft Visual C++ 2008.
From me:

Instead of adding adns_config.h, place it a custom adns package in
wireshark-win32-libs. Update tools/win32-setup.sh accordingly.

Split the MSVC2008EE variant into MSVC2008 and MSVC2008EE, similar to
MSVC2005 and MSVC2005EE. We have to worry about vcredist_x86.exe in
both cases.

Add Pascal to AUTHORS.

Update the Developer's Guide.

svn path=/trunk/; revision=25921
2008-08-04 23:05:32 +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 b6e20d89be Put printf into a separate "termoutput" API group. For most files,
check for it - but not for TShark plugins, as they are expected to
print to the standard output.

svn path=/trunk/; revision=25653
2008-07-01 21:13:32 +00:00
Bill Meier f572cd1a85 Set for automatic overwrite for xcopy of mkstemp.c, etc
svn path=/trunk/; revision=25356
2008-05-23 00:25:20 +00:00
Bill Meier 34b16e6223 Use the correct name for libwsutil
svn path=/trunk/; revision=25333
2008-05-20 23:41:10 +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
Anders Broman 9cc9c92e75 Fix some of the Errors/warnings detected by checkapi,
make non ASCII char a warning for now.

svn path=/trunk/; revision=25240
2008-05-05 20:38:27 +00:00
Jaap Keuter 098d297303 Running glib 2.16 on 32 bit platform requires this lempar.c change in addition to revision 24710.
Makefiles updated to make new lempar.c effective in build rules.

svn path=/trunk/; revision=24718
2008-03-23 08:58:52 +00:00
Bill Meier 718b14c7ce Glib >= 2.14.5 does not require iconv
svn path=/trunk/; revision=24330
2008-02-14 17:16:12 +00:00
Anders Broman 6fbf8be77d Build with assembler support (NASM).
svn path=/trunk/; revision=23947
2007-12-25 15:55:19 +00:00
Tomas Kukosa ff7c20938e Various changes with focus to startup speedup
The startup timeout on Win32 is reduced to 80% without assembler and to 50% with assembler usage (which is optional)
proto.c
 - do not look up in filed tree and inserts in two steps but do it at once
 - next few small speedups
 - some often called elementary functions can be optionally implemented in assembler
 - dispart some functions to see more exact result from profiling
packet-tpnc.c
 - do not reallocate memory for each filed

svn path=/trunk/; revision=23643
2007-11-28 10:18:16 +00:00
Bill Meier 4644ce7263 Fix Windows maintainer-clean/distclean/clean to recurse thru subdirs only once (instead of worst-case 1+2+3 times)
svn path=/trunk/; revision=23187
2007-10-15 16:44:31 +00:00
Jörg Mayer 094e2a9a5f Get rid of the remains of NET-SNMP in the build process.
svn path=/trunk/; revision=22934
2007-09-24 06:59:40 +00:00
Luis Ontanon ca2683dc8b This was missing
svn path=/trunk/; revision=22679
2007-08-26 23:24:49 +00:00
Guy Harris 71070dd6d8 Treat runlex.sh-generated headers differently from Flex-generated .c
files - for one thing, the former aren't compiled into .o or .obj files.

svn path=/trunk/; revision=22452
2007-08-04 08:04:17 +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 46be54cee3 Add a Makefile.nmake.inc file, to hold rules etc. used by multiple
Makefile.nmake files; currently, it has the (F)lex-to-C rule and a
.SUFFIXES pseudo-rule to add .l to the list of suffixes.  Have
Makefile.nmake files with .l.c rules include Makefile.nmake.inc to get
that rule.

The names Makefile.am.inc and Makefile.nmake.inc aren't necessarily the
right names for the files in question.

Use $(PACKAGE) in the Mate plugin's Makefile, rather than "mate".

svn path=/trunk/; revision=22437
2007-08-01 22:20:38 +00:00
Guy Harris 61dd46fa9c Use a common .l.c rule for running Flex on .l files, just as is done on
UN*X.

svn path=/trunk/; revision=22434
2007-08-01 00:22:25 +00:00
Luis Ontanon ae48b50f17 Windows too needs diam_dict.c
svn path=/trunk/; revision=22320
2007-07-16 06:06:21 +00:00
Gerald Combs f60e81aaac Fix compilation under VS6 (hopefully without breaking compilation
anywhere else).  Instead of using getaddrinfo() and getnameinfo(),
promote inet_pton.c and inet_ntop.c to the top level and use those
routines instead.

(It's 2007, for crying out loud.  Why is this even an issue?)

svn path=/trunk/; revision=22075
2007-06-11 18:26:09 +00:00
Guy Harris 6ea3d47e77 "make maintainer-clean" cleans up everything that "make distclean" does;
there's no need for files in DISTCLEANFILES to be in
MAINTAINERCLEANFILES as well.

In epan, split the generated source files into those that should be
cleaned by "make distclean" and those that shouldn't, and have
DISTCLEANFILES include only the ones that should be cleaned by "make
distclean" and have MAINTAINERCLEANFILES include the ones that shouldn't
be cleaned by "make distclean".  This should fix bug 1595.

The generated source files don't need to be in EXTRA_DIST.

Use LIBWIRESHARK_DISTCLEAN_GENERATED_SRC and
LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC in epan/Makefile.nmake.

svn path=/trunk/; revision=21882
2007-05-22 07:21:12 +00:00
Sebastien Tandel dd7753ab2c 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". Another library is generated from the remaining source
files with the "stop on warning" barrier.


svn path=/trunk/; revision=21813
2007-05-17 17:08:11 +00:00
Ulf Lamping 2f53056ba3 fix manifest error: for dll's mt.exe must be given ;2
svn path=/trunk/; revision=21734
2007-05-09 06:32:52 +00:00
Ulf Lamping 56ddeb6b85 embed the manifest files for the unittest exe's as well
svn path=/trunk/; revision=21697
2007-05-06 09:24:36 +00:00
Ulf Lamping 0abc3ba979 instead of copying the MSVC 2005 manifest files around, embed them into the .exe / .dll files - this way is easier to handle while packaging and alike, and probably will solve some problems. We might want to do this for the plugins as well later.
svn path=/trunk/; revision=21696
2007-05-06 09:17:19 +00:00
Bill Meier 6386eda24c Addt'l fixes so suite-unittests will run under windows
svn path=/trunk/; revision=21546
2007-04-24 03:43:08 +00:00
Richard van der Hoff 674306a87d following advice from Gerald, Graham Bloice, and others, let's try copying the unit test executables into the wireshark-gtk2 directory before running them.
svn path=/trunk/; revision=21472
2007-04-18 22:31:47 +00:00
Bill Meier e6a1e67017 Fix for link commands for exntest.exe, tvbtest.exe and reassemble_test.exe;
(Seems to work using vc6 on Windows XP).

svn path=/trunk/; revision=21400
2007-04-13 01:53:14 +00:00
Richard van der Hoff dae27a8aa6 try linking against user32.lib and wsock32.lib
svn path=/trunk/; revision=21386
2007-04-11 23:20:02 +00:00
Richard van der Hoff 0d6e4649f5 fix typos
svn path=/trunk/; revision=21382
2007-04-11 12:26:02 +00:00
Richard van der Hoff d1f795d28e right; this is going badly.
Let's take a different tack: include only the bare minimum, and set up stubs for everything else.

svn path=/trunk/; revision=21379
2007-04-11 00:22:58 +00:00
Richard van der Hoff e83c397ce3 user32.lib and wsock32.lib shouldn't be make dependencies
svn path=/trunk/; revision=21365
2007-04-10 13:46:33 +00:00
Richard van der Hoff d72a70d653 more libs, more stubs... i'll get there one day
svn path=/trunk/; revision=21363
2007-04-10 11:51:16 +00:00
Richard van der Hoff ecbeb10d7f hrm, we even need dissectors.lib
svn path=/trunk/; revision=21353
2007-04-08 13:33:30 +00:00
Richard van der Hoff bac617e731 another go at making reassemble_test build: give it lots more libraries
svn path=/trunk/; revision=21352
2007-04-08 11:48:59 +00:00
Richard van der Hoff 52727b58b7 link reassemble_test against the right library
svn path=/trunk/; revision=21351
2007-04-07 11:16:46 +00:00
Graham Bloice 85c33a07cb Remove build detritus
svn path=/trunk/; revision=21347
2007-04-06 15:51:36 +00:00
Richard van der Hoff 38142e0e1d Set $(LINK). I swear I'll get there in a minute with this.
svn path=/trunk/; revision=21319
2007-04-03 17:30:02 +00:00
Richard van der Hoff 97bf03e456 hmm, apparently $^ doesn't work for nmake
svn path=/trunk/; revision=21318
2007-04-03 15:48:59 +00:00
Richard van der Hoff 0d949be362 rules for making the unit tests
svn path=/trunk/; revision=21316
2007-04-03 13:24:20 +00:00
Graham Bloice e3f4f4ecb0 Improved cleanup of build artifacts
svn path=/trunk/; revision=21249
2007-03-28 16:32:47 +00:00
Ulf Lamping 5aa4b3cecd remove remaining warnings in epan dir and set the "treat warning as error" barrier
(epan/dissectors still waiting for a cleanup)

svn path=/trunk/; revision=21181
2007-03-25 15:13:03 +00:00
Luis Ontanon 2006fac500 * Add a category param to the uat.
* UATify SNMP Users


svn path=/trunk/; revision=20736
2007-02-07 14:54:35 +00:00
Anders Broman 850563465d Add uat_load.c to the distclean target for generated files.
svn path=/trunk/; revision=20655
2007-01-31 22:35:08 +00:00
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