diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-10-10 02:31:11 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-10-10 02:31:11 +0000 |
| commit | cf012d27b10930edc93ca0e44d2a38e69200169f (patch) | |
| tree | 0c80b13c452cecb6bab14694c1bebf8e49a740a5 /asn1/x721 | |
| parent | 6142dd287bb03011ee572d01bcf903c81523fd0c (diff) | |
| download | wireshark-cf012d27b10930edc93ca0e44d2a38e69200169f.tar.gz wireshark-cf012d27b10930edc93ca0e44d2a38e69200169f.tar.bz2 wireshark-cf012d27b10930edc93ca0e44d2a38e69200169f.zip | |
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
Diffstat (limited to 'asn1/x721')
| -rw-r--r-- | asn1/x721/Makefile.am | 4 | ||||
| -rw-r--r-- | asn1/x721/Makefile.common | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/asn1/x721/Makefile.am b/asn1/x721/Makefile.am index 462af31e88..c179c02a28 100644 --- a/asn1/x721/Makefile.am +++ b/asn1/x721/Makefile.am @@ -19,8 +19,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - include ../Makefile.preinc include Makefile.common -include ../Makefile.inc +# Comment this out to allow 'make all' to work +#include ../Makefile.inc diff --git a/asn1/x721/Makefile.common b/asn1/x721/Makefile.common index 9b4378657e..34777e47e2 100644 --- a/asn1/x721/Makefile.common +++ b/asn1/x721/Makefile.common @@ -22,9 +22,6 @@ #Dummy entry to pass the clean target PROTOCOL_NAME = dummy -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - EXTRA_DIST = \ Attribute-ASN1Module.asn \ ManagedObjectClassesDefinitions.asn \ |