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/t124 | |
| 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/t124')
| -rw-r--r-- | asn1/t124/Makefile.am | 2 | ||||
| -rw-r--r-- | asn1/t124/Makefile.common | 9 | ||||
| -rw-r--r-- | asn1/t124/Makefile.nmake | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/asn1/t124/Makefile.am b/asn1/t124/Makefile.am index 462af31e88..33a94fe030 100644 --- a/asn1/t124/Makefile.am +++ b/asn1/t124/Makefile.am @@ -24,3 +24,5 @@ include ../Makefile.preinc include Makefile.common include ../Makefile.inc +MCS-PROTOCOL.asn: ../t125/MCS-PROTOCOL.asn + cp $< $(srcdir)/$@ diff --git a/asn1/t124/Makefile.common b/asn1/t124/Makefile.common index af4c36ebf9..f3996a66bf 100644 --- a/asn1/t124/Makefile.common +++ b/asn1/t124/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=t124 -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = GCC-PROTOCOL.asn MCS-PROTOCOL.asn @@ -45,7 +41,4 @@ SRC_FILES = \ A2W_FLAGS= -EXTRA_CNF= - -MCS-PROTOCOL.asn: ../t125/MCS-PROTOCOL.asn - cp $< $@
\ No newline at end of file +EXTRA_CNF=
\ No newline at end of file diff --git a/asn1/t124/Makefile.nmake b/asn1/t124/Makefile.nmake index 5a32997c60..af53cbc544 100644 --- a/asn1/t124/Makefile.nmake +++ b/asn1/t124/Makefile.nmake @@ -27,3 +27,5 @@ include ../Makefile.preinc.nmake include Makefile.common include ../Makefile.inc.nmake +MCS-PROTOCOL.asn: ../t125/MCS-PROTOCOL.asn + cp $< $@ |