Change some additional protocols to the new build system

svn path=/trunk/; revision=22958

5 files changed, 106 insertions, 64 deletions

diff --git a/asn1/cmip/Makefile b/asn1/cmip/Makefile
deleted file mode 100644
index 3dcb989b12..0000000000
--- a/asn1/cmip/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id$
-
-PROTOCOL_NAME=cmip
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-ROS_ASN= ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn 
-ASN1_FILES=CMIP-1.asn CMIP-A-ABORT-Information.asn CMIP-A-ASSOCIATE-Information.asn  ../x721/Attribute-ASN1Module.asn $(ROS_ASN)
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(ASN1_FILES) packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h cmip.cnf 
-	python ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c cmip.cnf -s packet-$(PROTOCOL_NAME)-template $(ASN1_FILES)
-
-clean:
-	rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-	cp $(DISSECTOR_FILES) ../../epan/dissectors
diff --git a/asn1/cmip/Makefile.am b/asn1/cmip/Makefile.am
new file mode 100644
index 0000000000..a034690647
--- /dev/null
+++ b/asn1/cmip/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/cmip/Makefile.common b/asn1/cmip/Makefile.common
new file mode 100644
index 0000000000..4be89d1eee
--- /dev/null
+++ b/asn1/cmip/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=cmip
+
+DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
+	packet-$(PROTOCOL_NAME).h
+
+NEED_PACKET_PROTO_H = 1
+
+EXT_ASN_FILE_LIST = \
+	../ros/Remote-Operations-Information-Objects.asn \
+	../ros/Remote-Operations-Generic-ROS-PDUs.asn \
+	../x721/Attribute-ASN1Module.asn
+
+ASN_FILE_LIST = \
+	CMIP-1.asn \
+	CMIP-A-ABORT-Information.asn \
+	CMIP-A-ASSOCIATE-Information.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/cmip/Makefile.nmake b/asn1/cmip/Makefile.nmake
index 8ea69b5432..b3fa922696 100644
--- a/asn1/cmip/Makefile.nmake
+++ b/asn1/cmip/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=cmip
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-ROS_ASN= ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn 
-ASN1_FILES=CMIP-1.asn CMIP-A-ABORT-Information.asn CMIP-A-ASSOCIATE-Information.asn  ../x721/Attribute-ASN1Module.asn $(ROS_ASN)
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(ASN1_FILES) packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf 
-!IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -b -X -T -e -k -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(ASN1_FILES)
-!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/cmip/cmip-exp.cnf b/asn1/cmip/cmip-exp.cnf
index 609f2ec9ca..b48ba0cf67 100644
--- a/asn1/cmip/cmip-exp.cnf
+++ b/asn1/cmip/cmip-exp.cnf
@@ -1,15 +1,15 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
 # ./cmip-exp.cnf
-# ../../tools/asn2wrs.py -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP-1.asn CMIP-A-ABORT-Information.asn CMIP-A-ASSOCIATE-Information.asn ../x721/Attribute-ASN1Module.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn
+# ../../tools/asn2wrs.py -b -e -p cmip -c ./cmip.cnf -s ./packet-cmip-template -D . CMIP-1.asn CMIP-A-ABORT-Information.asn CMIP-A-ASSOCIATE-Information.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn ../x721/Attribute-ASN1Module.asn
 
 #.MODULE
 CMIP-1                                 cmip
 CMIP-A-ABORT-Information               cmip
 CMIP-A-ASSOCIATE-Information           cmip
-Attribute-ASN1Module                   cmip
 Remote-Operations-Information-Objects  cmip
 Remote-Operations-Generic-ROS-PDUs     cmip
+Attribute-ASN1Module                   cmip
 #.END
 
 #.IMPORT_TAG
@@ -20,12 +20,12 @@ ObjectInstance           BER_CLASS_ANY/*choice*/ -1/*choice*/
 RDNSequence              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 CMIPAbortInfo            BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 CMIPUserInfo             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+ROS                      BER_CLASS_ANY/*choice*/ -1/*choice*/
 AdditionalInformation    BER_CLASS_UNI BER_UNI_TAG_SET
 AdministrativeState      BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
 AttributeList            BER_CLASS_UNI BER_UNI_TAG_SET
 AvailabilityStatus       BER_CLASS_UNI BER_UNI_TAG_SET
 ProbableCause            BER_CLASS_ANY/*choice*/ -1/*choice*/
-ROS                      BER_CLASS_ANY/*choice*/ -1/*choice*/
 #.END
 
 #.TYPE_ATTR
@@ -36,11 +36,11 @@ ObjectInstance           TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(c
 RDNSequence              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 CMIPAbortInfo            TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CMIPUserInfo             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+ROS                      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(cmip_ROS_vals)  BITMASK = 0
 AdditionalInformation    TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 AdministrativeState      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(cmip_AdministrativeState_vals)  BITMASK = 0
 AttributeList            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 AvailabilityStatus       TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 ProbableCause            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(cmip_ProbableCause_vals)  BITMASK = 0
-ROS                      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(cmip_ROS_vals)  BITMASK = 0
 #.END