Commit Graph

24 Commits

Author SHA1 Message Date
Guy Harris 8a2d50951b Not sure why there's a \ before the EOL there, but it's causing a
warning from the source-lines-of-code script, so....

svn path=/trunk/; revision=42021
2012-04-11 07:56:00 +00:00
Balint Reczey 333bc8f123 Don't hardcode 'python' for asn2wrs
svn path=/trunk/; revision=39981
2011-11-22 00:11:56 +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 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
Stig Bjørlykke f3f13f36b5 Added a "all" target to rebuild all asn1 dissectors.
Currently this fails for kerberos and x721, because they shall not be build.
Maybe we should add some sort of disable build for them.

svn path=/trunk/; revision=34734
2010-10-31 12:26:15 +00:00
Jeff Morriss 9d96012b57 From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5150 : remove Makefile.in from the asn1 directories when doing a maintainer-clean
svn path=/trunk/; revision=33955
2010-08-27 18:36:01 +00:00
Kovarththanan Rajaratnam ffc3be50ef Sort filename expansion
svn path=/trunk/; revision=33381
2010-06-30 05:37:34 +00:00
Jörg Mayer bbc3a702c5 Don't generate dissectors on top level make.
svn path=/trunk/; revision=23203
2007-10-16 14:09:33 +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 e23dc22c4c comment out EXPORT_FILES till some automake expert can look at it
svn path=/trunk/; revision=23186
2007-10-15 14:21:35 +00:00
Tomas Kukosa 8777babaa8 fix ifdef/endif bug
svn path=/trunk/; revision=23185
2007-10-15 14:04:55 +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 99dc7c4acd Fix order of external files (without affecting other protos).
svn path=/trunk/; revision=23121
2007-10-09 19:40:59 +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
Richard van der Hoff 251835ec37 hopefully this will do what Thomas wants for NO_PROTO_OPT
svn path=/trunk/; revision=23074
2007-10-05 14:45:21 +00:00
Tomas Kukosa d0ae8baa7c next fix of my mistake :(
svn path=/trunk/; revision=23073
2007-10-05 11:15:00 +00:00
Tomas Kukosa 1da499a6dc comment out some lines till I learn how to write Linux makefile
svn path=/trunk/; revision=23072
2007-10-05 10:38:30 +00:00
Tomas Kukosa 5b4d99b4d1 try to fix Linux makefile
svn path=/trunk/; revision=23071
2007-10-05 09:08:57 +00:00
Tomas Kukosa 876fd4db5d allow to omit -p <proto> option
svn path=/trunk/; revision=23070
2007-10-05 07:46:06 +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
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