Finish conversion (well, almost, need to add the

generation stuff to the x.../Makefile.common.
I love circular dependencies.

svn path=/trunk/; revision=23138

5 files changed, 100 insertions, 175 deletions

diff --git a/asn1/x509ce/Makefile b/asn1/x509ce/Makefile
deleted file mode 100644
index ecd97490d8..0000000000
--- a/asn1/x509ce/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $Id$
-
-DISSECTOR_FILES=packet-x509ce.c packet-x509ce.h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py CertificateExtensions.asn packet-x509ce-template.c packet-x509ce-template.h x509ce.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509af/x509af-exp.cnf
-	python ../../tools/asn2wrs.py -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn
-
-clean:
-	rm -f parsetab.py $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-	cp $(DISSECTOR_FILES) ../../epan/dissectors
diff --git a/asn1/x509ce/Makefile.am b/asn1/x509ce/Makefile.am
new file mode 100644
index 0000000000..a034690647
--- /dev/null
+++ b/asn1/x509ce/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/x509ce/Makefile.common b/asn1/x509ce/Makefile.common
new file mode 100644
index 0000000000..cec0a12795
--- /dev/null
+++ b/asn1/x509ce/Makefile.common
@@ -0,0 +1,53 @@
+# $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=x509ce
+
+DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
+	packet-$(PROTOCOL_NAME).h
+
+NEED_PACKET_PROTO_H = 1
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = CertificateExtensions.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= \
+	../x509if/x509if-exp.cnf \
+	../x509af/x509af-exp.cnf \
+	../x509sat/x509sat-exp.cnf \
+	../x411/x411-exp.cnf
+
diff --git a/asn1/x509ce/Makefile.nmake b/asn1/x509ce/Makefile.nmake
index 43b3e4b400..b3fa922696 100644
--- a/asn1/x509ce/Makefile.nmake
+++ b/asn1/x509ce/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=x509ce
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py CertificateExtensions.asn packet-x509ce-template.c packet-x509ce-template.h x509ce.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509af/x509af-exp.cnf
-!IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.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/x509ce/x509ce-exp.cnf b/asn1/x509ce/x509ce-exp.cnf
deleted file mode 100644
index 147a278d18..0000000000
--- a/asn1/x509ce/x509ce-exp.cnf
+++ /dev/null
@@ -1,119 +0,0 @@
-# Do not modify this file.
-# It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./x509ce-exp.cnf
-# ../../tools/asn2wrs.py -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn
-
-#.MODULE
-CertificateExtensions  x509ce
-#.END
-
-#.IMPORT_TAG
-AuthorityKeyIdentifier   BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-KeyIdentifier            BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING
-SubjectKeyIdentifier     BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING
-KeyUsage                 BER_CLASS_UNI BER_UNI_TAG_BITSTRING
-KeyPurposeIDs            BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-KeyPurposeId             BER_CLASS_UNI BER_UNI_TAG_OID
-PrivateKeyUsagePeriod    BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CertificatePoliciesSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-PolicyInformation        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-PolicyQualifierInfo      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-PolicyMappingsSyntax     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-GeneralNames             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-GeneralName              BER_CLASS_ANY/*choice*/ -1/*choice*/
-EDIPartyName             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AttributesSyntax         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-BasicConstraintsSyntax   BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-NameConstraintsSyntax    BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-GeneralSubtrees          BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-GeneralSubtree           BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-BaseDistance             BER_CLASS_UNI BER_UNI_TAG_INTEGER
-PolicyConstraintsSyntax  BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-SkipCerts                BER_CLASS_UNI BER_UNI_TAG_INTEGER
-CRLNumber                BER_CLASS_UNI BER_UNI_TAG_INTEGER
-CRLReason                BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
-HoldInstruction          BER_CLASS_UNI BER_UNI_TAG_OID
-CRLScopeSyntax           BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-PerAuthorityScope        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-OnlyCertificateTypes     BER_CLASS_UNI BER_UNI_TAG_BITSTRING
-NumberRange              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-BaseRevocationInfo       BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-StatusReferrals          BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-StatusReferral           BER_CLASS_ANY/*choice*/ -1/*choice*/
-CRLReferral              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-DeltaRefInfo             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CRLStreamIdentifier      BER_CLASS_UNI BER_UNI_TAG_INTEGER
-OrderedListSyntax        BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
-DeltaInformation         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CRLDistPointsSyntax      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-DistributionPoint        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-DistributionPointName    BER_CLASS_ANY/*choice*/ -1/*choice*/
-ReasonFlags              BER_CLASS_UNI BER_UNI_TAG_BITSTRING
-IssuingDistPointSyntax   BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-BaseCRLNumber            BER_CLASS_UNI BER_UNI_TAG_INTEGER
-CertificateExactAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CertificateAssertion     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AltNameType              BER_CLASS_ANY/*choice*/ -1/*choice*/
-CertPolicySet            BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CertificatePairExactAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CertificatePairAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CertificateListExactAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CertificateListAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-PkiPathMatchSyntax       BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-#.END
-
-#.TYPE_ATTR
-AuthorityKeyIdentifier   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-KeyIdentifier            TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
-SubjectKeyIdentifier     TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
-KeyUsage                 TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
-KeyPurposeIDs            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-KeyPurposeId             TYPE = FT_OID     DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-PrivateKeyUsagePeriod    TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-CertificatePoliciesSyntax TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-PolicyInformation        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-PolicyQualifierInfo      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-PolicyMappingsSyntax     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-GeneralNames             TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-GeneralName              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509ce_GeneralName_vals)  BITMASK = 0
-EDIPartyName             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AttributesSyntax         TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-BasicConstraintsSyntax   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-NameConstraintsSyntax    TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-GeneralSubtrees          TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-GeneralSubtree           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-BaseDistance             TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-PolicyConstraintsSyntax  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-SkipCerts                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-CRLNumber                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-CRLReason                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509ce_CRLReason_vals)  BITMASK = 0
-HoldInstruction          TYPE = FT_OID     DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-CRLScopeSyntax           TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-PerAuthorityScope        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-OnlyCertificateTypes     TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
-NumberRange              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-BaseRevocationInfo       TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-StatusReferrals          TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-StatusReferral           TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509ce_StatusReferral_vals)  BITMASK = 0
-CRLReferral              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-DeltaRefInfo             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-CRLStreamIdentifier      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-OrderedListSyntax        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509ce_OrderedListSyntax_vals)  BITMASK = 0
-DeltaInformation         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-CRLDistPointsSyntax      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-DistributionPoint        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-DistributionPointName    TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509ce_DistributionPointName_vals)  BITMASK = 0
-ReasonFlags              TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
-IssuingDistPointSyntax   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-BaseCRLNumber            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-CertificateExactAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-CertificateAssertion     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AltNameType              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509ce_AltNameType_vals)  BITMASK = 0
-CertPolicySet            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-CertificatePairExactAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-CertificatePairAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-CertificateListExactAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-CertificateListAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-PkiPathMatchSyntax       TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-#.END
-