From 0241734801e80681cb423b961cdc5936f306de6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Tue, 9 Oct 2007 19:19:36 +0000 Subject: Last set of changes to convert Makefiles for today svn path=/trunk/; revision=23119 --- asn1/pkixcrmf/Makefile | 16 --------- asn1/pkixcrmf/Makefile.am | 25 +++++++++++++++ asn1/pkixcrmf/Makefile.common | 49 ++++++++++++++++++++++++++++ asn1/pkixcrmf/Makefile.nmake | 62 +++++++++++++---------------------- asn1/pkixcrmf/crmf-exp.cnf | 75 ------------------------------------------- 5 files changed, 96 insertions(+), 131 deletions(-) delete mode 100644 asn1/pkixcrmf/Makefile create mode 100644 asn1/pkixcrmf/Makefile.am create mode 100644 asn1/pkixcrmf/Makefile.common delete mode 100644 asn1/pkixcrmf/crmf-exp.cnf (limited to 'asn1/pkixcrmf') 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 +# 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 +# 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 +# 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 - -- cgit v1.2.3