diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2007-10-09 19:19:36 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2007-10-09 19:19:36 +0000 |
| commit | 0241734801e80681cb423b961cdc5936f306de6e (patch) | |
| tree | bdfcfc01d110219ae80a2354d6123aa79a7dc5a7 | |
| parent | aaec1d956fd48e349bba4f1a08f6c8582c737747 (diff) | |
Last set of changes to convert Makefiles for today
svn path=/trunk/; revision=23119
36 files changed, 782 insertions, 642 deletions
diff --git a/asn1/Makefile.am b/asn1/Makefile.am index 5c1791e8ec..2ec6cd78a6 100644 --- a/asn1/Makefile.am +++ b/asn1/Makefile.am @@ -22,104 +22,58 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. SUBDIRS = \ - acp133 \ - acse \ + acp133 \ + acse \ ansi_map \ - camel \ - cdt \ - cmip \ - cms \ - dap \ - disp \ - dop \ - dsp \ - ess \ - ftam \ - gnm \ - gsmmap \ - h225 \ - h235 \ - h245 \ - h248 \ - h450 \ + camel \ + cdt \ + cmip \ + cms \ + dap \ + disp \ + dop \ + dsp \ + ess \ + ftam \ + gnm \ + gsmmap \ + h225 \ + h235 \ + h245 \ + h248 \ + h450 \ h450-ros \ - inap \ - ldap \ + inap \ + ldap \ logotype-cert-extn \ - mms \ + mms \ mpeg-audio \ mpeg-pes \ - nbap \ + nbap \ ns-cert-exts \ - ocsp \ - pkcs1 \ - pkcs12 \ - pkinit \ - qsig \ - ranap \ - rnsap \ - rrc \ - rrlp \ - sabp \ - t38 \ + ocsp \ + pkcs1 \ + pkcs12 \ + pkinit \ + pkix1explicit \ + pkix1implicit \ + pkixcmp \ + pkixcrmf \ + pkixproxy \ + pkixqualified \ + pkixtsp \ + pres \ + qsig \ + ranap \ + rnsap \ + rrc \ + rrlp \ + sabp \ + t38 \ ulp EXTRA_DIST = \ Makefile.nmake \ - pkix1explicit/Makefile \ - pkix1explicit/Makefile.nmake \ - pkix1explicit/packet-pkix1explicit-template.c \ - pkix1explicit/packet-pkix1explicit-template.h \ - pkix1explicit/PKIX1EXPLICIT93.asn \ - pkix1explicit/pkix1explicit.cnf \ - pkix1explicit/pkix1explicit_exp.cnf \ - pkix1explicit/pkix1explicit-exp.cnf \ - pkix1implicit/Makefile \ - pkix1implicit/Makefile.nmake \ - pkix1implicit/packet-pkix1implicit-template.c \ - pkix1implicit/packet-pkix1implicit-template.h \ - pkix1implicit/PKIX1IMPLICIT93.asn \ - pkix1implicit/pkix1implicit.cnf \ - pkix1implicit/pkix1implicit_exp.cnf \ - pkix1implicit/pkix1implicit-exp.cnf \ - pkixcmp/CMP.asn \ - pkixcmp/cmp.cnf \ - pkixcmp/cmp-exp.cnf \ - pkixcmp/Makefile \ - pkixcmp/Makefile.nmake \ - pkixcmp/packet-cmp-template.c \ - pkixcmp/packet-cmp-template.h \ - pkixcrmf/CRMF.asn \ - pkixcrmf/crmf.cnf \ - pkixcrmf/crmf-exp.cnf \ - pkixcrmf/Makefile \ - pkixcrmf/Makefile.nmake \ - pkixcrmf/packet-crmf-template.c \ - pkixcrmf/packet-crmf-template.h \ - pkixproxy/Makefile \ - pkixproxy/Makefile.nmake \ - pkixproxy/packet-pkixproxy-template.c \ - pkixproxy/packet-pkixproxy-template.h \ - pkixproxy/PKIXProxy.asn \ - pkixproxy/pkixproxy.cnf \ - pkixqualified/Makefile \ - pkixqualified/Makefile.nmake \ - pkixqualified/packet-pkixqualified-template.c \ - pkixqualified/packet-pkixqualified-template.h \ - pkixqualified/PKIXqualified.asn \ - pkixqualified/pkixqualified.cnf \ - pkixtsp/Makefile \ - pkixtsp/Makefile.nmake \ - pkixtsp/packet-pkixtsp-template.c \ - pkixtsp/packet-pkixtsp-template.h \ - pkixtsp/PKIXTSP.asn \ - pkixtsp/pkixtsp.cnf \ - pres/ISO8823-PRESENTATION.asn \ - pres/Makefile \ - pres/Makefile.nmake \ - pres/packet-pres-template.c \ - pres/packet-pres-template.h \ - pres/pres.cnf \ q932/Addressing-Data-Elements.asn \ q932/Interpretation-component.asn \ q932/Network-Facility-Extension.asn \ diff --git a/asn1/pkix1explicit/Makefile b/asn1/pkix1explicit/Makefile deleted file mode 100644 index 4dc179e2d8..0000000000 --- a/asn1/pkix1explicit/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $Id$ - -DISSECTOR_FILES=packet-pkix1explicit.c packet-pkix1explicit.h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIX1EXPLICIT93.asn packet-pkix1explicit-template.c packet-pkix1explicit-template.h pkix1explicit.cnf - python ../../tools/asn2wrs.py -e -b -X -T -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn - -clean: - rm -f pkix1explicit-exp.cnf parsetab.py $(DISSECTOR_FILES) - -copy_files: generate_dissector - cp $(DISSECTOR_FILES) ../../epan/dissectors diff --git a/asn1/pkix1explicit/Makefile.am b/asn1/pkix1explicit/Makefile.am new file mode 100644 index 0000000000..a034690647 --- /dev/null +++ b/asn1/pkix1explicit/Makefile.am @@ -0,0 +1,25 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# 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.common +include ../Makefile.inc + diff --git a/asn1/pkix1explicit/Makefile.common b/asn1/pkix1explicit/Makefile.common new file mode 100644 index 0000000000..83d1bc1a23 --- /dev/null +++ b/asn1/pkix1explicit/Makefile.common @@ -0,0 +1,49 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +PROTOCOL_NAME=pkix1explicit + +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ + packet-$(PROTOCOL_NAME).h + +NEED_PACKET_PROTO_H = 1 + +EXT_ASN_FILE_LIST = + +ASN_FILE_LIST = PKIX1EXPLICIT93.asn + +# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn +# files do not exist # for all protocols: Please add/remove as required. +EXTRA_DIST = \ + $(ASN_FILE_LIST) \ + packet-$(PROTOCOL_NAME)-template.c \ + packet-$(PROTOCOL_NAME)-template.h \ + $(PROTOCOL_NAME).cnf + +SRC_FILES = \ + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) + +A2W_FLAGS= -e -b + +EXTRA_CNF= + diff --git a/asn1/pkix1explicit/pkix1explicit-exp.cnf b/asn1/pkix1explicit/pkix1explicit-exp.cnf index c167bde3a0..1a60cad1ae 100644 --- a/asn1/pkix1explicit/pkix1explicit-exp.cnf +++ b/asn1/pkix1explicit/pkix1explicit-exp.cnf @@ -1,7 +1,7 @@ # Do not modify this file. # It is created automatically by the ASN.1 to Wireshark dissector compiler # ./pkix1explicit-exp.cnf -# ../../tools/asn2wrs.py -e -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn +# ../../tools/asn2wrs.py -e -b -p pkix1explicit -c ./pkix1explicit.cnf -s ./packet-pkix1explicit-template -D . PKIX1EXPLICIT93.asn #.MODULE PKIX1Explicit93 pkix1explicit diff --git a/asn1/pkix1implicit/Makefile b/asn1/pkix1implicit/Makefile deleted file mode 100644 index 6e11985c59..0000000000 --- a/asn1/pkix1implicit/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $Id$ - -DISSECTOR_FILES=packet-pkix1implicit.c packet-pkix1implicit.h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIX1IMPLICIT93.asn packet-pkix1implicit-template.c packet-pkix1implicit-template.h pkix1implicit.cnf - python ../../tools/asn2wrs.py -e -b -X -T -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn - -clean: - rm -f pkix1implicit-exp.cnf parsetab.py $(DISSECTOR_FILES) - -copy_files: generate_dissector - cp $(DISSECTOR_FILES) ../../epan/dissectors diff --git a/asn1/pkix1implicit/Makefile.am b/asn1/pkix1implicit/Makefile.am new file mode 100644 index 0000000000..a034690647 --- /dev/null +++ b/asn1/pkix1implicit/Makefile.am @@ -0,0 +1,25 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# 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.common +include ../Makefile.inc + diff --git a/asn1/pkix1implicit/Makefile.common b/asn1/pkix1implicit/Makefile.common new file mode 100644 index 0000000000..9b75814136 --- /dev/null +++ b/asn1/pkix1implicit/Makefile.common @@ -0,0 +1,50 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +PROTOCOL_NAME=pkix1implicit + +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ + packet-$(PROTOCOL_NAME).h + +NEED_PACKET_PROTO_H = 1 + +EXT_ASN_FILE_LIST = + +ASN_FILE_LIST = PKIX1IMPLICIT93.asn + +# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn +# files do not exist # for all protocols: Please add/remove as required. +EXTRA_DIST = \ + $(ASN_FILE_LIST) \ + packet-$(PROTOCOL_NAME)-template.c \ + packet-$(PROTOCOL_NAME)-template.h \ + $(PROTOCOL_NAME).cnf \ + pkix1implicit_exp.cnf + +SRC_FILES = \ + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) + +A2W_FLAGS= -e -b + +EXTRA_CNF= + diff --git a/asn1/pkix1implicit/Makefile.nmake b/asn1/pkix1implicit/Makefile.nmake index 5ed0f4153d..b3fa922696 100644 --- a/asn1/pkix1implicit/Makefile.nmake +++ b/asn1/pkix1implicit/Makefile.nmake @@ -1,46 +1,28 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # # $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -include ../../config.nmake - -UNIX2DOS=$(PERL) ../../tools/unix2dos.pl - -PROTOCOL_NAME=pkix1implicit -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIX1IMPLICIT93.asn packet-pkix1implicit-template.c packet-pkix1implicit-template.h pkix1implicit.cnf -!IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -e -b -X -T -p $(PROTOCOL_NAME) -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn -!ELSE - @echo Error: You need Python to use asn2wrs.py - @exit 1 -!ENDIF - -clean: - rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) - -distclean: clean - -maintainer-clean: distclean - -# Fix EOL in generated dissectors. Cygwin's python generates files with -# mixed EOL styles, which can't be commited to the SVN repository. -# Stuff included from template and "cnf" files has "\r\n" on windows, while -# the generated stuff has "\n". - -fix_eol: generate_dissector - move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp - move packet-$(PROTOCOL_NAME).h packet-$(PROTOCOL_NAME).h.tmp - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h - del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp -copy_files: generate_dissector fix_eol - xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y - xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y +include Makefile.common +include ../../config.nmake +include ../Makefile.inc.nmake diff --git a/asn1/pkix1implicit/pkix1implicit-exp.cnf b/asn1/pkix1implicit/pkix1implicit-exp.cnf deleted file mode 100644 index c3c898e0cc..0000000000 --- a/asn1/pkix1implicit/pkix1implicit-exp.cnf +++ /dev/null @@ -1,21 +0,0 @@ -# Do not modify this file. -# It is created automatically by the ASN.1 to Wireshark dissector compiler -# ./pkix1implicit-exp.cnf -# ../../tools/asn2wrs.py -e -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn - -#.MODULE -PKIX1Implicit93 pkix1implicit -#.END - -#.IMPORT_TAG -KeyIdentifier BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING -AuthorityInfoAccessSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -UserNotice BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -#.END - -#.TYPE_ATTR -KeyIdentifier TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 -AuthorityInfoAccessSyntax TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -UserNotice TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -#.END - diff --git a/asn1/pkixcmp/Makefile b/asn1/pkixcmp/Makefile deleted file mode 100644 index bd21be1dd9..0000000000 --- a/asn1/pkixcmp/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $Id$ - -DISSECTOR_FILES=packet-cmp.c packet-cmp.h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py CMP.asn packet-cmp-template.c packet-cmp-template.h cmp.cnf - python ../../tools/asn2wrs.py -b -X -T -e -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn - -clean: - rm -f parsetab.py $(DISSECTOR_FILES) - -copy_files: generate_dissector - cp $(DISSECTOR_FILES) ../../epan/dissectors diff --git a/asn1/pkixcmp/Makefile.am b/asn1/pkixcmp/Makefile.am new file mode 100644 index 0000000000..a034690647 --- /dev/null +++ b/asn1/pkixcmp/Makefile.am @@ -0,0 +1,25 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# 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.common +include ../Makefile.inc + diff --git a/asn1/pkixcmp/Makefile.common b/asn1/pkixcmp/Makefile.common new file mode 100644 index 0000000000..891b036922 --- /dev/null +++ b/asn1/pkixcmp/Makefile.common @@ -0,0 +1,55 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +PROTOCOL_NAME=cmp + +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ + packet-$(PROTOCOL_NAME).h + +NEED_PACKET_PROTO_H = 1 + +EXT_ASN_FILE_LIST = + +ASN_FILE_LIST = CMP.asn + +# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn +# files do not exist # for all protocols: Please add/remove as required. +EXTRA_DIST = \ + $(ASN_FILE_LIST) \ + packet-$(PROTOCOL_NAME)-template.c \ + packet-$(PROTOCOL_NAME)-template.h \ + $(PROTOCOL_NAME).cnf + +SRC_FILES = \ + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) + +A2W_FLAGS= -b -e + +EXTRA_CNF= \ + ../pkix1explicit/pkix1explicit_exp.cnf \ + ../pkix1implicit/pkix1implicit_exp.cnf \ + ../pkixcrmf/crmf-exp.cnf + +../pkixcrmf/crmf-exp.cnf: + (cd ../pkixcrmf && $(MAKE) $(MAKEFLAGS)) + diff --git a/asn1/pkixcmp/cmp-exp.cnf b/asn1/pkixcmp/cmp-exp.cnf deleted file mode 100644 index 0d3611bee7..0000000000 --- a/asn1/pkixcmp/cmp-exp.cnf +++ /dev/null @@ -1,91 +0,0 @@ -# Do not modify this file. -# It is created automatically by the ASN.1 to Wireshark dissector compiler -# ./cmp-exp.cnf -# ../../tools/asn2wrs.py -b -e -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn - -#.MODULE -PKIXCMP cmp -#.END - -#.IMPORT_TAG -CMPCertificate BER_CLASS_ANY/*choice*/ -1/*choice*/ -PKIMessage BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PKIMessages BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PKIHeader BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PKIFreeText BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PKIBody BER_CLASS_ANY/*choice*/ -1/*choice*/ -PKIProtection BER_CLASS_UNI BER_UNI_TAG_BITSTRING -ProtectedPart BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PBMParameter BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -DHBMParameter BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -NestedMessageContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PKIStatus BER_CLASS_UNI BER_UNI_TAG_INTEGER -PKIFailureInfo BER_CLASS_UNI BER_UNI_TAG_BITSTRING -PKIStatusInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -OOBCert BER_CLASS_ANY/*choice*/ -1/*choice*/ -OOBCertHash BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -Challenge BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -POPODecKeyRespContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CertRepMessage BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CertResponse BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CertifiedKeyPair BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CertOrEncCert BER_CLASS_ANY/*choice*/ -1/*choice*/ -KeyRecRepContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -RevReqContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -RevDetails BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -RevRepContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CAKeyUpdAnnContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CertAnnContent BER_CLASS_ANY/*choice*/ -1/*choice*/ -RevAnnContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CRLAnnContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CertConfirmContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CertStatus BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PKIConfirmContent BER_CLASS_UNI BER_UNI_TAG_NULL -InfoTypeAndValue BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -GenMsgContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -ErrorMsgContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PollReqContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PollRepContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -#.END - -#.TYPE_ATTR -CMPCertificate TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(cmp_CMPCertificate_vals) BITMASK = 0 -PKIMessage TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PKIMessages TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -PKIHeader TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PKIFreeText TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -PKIBody TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(cmp_PKIBody_vals) BITMASK = 0 -PKIProtection TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 -ProtectedPart TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PBMParameter TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -DHBMParameter TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -NestedMessageContent TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -PKIStatus TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(cmp_PKIStatus_vals) BITMASK = 0 -PKIFailureInfo TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 -PKIStatusInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -OOBCert TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(cmp_CMPCertificate_vals) BITMASK = 0 -OOBCertHash TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -Challenge TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -POPODecKeyRespContent TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -CertRepMessage TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CertResponse TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CertifiedKeyPair TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CertOrEncCert TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(cmp_CertOrEncCert_vals) BITMASK = 0 -KeyRecRepContent TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -RevReqContent TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -RevDetails TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -RevRepContent TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CAKeyUpdAnnContent TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CertAnnContent TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(cmp_CMPCertificate_vals) BITMASK = 0 -RevAnnContent TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CRLAnnContent TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -CertConfirmContent TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -CertStatus TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PKIConfirmContent TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -InfoTypeAndValue TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -GenMsgContent TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -ErrorMsgContent TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PollReqContent TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -PollRepContent TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -#.END - diff --git a/asn1/pkixcrmf/Makefile b/asn1/pkixcrmf/Makefile deleted file mode 100644 index 3fc2742987..0000000000 --- a/asn1/pkixcrmf/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $Id$ - -DISSECTOR_FILES=packet-crmf.c packet-crmf.h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py CRMF.asn packet-crmf-template.c packet-crmf-template.h crmf.cnf - python ../../tools/asn2wrs.py -b -X -T -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn - -clean: - rm -f parsetab.py $(DISSECTOR_FILES) - -copy_files: generate_dissector - cp $(DISSECTOR_FILES) ../../epan/dissectors diff --git a/asn1/pkixcrmf/Makefile.am b/asn1/pkixcrmf/Makefile.am new file mode 100644 index 0000000000..a034690647 --- /dev/null +++ b/asn1/pkixcrmf/Makefile.am @@ -0,0 +1,25 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# 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.common +include ../Makefile.inc + diff --git a/asn1/pkixcrmf/Makefile.common b/asn1/pkixcrmf/Makefile.common new file mode 100644 index 0000000000..ec502f6568 --- /dev/null +++ b/asn1/pkixcrmf/Makefile.common @@ -0,0 +1,49 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +PROTOCOL_NAME=crmf + +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ + packet-$(PROTOCOL_NAME).h + +NEED_PACKET_PROTO_H = 1 + +EXT_ASN_FILE_LIST = + +ASN_FILE_LIST = CRMF.asn + +# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn +# files do not exist # for all protocols: Please add/remove as required. +EXTRA_DIST = \ + $(ASN_FILE_LIST) \ + packet-$(PROTOCOL_NAME)-template.c \ + packet-$(PROTOCOL_NAME)-template.h \ + $(PROTOCOL_NAME).cnf + +SRC_FILES = \ + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) + +A2W_FLAGS= -b -e + +EXTRA_CNF= + diff --git a/asn1/pkixcrmf/Makefile.nmake b/asn1/pkixcrmf/Makefile.nmake index 7aa239d1e6..b3fa922696 100644 --- a/asn1/pkixcrmf/Makefile.nmake +++ b/asn1/pkixcrmf/Makefile.nmake @@ -1,46 +1,28 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # # $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -include ../../config.nmake - -UNIX2DOS=$(PERL) ../../tools/unix2dos.pl - -PROTOCOL_NAME=crmf -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py CRMF.asn packet-crmf-template.c packet-crmf-template.h crmf.cnf -!IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -b -X -T -e -p $(PROTOCOL_NAME) -c crmf.cnf -s packet-crmf-template CRMF.asn -!ELSE - @echo Error: You need Python to use asn2wrs.py - @exit 1 -!ENDIF - -clean: - rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) - -distclean: clean - -maintainer-clean: distclean - -# Fix EOL in generated dissectors. Cygwin's python generates files with -# mixed EOL styles, which can't be commited to the SVN repository. -# Stuff included from template and "cnf" files has "\r\n" on windows, while -# the generated stuff has "\n". - -fix_eol: generate_dissector - move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp - move packet-$(PROTOCOL_NAME).h packet-$(PROTOCOL_NAME).h.tmp - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h - del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp -copy_files: generate_dissector fix_eol - xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y - xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y +include Makefile.common +include ../../config.nmake +include ../Makefile.inc.nmake diff --git a/asn1/pkixcrmf/crmf-exp.cnf b/asn1/pkixcrmf/crmf-exp.cnf deleted file mode 100644 index 2df5382d8d..0000000000 --- a/asn1/pkixcrmf/crmf-exp.cnf +++ /dev/null @@ -1,75 +0,0 @@ -# Do not modify this file. -# It is created automatically by the ASN.1 to Wireshark dissector compiler -# ./crmf-exp.cnf -# ../../tools/asn2wrs.py -b -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn - -#.MODULE -PKIXCRMF-2005 crmf -#.END - -#.IMPORT_TAG -CertReqMessages BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CertReqMsg BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CertRequest BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CertTemplate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -OptionalValidity BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -Controls BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -AttributeTypeAndValue BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -ProofOfPossession BER_CLASS_ANY/*choice*/ -1/*choice*/ -POPOSigningKey BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -POPOSigningKeyInput BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PKMACValue BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PBMParameter BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -POPOPrivKey BER_CLASS_ANY/*choice*/ -1/*choice*/ -SubsequentMessage BER_CLASS_UNI BER_UNI_TAG_INTEGER -RegToken BER_CLASS_UNI BER_UNI_TAG_UTF8String -Authenticator BER_CLASS_UNI BER_UNI_TAG_UTF8String -PKIPublicationInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -SinglePubInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PKIArchiveOptions BER_CLASS_ANY/*choice*/ -1/*choice*/ -EncryptedKey BER_CLASS_ANY/*choice*/ -1/*choice*/ -EncryptedValue BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -KeyGenParameters BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING -OldCertId BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CertId BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -ProtocolEncrKey BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -UTF8Pairs BER_CLASS_UNI BER_UNI_TAG_UTF8String -CertReq BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -EncKeyWithID BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PrivateKeyInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -Attributes BER_CLASS_UNI BER_UNI_TAG_SET -#.END - -#.TYPE_ATTR -CertReqMessages TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -CertReqMsg TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CertRequest TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CertTemplate TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -OptionalValidity TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -Controls TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -AttributeTypeAndValue TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -ProofOfPossession TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(crmf_ProofOfPossession_vals) BITMASK = 0 -POPOSigningKey TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -POPOSigningKeyInput TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PKMACValue TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PBMParameter TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -POPOPrivKey TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(crmf_POPOPrivKey_vals) BITMASK = 0 -SubsequentMessage TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(crmf_SubsequentMessage_vals) BITMASK = 0 -RegToken TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -Authenticator TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PKIPublicationInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -SinglePubInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PKIArchiveOptions TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(crmf_PKIArchiveOptions_vals) BITMASK = 0 -EncryptedKey TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(crmf_EncryptedKey_vals) BITMASK = 0 -EncryptedValue TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -KeyGenParameters TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 -OldCertId TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CertId TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -ProtocolEncrKey TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -UTF8Pairs TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CertReq TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -EncKeyWithID TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PrivateKeyInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -Attributes TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -#.END - diff --git a/asn1/pkixproxy/Makefile b/asn1/pkixproxy/Makefile deleted file mode 100644 index b153a637c4..0000000000 --- a/asn1/pkixproxy/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $Id$ - -DISSECTOR_FILES=packet-pkixproxy.c packet-pkixproxy.h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIXProxy.asn packet-pkixproxy-template.c packet-pkixproxy-template.h pkixproxy.cnf - python ../../tools/asn2wrs.py -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn - -clean: - rm -f pkix1explicit-exp.cnf parsetab.py $(DISSECTOR_FILES) - -copy_files: generate_dissector - cp $(DISSECTOR_FILES) ../../epan/dissectors diff --git a/asn1/pkixproxy/Makefile.am b/asn1/pkixproxy/Makefile.am new file mode 100644 index 0000000000..a034690647 --- /dev/null +++ b/asn1/pkixproxy/Makefile.am @@ -0,0 +1,25 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# 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.common +include ../Makefile.inc + diff --git a/asn1/pkixproxy/Makefile.common b/asn1/pkixproxy/Makefile.common new file mode 100644 index 0000000000..2117f0ef39 --- /dev/null +++ b/asn1/pkixproxy/Makefile.common @@ -0,0 +1,49 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +PROTOCOL_NAME=pkixproxy + +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ + packet-$(PROTOCOL_NAME).h + +NEED_PACKET_PROTO_H = 1 + +EXT_ASN_FILE_LIST = + +ASN_FILE_LIST = PKIXProxy.asn + +# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn +# files do not exist # for all protocols: Please add/remove as required. +EXTRA_DIST = \ + $(ASN_FILE_LIST) \ + packet-$(PROTOCOL_NAME)-template.c \ + packet-$(PROTOCOL_NAME)-template.h \ + $(PROTOCOL_NAME).cnf + +SRC_FILES = \ + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) + +A2W_FLAGS= -b -e + +EXTRA_CNF= + diff --git a/asn1/pkixproxy/Makefile.nmake b/asn1/pkixproxy/Makefile.nmake index e5380805f1..b3fa922696 100644 --- a/asn1/pkixproxy/Makefile.nmake +++ b/asn1/pkixproxy/Makefile.nmake @@ -1,45 +1,28 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # # $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -include ../../config.nmake - -UNIX2DOS=$(PERL) ../../tools/unix2dos.pl - -PROTOCOL_NAME=pkixproxy -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIXProxy.asn packet-pkixproxy-template.c packet-pkixproxy-template.h pkixproxy.cnf -!IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn -!ELSE - @echo Error: You need Python to use asn2wrs.py - @exit 1 -!ENDIF - -clean: - rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) - -distclean: clean - -maintainer-clean: distclean - -# Fix EOL in generated dissectors. Cygwin's python generates files with -# mixed EOL styles, which can't be commited to the SVN repository. -# Stuff included from template and "cnf" files has "\r\n" on windows, while -# the generated stuff has "\n". -fix_eol: generate_dissector - move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp - move packet-$(PROTOCOL_NAME).h packet-$(PROTOCOL_NAME).h.tmp - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h - del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp +include Makefile.common +include ../../config.nmake +include ../Makefile.inc.nmake -copy_files: generate_dissector fix_eol - xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y - xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y diff --git a/asn1/pkixqualified/Makefile b/asn1/pkixqualified/Makefile deleted file mode 100644 index 0c4bd75bf0..0000000000 --- a/asn1/pkixqualified/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $Id$ - -DISSECTOR_FILES=packet-pkixqualified.c packet-pkixqualified.h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIXqualified.asn packet-pkixqualified-template.c packet-pkixqualified-template.h pkixqualified.cnf - python ../../tools/asn2wrs.py -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn - -clean: - rm -f parsetab.py $(DISSECTOR_FILES) - -copy_files: generate_dissector - cp $(DISSECTOR_FILES) ../../epan/dissectors diff --git a/asn1/pkixqualified/Makefile.am b/asn1/pkixqualified/Makefile.am new file mode 100644 index 0000000000..a034690647 --- /dev/null +++ b/asn1/pkixqualified/Makefile.am @@ -0,0 +1,25 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# 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.common +include ../Makefile.inc + diff --git a/asn1/pkixqualified/Makefile.common b/asn1/pkixqualified/Makefile.common new file mode 100644 index 0000000000..da7244ea90 --- /dev/null +++ b/asn1/pkixqualified/Makefile.common @@ -0,0 +1,49 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +PROTOCOL_NAME=pkixqualified + +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ + packet-$(PROTOCOL_NAME).h + +NEED_PACKET_PROTO_H = 1 + +EXT_ASN_FILE_LIST = + +ASN_FILE_LIST = PKIXqualified.asn + +# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn +# files do not exist # for all protocols: Please add/remove as required. +EXTRA_DIST = \ + $(ASN_FILE_LIST) \ + packet-$(PROTOCOL_NAME)-template.c \ + packet-$(PROTOCOL_NAME)-template.h \ + $(PROTOCOL_NAME).cnf + +SRC_FILES = \ + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) + +A2W_FLAGS= -b -e + +EXTRA_CNF= + diff --git a/asn1/pkixqualified/Makefile.nmake b/asn1/pkixqualified/Makefile.nmake index 23dd95ae85..b3fa922696 100644 --- a/asn1/pkixqualified/Makefile.nmake +++ b/asn1/pkixqualified/Makefile.nmake @@ -1,45 +1,28 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # # $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -include ../../config.nmake - -UNIX2DOS=$(PERL) ../../tools/unix2dos.pl - -PROTOCOL_NAME=pkixqualified -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIXqualified.asn packet-pkixqualified-template.c packet-pkixqualified-template.h pkixqualified.cnf -!IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn -!ELSE - @echo Error: You need Python to use asn2wrs.py - @exit 1 -!ENDIF - -clean: - rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) - -distclean: clean - -maintainer-clean: distclean - -# Fix EOL in generated dissectors. Cygwin's python generates files with -# mixed EOL styles, which can't be commited to the SVN repository. -# Stuff included from template and "cnf" files has "\r\n" on windows, while -# the generated stuff has "\n". -fix_eol: generate_dissector - move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp - move packet-$(PROTOCOL_NAME).h packet-$(PROTOCOL_NAME).h.tmp - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h - del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp +include Makefile.common +include ../../config.nmake +include ../Makefile.inc.nmake -copy_files: generate_dissector fix_eol - xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y - xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y diff --git a/asn1/pkixtsp/Makefile b/asn1/pkixtsp/Makefile deleted file mode 100644 index 43961ee72b..0000000000 --- a/asn1/pkixtsp/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $Id$ - -DISSECTOR_FILES=packet-pkixtsp.c packet-pkixtsp.h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIXTSP.asn packet-pkixtsp-template.c packet-pkixtsp-template.h pkixtsp.cnf - python ../../tools/asn2wrs.py -b -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn - -clean: - rm -f parsetab.py $(DISSECTOR_FILES) - -copy_files: generate_dissector - cp $(DISSECTOR_FILES) ../../epan/dissectors diff --git a/asn1/pkixtsp/Makefile.am b/asn1/pkixtsp/Makefile.am new file mode 100644 index 0000000000..a034690647 --- /dev/null +++ b/asn1/pkixtsp/Makefile.am @@ -0,0 +1,25 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# 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.common +include ../Makefile.inc + diff --git a/asn1/pkixtsp/Makefile.common b/asn1/pkixtsp/Makefile.common new file mode 100644 index 0000000000..67a392fd06 --- /dev/null +++ b/asn1/pkixtsp/Makefile.common @@ -0,0 +1,49 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +PROTOCOL_NAME=pkixtsp + +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ + packet-$(PROTOCOL_NAME).h + +NEED_PACKET_PROTO_H = 1 + +EXT_ASN_FILE_LIST = + +ASN_FILE_LIST = PKIXTSP.asn + +# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn +# files do not exist # for all protocols: Please add/remove as required. +EXTRA_DIST = \ + $(ASN_FILE_LIST) \ + packet-$(PROTOCOL_NAME)-template.c \ + packet-$(PROTOCOL_NAME)-template.h \ + $(PROTOCOL_NAME).cnf + +SRC_FILES = \ + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) + +A2W_FLAGS= -b -e + +EXTRA_CNF= + diff --git a/asn1/pkixtsp/Makefile.nmake b/asn1/pkixtsp/Makefile.nmake index 7dde941fa4..b3fa922696 100644 --- a/asn1/pkixtsp/Makefile.nmake +++ b/asn1/pkixtsp/Makefile.nmake @@ -1,45 +1,28 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # # $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -include ../../config.nmake - -UNIX2DOS=$(PERL) ../../tools/unix2dos.pl - -PROTOCOL_NAME=pkixtsp -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIXTSP.asn packet-pkixtsp-template.c packet-pkixtsp-template.h pkixtsp.cnf -!IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn -!ELSE - @echo Error: You need Python to use asn2wrs.py - @exit 1 -!ENDIF - -clean: - rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) - -distclean: clean - -maintainer-clean: distclean - -# Fix EOL in generated dissectors. Cygwin's python generates files with -# mixed EOL styles, which can't be commited to the SVN repository. -# Stuff included from template and "cnf" files has "\r\n" on windows, while -# the generated stuff has "\n". -fix_eol: generate_dissector - move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp - move packet-$(PROTOCOL_NAME).h packet-$(PROTOCOL_NAME).h.tmp - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h - del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp +include Makefile.common +include ../../config.nmake +include ../Makefile.inc.nmake -copy_files: generate_dissector fix_eol - xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y - xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y diff --git a/asn1/pres/Makefile b/asn1/pres/Makefile deleted file mode 100644 index b67352d578..0000000000 --- a/asn1/pres/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $Id$ - -DISSECTOR_FILES=packet-pres.c packet-pres.h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py ISO8823-PRESENTATION.asn packet-pres-template.c packet-pres-template.h pres.cnf - python ../../tools/asn2wrs.py -b -e -p pres -c pres.cnf -s packet-pres-template ISO8823-PRESENTATION.asn - -clean: - rm -f parsetab.py $(DISSECTOR_FILES) - -copy_files: generate_dissector - cp $(DISSECTOR_FILES) ../../epan/dissectors - diff --git a/asn1/pres/Makefile.am b/asn1/pres/Makefile.am new file mode 100644 index 0000000000..a034690647 --- /dev/null +++ b/asn1/pres/Makefile.am @@ -0,0 +1,25 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# 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.common +include ../Makefile.inc + diff --git a/asn1/pres/Makefile.common b/asn1/pres/Makefile.common new file mode 100644 index 0000000000..02b80790cb --- /dev/null +++ b/asn1/pres/Makefile.common @@ -0,0 +1,49 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +PROTOCOL_NAME=pres + +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ + packet-$(PROTOCOL_NAME).h + +NEED_PACKET_PROTO_H = 1 + +EXT_ASN_FILE_LIST = + +ASN_FILE_LIST = ISO8823-PRESENTATION.asn + +# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn +# files do not exist # for all protocols: Please add/remove as required. +EXTRA_DIST = \ + $(ASN_FILE_LIST) \ + packet-$(PROTOCOL_NAME)-template.c \ + packet-$(PROTOCOL_NAME)-template.h \ + $(PROTOCOL_NAME).cnf + +SRC_FILES = \ + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) + +A2W_FLAGS= -b -e + +EXTRA_CNF= + diff --git a/asn1/pres/Makefile.nmake b/asn1/pres/Makefile.nmake index 2598ca0461..b3fa922696 100644 --- a/asn1/pres/Makefile.nmake +++ b/asn1/pres/Makefile.nmake @@ -1,46 +1,28 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # # $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -include ../../config.nmake - -UNIX2DOS=$(PERL) ../../tools/unix2dos.pl - -PROTOCOL_NAME=pres -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py ISO8823-PRESENTATION.asn packet-pres-template.c packet-pres-template.h pres.cnf -!IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c pres.cnf -s packet-pres-template ISO8823-PRESENTATION.asn -!ELSE - @echo Error: You need Python to use asn2wrs.py - @exit 1 -!ENDIF - -clean: - rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) - -distclean: clean - -maintainer-clean: distclean - -# Fix EOL in generated dissectors. Cygwin's python generates files with -# mixed EOL styles, which can't be commited to the SVN repository. -# Stuff included from template and "cnf" files has "\r\n" on windows, while -# the generated stuff has "\n". - -fix_eol: generate_dissector - move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp - move packet-$(PROTOCOL_NAME).h packet-$(PROTOCOL_NAME).h.tmp - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h - del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp -copy_files: generate_dissector fix_eol - xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y - xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y +include Makefile.common +include ../../config.nmake +include ../Makefile.inc.nmake diff --git a/configure.in b/configure.in index 4a1d5c2653..81c29e8f97 100644 --- a/configure.in +++ b/configure.in @@ -1504,6 +1504,14 @@ AC_OUTPUT( asn1/pkcs1/Makefile asn1/pkcs12/Makefile asn1/pkinit/Makefile + asn1/pkix1explicit/Makefile + asn1/pkix1implicit/Makefile + asn1/pkixcmp/Makefile + asn1/pkixcrmf/Makefile + asn1/pkixproxy/Makefile + asn1/pkixqualified/Makefile + asn1/pkixtsp/Makefile + asn1/pres/Makefile asn1/qsig/Makefile asn1/ranap/Makefile asn1/rnsap/Makefile |