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/x509ce | |
| 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/x509ce')
| -rw-r--r-- | asn1/x509ce/Makefile.common | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/asn1/x509ce/Makefile.common b/asn1/x509ce/Makefile.common index 9fb9146219..ebd14e9a6c 100644 --- a/asn1/x509ce/Makefile.common +++ b/asn1/x509ce/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=x509ce -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = @@ -48,20 +44,20 @@ SRC_FILES = \ A2W_FLAGS= -b -e EXTRA_CNF= \ - ../p1/p1-exp.cnf \ - ../x509af/x509af-exp.cnf \ - ../x509if/x509if-exp.cnf \ - ../x509sat/x509sat-exp.cnf + $(builddir)/../p1/p1-exp.cnf \ + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../x509if/x509if-exp.cnf \ + $(builddir)/../x509sat/x509sat-exp.cnf -../p1/p1-exp.cnf: - (cd ../p1 && $(MAKE_CNF_EXPORT)) +$(builddir)/../p1/p1-exp.cnf: + (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT)) -../x509af/x509af-exp.cnf: - (cd ../x509af && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509af/x509af-exp.cnf: + (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) -../x509if/x509if-exp.cnf: - (cd ../x509if && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509if/x509if-exp.cnf: + (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT)) -../x509sat/x509sat-exp.cnf: - (cd ../x509sat && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509sat/x509sat-exp.cnf: + (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT)) |