Commit Graph

28 Commits

Author SHA1 Message Date
Роман Донченко dc748b1e7f Now that Python is mandatory on Windows, remove checks for it from nmakefiles
Change-Id: I2ca6abb372ec4bda0af1aa40089082533a61df3a
Reviewed-on: https://code.wireshark.org/review/3392
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-09 20:23:39 +00:00
Jeff Morriss 8c608e6e82 Remove $Id$ from the ASN.1 dissectors and regenerate them.
Change-Id: Ie476c6f82f318188b41ed922b92c6fec119ea954
Reviewed-on: https://code.wireshark.org/review/244
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-18 03:05:28 +00:00
Jörg Mayer 6883f691c7 Add the dependeny handling for windows builds as well
svn path=/trunk/; revision=52134
2013-09-18 03:31:03 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Jeff Morriss 17f77e0597 Build generate_export when building 'all' on Windows too.
svn path=/trunk/; revision=39423
2011-10-14 13:26:32 +00:00
Jeff Morriss b21b495f9f Don't generate the conformance file for exported types when building the
dissector; instead built it only when the separate target (generate_export)
is built.

Built generate_export when building "all".

This prevents the exp_*.cnf files from being regenerated each time another one
of the exp_*.cnf files (which the current dissector depends on) has changed
(despite the fact that the exported types does not depe

Also fix the CLEANFILES definition so it actually cleans things.

svn path=/trunk/; revision=39421
2011-10-14 10:22:01 +00:00
Jeff Morriss 56a684a625 Fix ASN.1 dissector generation on Windows.
svn path=/trunk/; revision=39337
2011-10-10 14:54:12 +00:00
Jeff Morriss b9c974071c Fix a typo
svn path=/trunk/; revision=39336
2011-10-10 12:54:27 +00:00
Jeff Morriss 454555d42b Don't remove the ASN.1 dissectors when cleaning: we don't (re)build them during the make process yet.
svn path=/trunk/; revision=39335
2011-10-10 12:52:53 +00:00
Jeff Morriss cf012d27b1 Build the ASN.1 dissectors directly into epan/dissectors (rather than building
them and then copying them over).  The "all" target to builds these dissectors
now (instead of "generate_files" and/or "copy_files").

asn2wrs's "-O" option now means "the dissector goes in this directory" (rather
than "all output goes in this directory"); it also means that the "-s" (single
output file) option is now required.

Fix things up so that it's possible to build all of the ASN.1 dissectors in
one shot.

Fix building of conformance files when doing out-of-source-tree builds.


Unfortunately "make all" in the asn1 directory always builds something--I think
because of circular depedencies.

svn path=/trunk/; revision=39333
2011-10-10 02:31:11 +00:00
Bill Meier 0db7ad2404 Modify 'compare_files' target: ignore #line changes; compare from epan\dissectors to asn1\...
svn path=/trunk/; revision=34901
2010-11-16 15:24:51 +00:00
Bill Meier cb1025cfdc Enhance Windows ASN1 Makefiles:
1. Implement a 'compare_files' target which can be used when generating
   an individual ASN1 dissector. This generates the dissector and 
   then compares the generated .[hc] files with apn\dissectors (rather than
   copying the files to epan\dissectors).
2. Rework asn1\Makefile.nmake to provide additional targets for
   use when building all the ASN1 dissectors.
   - compare_files
   - generate_dissectors [generate but don't copy]

svn path=/trunk/; revision=32484
2010-04-15 22:44:02 +00:00
Gerald Combs 6cd62e9e65 Rename README.win32 to README.windows and add a 64-bit download link.
Add tools/textify.sh, which makes a Notepad-clickable copy of a text
file. Use it for COPYING, NEWS, README, README.windows, and help/*.txt.

Remove tools/unix2dos.pl and use Cygwin's u2d instead.

svn path=/trunk/; revision=32440
2010-04-09 21:42:51 +00:00
Kovarththanan Rajaratnam ced157e4b7 Make sure that we pass on the same set of parameters to asn2wrs.py on Unix/Windows. This fix ensures that the generated copyright headers are identical on both platforms.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3658

svn path=/trunk/; revision=29336
2009-08-08 09:57:07 +00:00
Anders Broman 67986a1a5f From Pascal Quantin:
Fix building of packet-gsm_map.c and packet-gsm_map.h files.

svn path=/trunk/; revision=26782
2008-11-15 14:39:04 +00:00
Tomas Kukosa 558cd94b74 move 'all: generate_dissector' rule from Makefile.inc.nmake to Makefile.preinc.nmake to be the 1st one in the resulting makefile
svn path=/trunk/; revision=23319
2007-10-31 09:22:56 +00:00
Jörg Mayer c2d0c8fa31 - Fix svn:ignore for all directories
- gsmmap: uncomment -s option in gsmmap.cnf
- Fix cyclic dependencies:
  + Remove EXPORT_CNF from dependencies for cnf files
  + Replace all INCLUDE ...-exp.cnf with IMPORT ...-exp.cnf

svn path=/trunk/; revision=23202
2007-10-16 13:59:40 +00:00
Tomas Kukosa cbffbc775d use the -E asn2wrs option to create exported cnf file
svn path=/trunk/; revision=23182
2007-10-15 12:21:30 +00:00
Tomas Kukosa 1b04a660e5 next step to solve dependency generation
svn path=/trunk/; revision=23130
2007-10-10 08:42:19 +00:00
Jörg Mayer 24470fdfae More conversions and updates to existing Makefile stuff
svn path=/trunk/; revision=23127
2007-10-10 08:09:19 +00:00
Guy Harris d17e4e3ad9 Just check whether NEED_PACKET_PROTO_H is defined at all.
svn path=/trunk/; revision=23123
2007-10-09 22:54:29 +00:00
Jörg Mayer 6168303813 Swap order of external and local sources
svn path=/trunk/; revision=23084
2007-10-07 20:11:09 +00:00
Gerald Combs 931b03d691 In the various Makefiles, remove checks for NO_PROTO_OPT and allow PROT_OPT
to be overridden further up the chain, e.g. in Makefile.common

svn path=/trunk/; revision=23076
2007-10-05 21:38:59 +00:00
Tomas Kukosa 876fd4db5d allow to omit -p <proto> option
svn path=/trunk/; revision=23070
2007-10-05 07:46:06 +00:00
Ulf Lamping 4d4c9a4d34 fix a typo in the source files target, took me more than an hour to find it :-(((
svn path=/trunk/; revision=22963
2007-09-25 19:52:51 +00:00
Jörg Mayer 548b224e28 Change some additional protocols to the new build system
svn path=/trunk/; revision=22958
2007-09-25 18:02:49 +00:00
Tomas Kukosa 30de0aadf2 put few simple ASN.1 dissectors into the new makefile structure
svn path=/trunk/; revision=22951
2007-09-25 11:58:35 +00:00
Jörg Mayer 3b3f182b99 - Rework the Makefile structure to generate external -cnf files
a protocol depends on.
- Make sure we need to add asn files to only 1 Makefile instead
   of 3 (Makefile, Makefile.nmake, ../Makefile.am)
- Change the Makefiles of the camel protocol to use the new structure.

svn path=/trunk/; revision=22950
2007-09-25 10:30:55 +00:00