aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.nmake
AgeCommit message (Collapse)AuthorFilesLines
2011-02-02A bit of Windows makefiles rework and cleanup:Bill Meier1-4/+5
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile; a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS; b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake) (This allows disabling "Warnings as Errors" by just changing config.nmake) c. CVARSDLL definitions (not usage) have been removed from the various makefiles. XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since: -DWIN32 and -DNULL=0 do not appear to be needed (any more); -D_MT and _D_DLL are not needed since /MP causes these definitions. d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled. E.G., 4295: array is too small to include a terminating null character - config.nmake: reformat some long lines for readability; - plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile); - dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ... svn path=/trunk/; revision=35747
2010-11-30Oh yeah, there's a reason we don't put targets in Makefile.common: the first ↵Jeff Morriss1-0/+3
target in a makefile is what you get when you just run make (without a target). Revert 35073 and 35069. svn path=/trunk/; revision=35075
2010-11-29Move some checkapi targets into Makefile.commonJeff Morriss1-3/+0
svn path=/trunk/; revision=35073
2010-10-22If the html dir exist remove it and its subdirectories.Anders Broman1-1/+1
svn path=/trunk/; revision=34614
2010-09-15Revert 34081 and 34093 in preparation for a cleaner fix.Jeff Morriss1-3/+3
svn path=/trunk/; revision=34121
2010-09-10From BBA via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 :Jeff Morriss1-3/+3
Followup to 34081: move libwsutil _all_ the way forward so that our inet_pton is always linked in before wsock32's. This means that our Windows-7 Win64 builds (on which there is a native inet_pton in wsock32) will still work on pre-Vista Win64's. svn path=/trunk/; revision=34093
2010-07-15There shouldn't be any need to build stuff in the top-level directoryGuy Harris1-1/+1
with the Lua or libgnutls flags, as nothing in the top-level directory should use them directly. However, libwireshark *does* require the Lua flags, so use them. svn path=/trunk/; revision=33534
2010-06-01From Kovarththanan Rajaratnam via bug 3500:Gerald Combs1-6/+27
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-05-28Move some code (including the optional objects) into libwsutilJeff Morriss1-27/+4
svn path=/trunk/; revision=33012
2010-04-22Manifests are not needed when building with VC10.Bill Meier1-3/+3
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-03-01Put the object file lists for various test programs into variables, andGuy Harris1-11/+25
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-02-27tvbtest needs bytes_to_str() and bytes_to_str_punct(), and they're nowGuy Harris1-1/+1
in to_str.c. svn path=/trunk/; revision=32040
2010-02-24Add new to_str.o/obj dependency to reassemble_test targetKovarththanan Rajaratnam1-1/+1
svn path=/trunk/; revision=31976
2009-10-11Move make-sminmpec.pl to tools directoryKovarththanan Rajaratnam1-2/+2
svn path=/trunk/; revision=30511
2009-08-27Windows: remove all references to ICONV_DIR, because we use the statically ↵Kovarththanan Rajaratnam1-3/+0
linked win-iconv instead svn path=/trunk/; revision=29580
2009-07-02mkstemp cleanups.Gerald Combs1-5/+0
svn path=/trunk/; revision=28923
2009-04-08Don't assemble asm_utils_win32_x86 on x64. Export a dummy read_keytab_fileGerald Combs1-2/+2
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-08Add another Flex exception.Gerald Combs1-0/+1
svn path=/trunk/; revision=28003
2009-04-08Disable warnings-as-errors for Flex-generated output. Add a couple of gsizeGerald Combs1-2/+8
casts. svn path=/trunk/; revision=28002
2009-03-18Create an "epan/crc" directory for CRC code. Add crc-16-plain.[ch],Gerald Combs1-9/+21
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-02More Windows compiler flag cleanups. Fix a problem with my last commitGerald Combs1-5/+1
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
2008-12-23Add GeoIP to the Windows build. Fix a remaining geoip_ -> geoip_db_Gerald Combs1-1/+2
conversion. svn path=/trunk/; revision=27098
2008-09-16Add /D_BIND_TO_CURRENT_CRT_VERSION=1 to LOCAL_CFLAGS in modern versionsGerald Combs1-1/+1
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-08-21_MSC_VERs 1400 and greater require manifests. Check againstGerald Combs1-4/+4
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-07Add support for the c-ares asynchronous DNS resolution library to theGerald Combs1-3/+5
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-04From Pascal Quantin via bug 2719: Fix support for Microsoft Visual C++ 2008.Gerald Combs1-4/+4
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-07-02Add Makefile.common files for epan/dfilter and epan/ftypes.Guy Harris1-1/+1
Add checkapi rules to Makefile.am files. svn path=/trunk/; revision=25656
2008-07-01Put printf into a separate "termoutput" API group. For most files,Guy Harris1-1/+1
check for it - but not for TShark plugins, as they are expected to print to the standard output. svn path=/trunk/; revision=25653
2008-05-23Set for automatic overwrite for xcopy of mkstemp.c, etcBill Meier1-1/+5
svn path=/trunk/; revision=25356
2008-05-20Use the correct name for libwsutilBill Meier1-1/+1
svn path=/trunk/; revision=25333
2008-05-20Create a new "Wireshark utility" library and move the mpeg-audio stuff fromJeff Morriss1-0/+1
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-05Fix some of the Errors/warnings detected by checkapi,Anders Broman1-0/+2
make non ASCII char a warning for now. svn path=/trunk/; revision=25240
2008-03-23Running glib 2.16 on 32 bit platform requires this lempar.c change in ↵Jaap Keuter1-1/+1
addition to revision 24710. Makefiles updated to make new lempar.c effective in build rules. svn path=/trunk/; revision=24718
2008-02-14Glib >= 2.14.5 does not require iconvBill Meier1-0/+2
svn path=/trunk/; revision=24330
2007-12-25Build with assembler support (NASM).Anders Broman1-1/+1
svn path=/trunk/; revision=23947
2007-11-28Various changes with focus to startup speedupTomas Kukosa1-1/+15
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-10-15Fix Windows maintainer-clean/distclean/clean to recurse thru subdirs only ↵Bill Meier1-4/+9
once (instead of worst-case 1+2+3 times) svn path=/trunk/; revision=23187
2007-09-24Get rid of the remains of NET-SNMP in the build process.Jörg Mayer1-1/+0
svn path=/trunk/; revision=22934
2007-08-26This was missingLuis Ontanon1-1/+2
svn path=/trunk/; revision=22679
2007-08-04Treat runlex.sh-generated headers differently from Flex-generated .cGuy Harris1-1/+3
files - for one thing, the former aren't compiled into .o or .obj files. svn path=/trunk/; revision=22452
2007-08-04Add a script as a front-end for Flex, to work around various problems,Guy Harris1-4/+10
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-01Add a Makefile.nmake.inc file, to hold rules etc. used by multipleGuy Harris1-8/+2
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-01Use a common .l.c rule for running Flex on .l files, just as is done onGuy Harris1-13/+13
UN*X. svn path=/trunk/; revision=22434
2007-07-16Windows too needs diam_dict.c Luis Ontanon1-0/+3
svn path=/trunk/; revision=22320
2007-06-11Fix compilation under VS6 (hopefully without breaking compilationGerald Combs1-0/+7
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-05-22"make maintainer-clean" cleans up everything that "make distclean" does;Guy Harris1-3/+4
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-17Since code generated by lex may trigger gcc warnings, we are now generating twoSebastien Tandel1-1/+1
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-09fix manifest error: for dll's mt.exe must be given ;2Ulf Lamping1-1/+1
svn path=/trunk/; revision=21734
2007-05-06embed the manifest files for the unittest exe's as wellUlf Lamping1-3/+9
svn path=/trunk/; revision=21697
2007-05-06instead of copying the MSVC 2005 manifest files around, embed them into the ↵Ulf Lamping1-0/+4
.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