Finish conversion (well, almost, need to add the

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

svn path=/trunk/; revision=23138

37 files changed, 765 insertions, 826 deletions

diff --git a/asn1/Makefile.am b/asn1/Makefile.am
index c2f0d28a08..5efcb83467 100644
--- a/asn1/Makefile.am
+++ b/asn1/Makefile.am
@@ -82,59 +82,18 @@ SUBDIRS = \
 	spnego		\
 	t38		\
 	tcap		\
-	ulp
+	ulp		\
+	wlancertextn	\
+	x411		\
+	x420		\
+	x509af		\
+	x509ce		\
+	x509if		\
+	x509sat		\
+	x721
 
 EXTRA_DIST = \
-	Makefile.nmake	\
-	wlancertextn/Makefile	\
-	wlancertextn/Makefile.nmake	\
-	wlancertextn/packet-wlancertextn-template.c	\
-	wlancertextn/packet-wlancertextn-template.h	\
-	wlancertextn/WLANCERTEXTN.asn	\
-	wlancertextn/wlancertextn.cnf	\
-	x411/Makefile	\
-	x411/Makefile.nmake	\
-	x411/packet-x411-template.c	\
-	x411/packet-x411-template.h	\
-	x411/x411.asn	\
-	x411/x411.cnf	\
-	x411/x411-exp.cnf	\
-	x420/Makefile	\
-	x420/Makefile.nmake	\
-	x420/packet-x420-template.c	\
-	x420/packet-x420-template.h	\
-	x420/x420.asn	\
-	x420/ftbp.asn	\
-	x420/x420.cnf	\
-	x420/x420-exp.cnf	\
-	x509af/AuthenticationFramework.asn	\
-	x509af/Makefile	\
-	x509af/Makefile.nmake	\
-	x509af/packet-x509af-template.c	\
-	x509af/packet-x509af-template.h	\
-	x509af/x509af.cnf	\
-	x509af/x509af-exp.cnf	\
-	x509ce/CertificateExtensions.asn	\
-	x509ce/Makefile	\
-	x509ce/Makefile.nmake	\
-	x509ce/packet-x509ce-template.c	\
-	x509ce/packet-x509ce-template.h	\
-	x509ce/x509ce.cnf	\
-	x509ce/x509ce-exp.cnf	\
-	x509if/InformationFramework.asn	\
-	x509if/Makefile	\
-	x509if/Makefile.nmake	\
-	x509if/packet-x509if-template.c	\
-	x509if/packet-x509if-template.h	\
-	x509if/x509if.cnf	\
-	x509if/x509if-exp.cnf	\
-	x509sat/Makefile	\
-	x509sat/Makefile.nmake	\
-	x509sat/packet-x509sat-template.c	\
-	x509sat/packet-x509sat-template.h	\
-	x509sat/SelectedAttributeTypes.asn	\
-	x509sat/x509sat.cnf	\
-	x509sat/x509sat-exp.cnf
+	Makefile.nmake
 
 MAINTAINERCLEANFILES = \
 	Makefile.in
diff --git a/asn1/wlancertextn/Makefile b/asn1/wlancertextn/Makefile
deleted file mode 100644
index 777cad46ed..0000000000
--- a/asn1/wlancertextn/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $Id$
-
-DISSECTOR_FILES=packet-wlancertextn.c packet-wlancertextn.h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py WLANCERTEXTN.asn packet-wlancertextn-template.c packet-wlancertextn-template.h wlancertextn.cnf
-	python ../../tools/asn2wrs.py -b -e -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn
-
-clean:
-	rm -f parsetab.py $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-	cp $(DISSECTOR_FILES) ../../epan/dissectors
diff --git a/asn1/wlancertextn/Makefile.am b/asn1/wlancertextn/Makefile.am
new file mode 100644
index 0000000000..a034690647
--- /dev/null
+++ b/asn1/wlancertextn/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/wlancertextn/Makefile.common b/asn1/wlancertextn/Makefile.common
new file mode 100644
index 0000000000..5a6067389b
--- /dev/null
+++ b/asn1/wlancertextn/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=wlancertextn
+
+DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
+	packet-$(PROTOCOL_NAME).h
+
+NEED_PACKET_PROTO_H = 1
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = WLANCERTEXTN.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/wlancertextn/Makefile.nmake b/asn1/wlancertextn/Makefile.nmake
index 7dc430ce9c..b3fa922696 100644
--- a/asn1/wlancertextn/Makefile.nmake
+++ b/asn1/wlancertextn/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=wlancertextn
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py WLANCERTEXTN.asn packet-wlancertextn-template.c packet-wlancertextn-template.h wlancertextn.cnf
-!IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.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/x411/Makefile b/asn1/x411/Makefile
deleted file mode 100644
index 8d7336f273..0000000000
--- a/asn1/x411/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id$
-
-DISSECTOR_FILES=packet-x411.c packet-x411.h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py x411.asn packet-x411-template.c packet-x411-template.h x411.cnf
-	python ../../tools/asn2wrs.py -b -e -p x411 -c x411.cnf -s packet-x411-template  x411.asn
-
-clean:
-	rm -f parsetab.py $(DISSECTOR_FILES) *~
-
-copy_files: generate_dissector
-	cp $(DISSECTOR_FILES) ../../epan/dissectors
-
diff --git a/asn1/x411/Makefile.am b/asn1/x411/Makefile.am
new file mode 100644
index 0000000000..a034690647
--- /dev/null
+++ b/asn1/x411/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/x411/Makefile.common b/asn1/x411/Makefile.common
new file mode 100644
index 0000000000..a4f4805f97
--- /dev/null
+++ b/asn1/x411/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=x411
+
+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
+
+# 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= \
+	../acse/acse-exp.cnf \
+	../x509ce/x509ce-exp.cnf \
+	../x509if/x509if-exp.cnf \
+	../x509sat/x509sat-exp.cnf \
+	../x509af/x509af-exp.cnf
+
+
diff --git a/asn1/x411/Makefile.nmake b/asn1/x411/Makefile.nmake
index 9fd7a83645..b3fa922696 100644
--- a/asn1/x411/Makefile.nmake
+++ b/asn1/x411/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=x411
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(PROTOCOL_NAME).asn 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 $(PROTOCOL_NAME).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/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
-
diff --git a/asn1/x509af/Makefile b/asn1/x509af/Makefile
deleted file mode 100644
index 3e860587a2..0000000000
--- a/asn1/x509af/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $Id$
-
-DISSECTOR_FILES=packet-x509af.c packet-x509af.h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py AuthenticationFramework.asn packet-x509af-template.c packet-x509af-template.h x509af.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509ce/x509ce-exp.cnf
-	python ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn
-
-clean:
-	rm -f parsetab.py $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-	cp $(DISSECTOR_FILES) ../../epan/dissectors
diff --git a/asn1/x509af/Makefile.am b/asn1/x509af/Makefile.am
new file mode 100644
index 0000000000..a034690647
--- /dev/null
+++ b/asn1/x509af/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/x509af/Makefile.common b/asn1/x509af/Makefile.common
new file mode 100644
index 0000000000..29727eba22
--- /dev/null
+++ b/asn1/x509af/Makefile.common
@@ -0,0 +1,52 @@
+# $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=x509af
+
+DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
+	packet-$(PROTOCOL_NAME).h
+
+NEED_PACKET_PROTO_H = 1
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = AuthenticationFramework.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= \
+	../x509ce/x509ce-exp.cnf \
+	../x509if/x509if-exp.cnf \
+	../x509sat/x509sat-exp.cnf
+
diff --git a/asn1/x509af/Makefile.nmake b/asn1/x509af/Makefile.nmake
index 739c0219f4..b3fa922696 100644
--- a/asn1/x509af/Makefile.nmake
+++ b/asn1/x509af/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=x509af
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py AuthenticationFramework.asn packet-x509af-template.c packet-x509af-template.h x509af.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509ce/x509ce-exp.cnf
-!IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c x509af.cnf -s packet-x509af-template AuthenticationFramework.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/x509af/x509af-exp.cnf b/asn1/x509af/x509af-exp.cnf
deleted file mode 100644
index 817623089f..0000000000
--- a/asn1/x509af/x509af-exp.cnf
+++ /dev/null
@@ -1,59 +0,0 @@
-# Do not modify this file.
-# It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./x509af-exp.cnf
-# ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn
-
-#.MODULE
-AuthenticationFramework  x509af
-#.END
-
-#.IMPORT_TAG
-Certificate              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-Version                  BER_CLASS_UNI BER_UNI_TAG_INTEGER
-CertificateSerialNumber  BER_CLASS_UNI BER_UNI_TAG_INTEGER
-AlgorithmIdentifier      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-Validity                 BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-SubjectPublicKeyInfo     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-Time                     BER_CLASS_ANY/*choice*/ -1/*choice*/
-Extensions               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-Extension                BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-Certificates             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-ForwardCertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CrossCertificates        BER_CLASS_UNI BER_UNI_TAG_SET
-CertificationPath        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CertificatePair          BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CertificateList          BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AttributeCertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-ACPathData               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AttributeCertificate     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AttributeCertificateInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-IssuerSerial             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AttCertValidityPeriod    BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AttributeCertificateAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-#.END
-
-#.TYPE_ATTR
-Certificate              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Version                  TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = VALS(x509af_Version_vals)  BITMASK = 0
-CertificateSerialNumber  TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-AlgorithmIdentifier      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Validity                 TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-SubjectPublicKeyInfo     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Time                     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509af_Time_vals)  BITMASK = 0
-Extensions               TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-Extension                TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Certificates             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-ForwardCertificationPath TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-CrossCertificates        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-CertificationPath        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-CertificatePair          TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-CertificateList          TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AttributeCertificationPath TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-ACPathData               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AttributeCertificate     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AttributeCertificateInfo TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-IssuerSerial             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AttCertValidityPeriod    TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AttributeCertificateAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-#.END
-
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
-
diff --git a/asn1/x509if/Makefile b/asn1/x509if/Makefile
deleted file mode 100644
index 32ad890cfd..0000000000
--- a/asn1/x509if/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $Id$
-
-DISSECTOR_FILES=packet-x509if.c packet-x509if.h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py InformationFramework.asn packet-x509if-template.c packet-x509if-template.h x509if.cnf ../x509sat/x509sat-exp.cnf
-	python ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn
-
-clean:
-	rm -f parsetab.py $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-	cp $(DISSECTOR_FILES) ../../epan/dissectors
diff --git a/asn1/x509if/Makefile.am b/asn1/x509if/Makefile.am
new file mode 100644
index 0000000000..a034690647
--- /dev/null
+++ b/asn1/x509if/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/x509if/Makefile.common b/asn1/x509if/Makefile.common
new file mode 100644
index 0000000000..3559be7ef7
--- /dev/null
+++ b/asn1/x509if/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=x509if
+
+DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
+	packet-$(PROTOCOL_NAME).h
+
+NEED_PACKET_PROTO_H = 1
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = InformationFramework.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= \
+	../x509sat/x509sat-exp.cnf
+
diff --git a/asn1/x509if/Makefile.nmake b/asn1/x509if/Makefile.nmake
index 4059927c9c..b3fa922696 100644
--- a/asn1/x509if/Makefile.nmake
+++ b/asn1/x509if/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=x509if
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py InformationFramework.asn packet-x509if-template.c packet-x509if-template.h x509if.cnf ../x509sat/x509sat-exp.cnf
-!IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c x509if.cnf -s packet-x509if-template InformationFramework.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/x509if/x509if-exp.cnf b/asn1/x509if/x509if-exp.cnf
deleted file mode 100644
index d83732262e..0000000000
--- a/asn1/x509if/x509if-exp.cnf
+++ /dev/null
@@ -1,93 +0,0 @@
-# Do not modify this file.
-# It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./x509if-exp.cnf
-# ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn
-
-#.MODULE
-InformationFramework  x509if
-#.END
-
-#.IMPORT_TAG
-AttributeValue           BER_CLASS_ANY 0
-Attribute                BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AttributeType            BER_CLASS_UNI BER_UNI_TAG_OID
-Context                  BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AttributeValueAssertion  BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-ContextAssertion         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AttributeTypeAssertion   BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-Name                     BER_CLASS_ANY/*choice*/ -1/*choice*/
-RDNSequence              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-DistinguishedName        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-RelativeDistinguishedName BER_CLASS_UNI BER_UNI_TAG_SET
-AttributeTypeAndDistinguishedValue BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-SubtreeSpecification     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-LocalName                BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-ChopSpecification        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-Refinement               BER_CLASS_ANY/*choice*/ -1/*choice*/
-AttributeUsage           BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
-DITStructureRule         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-RuleIdentifier           BER_CLASS_UNI BER_UNI_TAG_INTEGER
-DITContentRule           BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-DITContextUse            BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-SearchRuleDescription    BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-SearchRule               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-SearchRuleId             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AllowedSubset            BER_CLASS_UNI BER_UNI_TAG_BITSTRING
-ImposedSubset            BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
-RequestAttribute         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-ContextProfile           BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-ContextCombination       BER_CLASS_ANY/*choice*/ -1/*choice*/
-MatchingUse              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AttributeCombination     BER_CLASS_ANY/*choice*/ -1/*choice*/
-ResultAttribute          BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-OutputValues             BER_CLASS_ANY/*choice*/ -1/*choice*/
-ControlOptions           BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-EntryLimit               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-RelaxationPolicy         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-MRMapping                BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-Mapping                  BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-MRSubstitution           BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-#.END
-
-#.TYPE_ATTR
-AttributeValue           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Attribute                TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AttributeType            TYPE = FT_OID     DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Context                  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AttributeValueAssertion  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-ContextAssertion         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AttributeTypeAssertion   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Name                     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509if_Name_vals)  BITMASK = 0
-RDNSequence              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-DistinguishedName        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-RelativeDistinguishedName TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-AttributeTypeAndDistinguishedValue TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-SubtreeSpecification     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-LocalName                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-ChopSpecification        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Refinement               TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509if_Refinement_vals)  BITMASK = 0
-AttributeUsage           TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509if_AttributeUsage_vals)  BITMASK = 0
-DITStructureRule         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-RuleIdentifier           TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-DITContentRule           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-DITContextUse            TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-SearchRuleDescription    TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-SearchRule               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-SearchRuleId             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AllowedSubset            TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
-ImposedSubset            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509if_ImposedSubset_vals)  BITMASK = 0
-RequestAttribute         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-ContextProfile           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-ContextCombination       TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509if_ContextCombination_vals)  BITMASK = 0
-MatchingUse              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AttributeCombination     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509if_AttributeCombination_vals)  BITMASK = 0
-ResultAttribute          TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-OutputValues             TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509if_OutputValues_vals)  BITMASK = 0
-ControlOptions           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-EntryLimit               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-RelaxationPolicy         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-MRMapping                TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Mapping                  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-MRSubstitution           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-#.END
-
diff --git a/asn1/x509sat/Makefile b/asn1/x509sat/Makefile
deleted file mode 100644
index 39cc4fcd51..0000000000
--- a/asn1/x509sat/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id$
-
-DISSECTOR_FILES=packet-x509sat.c packet-x509sat.h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py SelectedAttributeTypes.asn packet-x509sat-template.c packet-x509sat-template.h x509sat.cnf ../x509if/x509if-exp.cnf
-	python ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn
-	sed -e "s/\([\"\.]\)Syntax/\1/g" -i.orig packet-x509sat.c
-
-clean:
-	rm -f parsetab.py $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-	cp $(DISSECTOR_FILES) ../../epan/dissectors
diff --git a/asn1/x509sat/Makefile.am b/asn1/x509sat/Makefile.am
new file mode 100644
index 0000000000..a034690647
--- /dev/null
+++ b/asn1/x509sat/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/x509sat/Makefile.common b/asn1/x509sat/Makefile.common
new file mode 100644
index 0000000000..2a3fe50ecb
--- /dev/null
+++ b/asn1/x509sat/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=x509sat
+
+DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
+	packet-$(PROTOCOL_NAME).h
+
+NEED_PACKET_PROTO_H = 1
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = SelectedAttributeTypes.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
+
diff --git a/asn1/x509sat/Makefile.nmake b/asn1/x509sat/Makefile.nmake
index c1f8a611f6..b3fa922696 100644
--- a/asn1/x509sat/Makefile.nmake
+++ b/asn1/x509sat/Makefile.nmake
@@ -1,47 +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=x509sat
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py SelectedAttributeTypes.asn packet-x509sat-template.c packet-x509sat-template.h x509sat.cnf ../x509if/x509if-exp.cnf
-!IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn
-#	sed -e "s/\([\"\.]\)Syntax/\1/g" -i.orig packet-x509sat.c
-!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/x509sat/x509sat-exp.cnf b/asn1/x509sat/x509sat-exp.cnf
deleted file mode 100644
index 6def1c478d..0000000000
--- a/asn1/x509sat/x509sat-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
-# ./x509sat-exp.cnf
-# ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn
-
-#.MODULE
-SelectedAttributeTypes  x509sat
-#.END
-
-#.IMPORT_TAG
-DirectoryString          BER_CLASS_ANY/*choice*/ -1/*choice*/
-UniqueIdentifier         BER_CLASS_UNI BER_UNI_TAG_BITSTRING
-CountryName              BER_CLASS_UNI BER_UNI_TAG_PrintableString
-Criteria                 BER_CLASS_ANY/*choice*/ -1/*choice*/
-EnhancedGuide            BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-PostalAddress            BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-FacsimileTelephoneNumber BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-X121Address              BER_CLASS_UNI BER_UNI_TAG_NumericString
-InternationalISDNNumber  BER_CLASS_UNI BER_UNI_TAG_NumericString
-DestinationIndicator     BER_CLASS_UNI BER_UNI_TAG_PrintableString
-PreferredDeliveryMethod  BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-PresentationAddress      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-ProtocolInformation      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-NameAndOptionalUID       BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-MultipleMatchingLocalities BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-SubstringAssertion       BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CaseIgnoreListMatch      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-OctetSubstringAssertion  BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-ZonalSelect              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-ZonalResult              BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
-LanguageContextSyntax    BER_CLASS_UNI BER_UNI_TAG_PrintableString
-TimeSpecification        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-Period                   BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-XDayOf                   BER_CLASS_ANY/*choice*/ -1/*choice*/
-NamedDay                 BER_CLASS_ANY/*choice*/ -1/*choice*/
-DayTimeBand              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-DayTime                  BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-TimeZone                 BER_CLASS_UNI BER_UNI_TAG_INTEGER
-TimeAssertion            BER_CLASS_ANY/*choice*/ -1/*choice*/
-LocaleContextSyntax      BER_CLASS_ANY/*choice*/ -1/*choice*/
-#.END
-
-#.TYPE_ATTR
-DirectoryString          TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509sat_DirectoryString_vals)  BITMASK = 0
-UniqueIdentifier         TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
-CountryName              TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Criteria                 TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509sat_Criteria_vals)  BITMASK = 0
-EnhancedGuide            TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-PostalAddress            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-FacsimileTelephoneNumber TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-X121Address              TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-InternationalISDNNumber  TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-DestinationIndicator     TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-PreferredDeliveryMethod  TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-PresentationAddress      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-ProtocolInformation      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-NameAndOptionalUID       TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-MultipleMatchingLocalities TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-SubstringAssertion       TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-CaseIgnoreListMatch      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-OctetSubstringAssertion  TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-ZonalSelect              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-ZonalResult              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509sat_ZonalResult_vals)  BITMASK = 0
-LanguageContextSyntax    TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-TimeSpecification        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Period                   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-XDayOf                   TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509sat_XDayOf_vals)  BITMASK = 0
-NamedDay                 TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509sat_NamedDay_vals)  BITMASK = 0
-DayTimeBand              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-DayTime                  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-TimeZone                 TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-TimeAssertion            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509sat_TimeAssertion_vals)  BITMASK = 0
-LocaleContextSyntax      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509sat_LocaleContextSyntax_vals)  BITMASK = 0
-#.END
-
diff --git a/asn1/x721/Makefile.am b/asn1/x721/Makefile.am
new file mode 100644
index 0000000000..a034690647
--- /dev/null
+++ b/asn1/x721/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/x721/Makefile.common b/asn1/x721/Makefile.common
new file mode 100644
index 0000000000..1c4aaef2f2
--- /dev/null
+++ b/asn1/x721/Makefile.common
@@ -0,0 +1,28 @@
+# $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.
+
+
+EXTRA_DIST = \
+	Attribute-ASN1Module.asn \
+	ManagedObjectClassesDefinitions.asn \
+	Notification-ASN1Module.asn \
+	Parameter-ASN1Module.asn
+
diff --git a/configure.in b/configure.in
index 1d5a9a5ba8..7047fe7dd1 100644
--- a/configure.in
+++ b/configure.in
@@ -1530,6 +1530,14 @@ AC_OUTPUT(
   asn1/t38/Makefile
   asn1/tcap/Makefile
   asn1/ulp/Makefile
+  asn1/wlancertextn/Makefile
+  asn1/x411/Makefile
+  asn1/x420/Makefile
+  asn1/x509af/Makefile
+  asn1/x509ce/Makefile
+  asn1/x509if/Makefile
+  asn1/x509sat/Makefile
+  asn1/x721/Makefile
   doc/Makefile
   epan/Makefile
   epan/crypt/Makefile