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/pkcs12 | |
parent | 6142dd287bb03011ee572d01bcf903c81523fd0c (diff) |
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/pkcs12')
-rw-r--r-- | asn1/pkcs12/Makefile.common | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/asn1/pkcs12/Makefile.common b/asn1/pkcs12/Makefile.common index 7bcb22af22..2bf70bd2bc 100644 --- a/asn1/pkcs12/Makefile.common +++ b/asn1/pkcs12/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=pkcs12 -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn @@ -47,16 +43,16 @@ A2W_FLAGS= -b -e # Note the order here is important, cms needs at least x509af-exp to be generated first EXTRA_CNF= \ - ../x509if/x509if-exp.cnf \ - ../x509af/x509af-exp.cnf \ - ../cms/cms-exp.cnf + $(builddir)/../x509if/x509if-exp.cnf \ + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../cms/cms-exp.cnf -../cms/cms-exp.cnf: - (cd ../cms && $(MAKE_CNF_EXPORT)) +$(builddir)/../cms/cms-exp.cnf: + (cd $(builddir)/../cms && $(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)) |