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, 103 insertions, 93 deletions

diff --git a/asn1/x420/Makefile b/asn1/x420/Makefile
deleted file mode 100644
index 0b06e127bc..0000000000
--- a/asn1/x420/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id$
-
-DISSECTOR_FILES=packet-x420.c packet-x420.h
-
-ASN_FILE_LIST=x420.asn ftbp.asn
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(ASN_FILE_LIST) packet-x420-template.c packet-x420-template.h x420.cnf
-	python ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template $(ASN_FILE_LIST) 
-
-clean:
-	rm -f parsetab.py $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-	cp $(DISSECTOR_FILES) ../../epan/dissectors
-
diff --git a/asn1/x420/Makefile.am b/asn1/x420/Makefile.am
new file mode 100644
index 0000000000..a034690647
--- /dev/null
+++ b/asn1/x420/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/x420/Makefile.common b/asn1/x420/Makefile.common
new file mode 100644
index 0000000000..a77db73e40
--- /dev/null
+++ b/asn1/x420/Makefile.common
@@ -0,0 +1,56 @@
+# $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=x420
+
+DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
+	packet-$(PROTOCOL_NAME).h
+
+NEED_PACKET_PROTO_H = 1
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+	$(PROTOCOL_NAME).asn \
+	ftbp.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= \
+	../ftam/ftam-exp.cnf \
+	../x411/x411-exp.cnf \
+	../x509af/x509af-exp.cnf \
+	../x509ce/x509ce-exp.cnf \
+	../acse/acse-exp.cnf
+
diff --git a/asn1/x420/Makefile.nmake b/asn1/x420/Makefile.nmake
index 6c9dd271eb..b3fa922696 100644
--- a/asn1/x420/Makefile.nmake
+++ b/asn1/x420/Makefile.nmake
@@ -1,48 +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=x420
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-
-ASN_FILE_LIST=x420.asn ftbp.asn
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(ASN_FILE_LIST) packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf
-!IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(ASN_FILE_LIST)
-!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/x420/x420-exp.cnf b/asn1/x420/x420-exp.cnf
deleted file mode 100644
index 6a70fb1e17..0000000000
--- a/asn1/x420/x420-exp.cnf
+++ /dev/null
@@ -1,32 +0,0 @@
-# Do not modify this file.
-# It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./x420-exp.cnf
-# ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn ftbp.asn
-
-#.MODULE
-IPMSInformationObjects        x420
-IPMSFileTransferBodyPartType  x420
-#.END
-
-#.IMPORT_TAG
-InformationObject        BER_CLASS_ANY/*choice*/ -1/*choice*/
-IPM                      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-ORDescriptor             BER_CLASS_UNI BER_UNI_TAG_SET
-ExtensionsField          BER_CLASS_UNI BER_UNI_TAG_SET
-MessageParameters        BER_CLASS_UNI BER_UNI_TAG_SET
-IPN                      BER_CLASS_UNI BER_UNI_TAG_SET
-NonReceiptReasonField    BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
-DiscardReasonField       BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
-#.END
-
-#.TYPE_ATTR
-InformationObject        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x420_InformationObject_vals)  BITMASK = 0
-IPM                      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-ORDescriptor             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-ExtensionsField          TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-MessageParameters        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-IPN                      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-NonReceiptReasonField    TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x420_NonReceiptReasonField_vals)  BITMASK = 0
-DiscardReasonField       TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x420_DiscardReasonField_vals)  BITMASK = 0
-#.END
-