Convert h450 to new Makefile structure. Split h450.ros

out into h450-ros.

svn path=/trunk/; revision=23102

15 files changed, 246 insertions, 122 deletions

diff --git a/asn1/Makefile.am b/asn1/Makefile.am
index 3e8de022d2..f4717fab5c 100644
--- a/asn1/Makefile.am
+++ b/asn1/Makefile.am
@@ -41,6 +41,8 @@ SUBDIRS = \
 	h235	\
 	h245	\
 	h248	\
+	h450	\
+	h450-ros	\
 	nbap	\
 	qsig	\
 	ranap	\
@@ -53,30 +55,6 @@ SUBDIRS = \
 
 EXTRA_DIST = \
 	Makefile.nmake	\
-	h450/H4501-Supplementary-ServiceAPDU-Structure.asn	\
-	h450/Addressing-Data-Elements.asn 	\
-	h450/H225-generic-parameters-definition.asn 	\
-	h450/Manufacturer-specific-service-extension-definition.asn 	\
-	h450/H4501-General-Error-List.asn	\
-	h450/Call-Transfer-Operations.asn 	\
-	h450/Call-Diversion-Operations.asn 	\
-	h450/Call-Hold-Operations.asn 	\
-	h450/Call-Park-Pickup-Operations.asn 	\
-	h450/Call-Waiting-Operations.asn 	\
-	h450/Message-Waiting-Indication-Operations.asn 	\
-	h450/Name-Operations.asn 	\
-	h450/Call-Completion-Operations.asn 	\
-	h450/Call-Offer-Operations.asn 	\
-	h450/Call-Intrusion-Operations.asn 	\
-	h450/Common-Information-Operations.asn 	\
-	h450/Remote-Operations-Apdus.asn	\
-	h450/h450.cnf	\
-	h450/h450-ros.cnf	\
-	h450/Makefile	\
-	h450/Makefile.nmake	\
-	h450/packet-h450-template.c	\
-	h450/packet-h450-ros-template.c	\
-	h450/packet-h450-ros-template.h	\
 	inap/inap.asn	\
 	inap/IN-common-classes.asn	\
 	inap/IN-common-datatypes.asn	\
diff --git a/asn1/h450-ros/Makefile.am b/asn1/h450-ros/Makefile.am
new file mode 100644
index 0000000000..a034690647
--- /dev/null
+++ b/asn1/h450-ros/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/h450-ros/Makefile.common b/asn1/h450-ros/Makefile.common
new file mode 100644
index 0000000000..72209cef64
--- /dev/null
+++ b/asn1/h450-ros/Makefile.common
@@ -0,0 +1,61 @@
+# $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=h450-ros
+
+# The file needs to use h450 for the filter elements etc
+PROTO_OPT = -p h450.ros
+
+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
+
+ASN_FILE_LIST = Remote-Operations-Apdus.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)
+
+# -o needed to compensate the -p h450 hack above.
+A2W_FLAGS= -e -o $(PROTOCOL_NAME)
+
+EXTRA_CNF= \
+	../ros/ros-inv.cnf \
+	../ros/ros-res.cnf \
+	../ros/ros-err.cnf \
+	../ros/ros-rej.cnf
+
+
+$(EXTRA_CNF):
+	(cd ../ros && $(MAKE) $(MAKEFLAGS))
+
diff --git a/asn1/h450-ros/Makefile.nmake b/asn1/h450-ros/Makefile.nmake
new file mode 100644
index 0000000000..b3fa922696
--- /dev/null
+++ b/asn1/h450-ros/Makefile.nmake
@@ -0,0 +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 Makefile.common
+include ../../config.nmake
+include ../Makefile.inc.nmake
+
diff --git a/asn1/h450/Remote-Operations-Apdus.asn b/asn1/h450-ros/Remote-Operations-Apdus.asn
index 72a90352c2..72a90352c2 100644
--- a/asn1/h450/Remote-Operations-Apdus.asn
+++ b/asn1/h450-ros/Remote-Operations-Apdus.asn
diff --git a/asn1/h450/h450-ros.cnf b/asn1/h450-ros/h450-ros.cnf
index 9f7fd1963c..3d1e71b75f 100644
--- a/asn1/h450/h450-ros.cnf
+++ b/asn1/h450-ros/h450-ros.cnf
@@ -73,7 +73,7 @@ FN_VARIANT = _pdu
 TYPE_REF_FN = argument_cb
 #.END
 
-#.INCLUDE ros-inv.cnf
+#.INCLUDE ../ros/ros-inv.cnf
 
 #--- RETURN RESULT ---
 
@@ -86,7 +86,7 @@ TYPE_REF_FN = result_cb
 
 #.END
 
-#.INCLUDE ros-res.cnf
+#.INCLUDE ../ros/ros-res.cnf
 
 #--- RETURN ERROR ---
 
@@ -98,8 +98,8 @@ FN_VARIANT = _pdu
 TYPE_REF_FN = error_cb
 #.END
 
-#.INCLUDE ros-err.cnf
+#.INCLUDE ../ros/ros-err.cnf
 
 #--- REJECT ---
 
-#.INCLUDE ros-rej.cnf
+#.INCLUDE ../ros/ros-rej.cnf
diff --git a/asn1/h450/packet-h450-ros-template.c b/asn1/h450-ros/packet-h450-ros-template.c
index 8b0f00e4d8..8b0f00e4d8 100644
--- a/asn1/h450/packet-h450-ros-template.c
+++ b/asn1/h450-ros/packet-h450-ros-template.c
diff --git a/asn1/h450/packet-h450-ros-template.h b/asn1/h450-ros/packet-h450-ros-template.h
index 47c2e66dee..47c2e66dee 100644
--- a/asn1/h450/packet-h450-ros-template.h
+++ b/asn1/h450-ros/packet-h450-ros-template.h
diff --git a/asn1/h450/Makefile b/asn1/h450/Makefile
deleted file mode 100644
index ffd26d795b..0000000000
--- a/asn1/h450/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id$
-
-PROTOCOL_NAME=h450
-H450_FILES=packet-$(PROTOCOL_NAME).c
-H450_ROS_FILES=packet-$(PROTOCOL_NAME)-ros.c packet-$(PROTOCOL_NAME)-ros.h
-DISSECTOR_FILES=$(H450_FILES) $(H450_ROS_FILES)
-H450_ASN=H4501-Supplementary-ServiceAPDU-Structure.asn Addressing-Data-Elements.asn H225-generic-parameters-definition.asn Manufacturer-specific-service-extension-definition.asn H4501-General-Error-List.asn
-H450_OP_ASN=Call-Transfer-Operations.asn Call-Diversion-Operations.asn Call-Hold-Operations.asn Call-Park-Pickup-Operations.asn Call-Waiting-Operations.asn Message-Waiting-Indication-Operations.asn Name-Operations.asn Call-Completion-Operations.asn Call-Offer-Operations.asn Call-Intrusion-Operations.asn Common-Information-Operations.asn 
-H450_ROS_ASN=../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(H450_FILES): ../../tools/asn2wrs.py $(H450_ASN) $(H450_OP_ASN) packet-h450-template.c h450.cnf
-	python ../../tools/asn2wrs.py -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(H450_ASN) $(H450_OP_ASN)
-
-$(H450_ROS_FILES): ../../tools/asn2wrs.py $(H450_ROS_ASN) packet-$(PROTOCOL_NAME)-ros-template.c $(PROTOCOL_NAME)-ros.cnf  ../ros/ros-inv.cnf ../ros/ros-res.cnf ../ros/ros-err.cnf ../ros/ros-rej.cnf
-	python ../../tools/asn2wrs.py -e -p $(PROTOCOL_NAME).ros -I ../ros -c $(PROTOCOL_NAME)-ros.cnf -o $(PROTOCOL_NAME)-ros -s packet-$(PROTOCOL_NAME)-ros-template $(H450_ROS_ASN)
-clean:
-	rm -f parsetab.py $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-	cp $(DISSECTOR_FILES) ../../epan/dissectors
diff --git a/asn1/h450/Makefile.am b/asn1/h450/Makefile.am
new file mode 100644
index 0000000000..a034690647
--- /dev/null
+++ b/asn1/h450/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/h450/Makefile.common b/asn1/h450/Makefile.common
new file mode 100644
index 0000000000..ea2328c5d9
--- /dev/null
+++ b/asn1/h450/Makefile.common
@@ -0,0 +1,76 @@
+# $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=h450
+
+DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c
+
+PROTO_OPT =
+
+# NEED_PACKET_PROTO_H = 1
+
+EXT_ASN_FILE_LIST = 
+
+H450_ASN = \
+	H4501-Supplementary-ServiceAPDU-Structure.asn \
+	Addressing-Data-Elements.asn \
+	H225-generic-parameters-definition.asn \
+	Manufacturer-specific-service-extension-definition.asn \
+	H4501-General-Error-List.asn
+
+H450_OP_ASN = \
+	Call-Transfer-Operations.asn \
+	Call-Diversion-Operations.asn \
+	Call-Hold-Operations.asn \
+	Call-Park-Pickup-Operations.asn \
+	Call-Waiting-Operations.asn \
+	Message-Waiting-Indication-Operations.asn \
+	Name-Operations.asn \
+	Call-Completion-Operations.asn \
+	Call-Offer-Operations.asn \
+	Call-Intrusion-Operations.asn \
+	Common-Information-Operations.asn
+
+ASN_FILE_LIST = $(H450_ASN) $(H450_OP_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 \
+	$(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+	$(EXTRA_DIST) \
+	$(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS= 
+
+EXTRA_CNF=../h225/h225-exp.cnf \
+	../h450-ros/h450-ros-exp.cnf
+
+../h225/h225-exp.cnf:
+	(cd ../h225 && $(MAKE) $(MAKEFLAGS))
+
+../h450-ros/h450-ros-exp.cnf:
+	(cd ../h450-ros && $(MAKE) $(MAKEFLAGS))
+
diff --git a/asn1/h450/Makefile.nmake b/asn1/h450/Makefile.nmake
index 588166aa80..b3fa922696 100644
--- a/asn1/h450/Makefile.nmake
+++ b/asn1/h450/Makefile.nmake
@@ -1,61 +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=h450
-H450_FILES=packet-$(PROTOCOL_NAME).c
-H450_ROS_FILES=packet-$(PROTOCOL_NAME)-ros.c packet-$(PROTOCOL_NAME)-ros.h
-DISSECTOR_FILES=$(H450_FILES) $(H450_ROS_FILES)
-H450_ASN=H4501-Supplementary-ServiceAPDU-Structure.asn Addressing-Data-Elements.asn H225-generic-parameters-definition.asn Manufacturer-specific-service-extension-definition.asn H4501-General-Error-List.asn
-H450_OP_ASN=Call-Transfer-Operations.asn Call-Diversion-Operations.asn Call-Hold-Operations.asn Call-Park-Pickup-Operations.asn Call-Waiting-Operations.asn Message-Waiting-Indication-Operations.asn Name-Operations.asn Call-Completion-Operations.asn Call-Offer-Operations.asn Call-Intrusion-Operations.asn Common-Information-Operations.asn 
-H450_ROS_ASN=../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(H450_FILES): ../../tools/asn2wrs.py $(H450_ASN) $(H450_OP_ASN) packet-$(PROTOCOL_NAME)-template.c $(PROTOCOL_NAME).cnf
-!IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(H450_ASN) $(H450_OP_ASN)
-!ELSE
-	@echo Error: You need Python to use asn2wrs.py
-	@exit 1
-!ENDIF
-
-$(H450_ROS_FILES): ../../tools/asn2wrs.py $(H450_ROS_ASN) packet-$(PROTOCOL_NAME)-ros-template.c $(PROTOCOL_NAME)-ros.cnf ../ros/ros-inv.cnf ../ros/ros-res.cnf ../ros/ros-err.cnf ../ros/ros-rej.cnf
-!IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -e -p $(PROTOCOL_NAME).ros -I ../ros -c $(PROTOCOL_NAME)-ros.cnf -o $(PROTOCOL_NAME)-ros -s packet-$(PROTOCOL_NAME)-ros-template $(H450_ROS_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)-ros.c packet-$(PROTOCOL_NAME)-ros.c.tmp
-	move packet-$(PROTOCOL_NAME)-ros.h packet-$(PROTOCOL_NAME)-ros.h.tmp
-	$(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c
-	$(UNIX2DOS) < packet-$(PROTOCOL_NAME)-ros.c.tmp > packet-$(PROTOCOL_NAME)-ros.c
-	$(UNIX2DOS) < packet-$(PROTOCOL_NAME)-ros.h.tmp > packet-$(PROTOCOL_NAME)-ros.h
-	del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME)-ros.c.tmp packet-$(PROTOCOL_NAME)-ros.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)-ros.c ..\..\epan\dissectors /d /y
-	xcopy packet-$(PROTOCOL_NAME)-ros.h ..\..\epan\dissectors /d /y
diff --git a/asn1/h450/h450-ros-exp.cnf b/asn1/h450/h450-ros-exp.cnf
deleted file mode 100644
index 80b77a0cc5..0000000000
--- a/asn1/h450/h450-ros-exp.cnf
+++ /dev/null
@@ -1,14 +0,0 @@
-# Do not modify this file.
-# It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./h450-ros-exp.cnf
-# ../../tools/asn2wrs.py -e -p h450.ros -I ../ros -c h450-ros.cnf -o h450-ros -s packet-h450-ros-template ../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn
-
-#.MODULE
-Remote-Operations-Information-Objects  h450.ros
-Remote-Operations-Apdus                h450.ros
-#.END
-
-#.TYPE_ATTR
-ROS                      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(h450_ros_ROS_vals)  BITMASK = 0
-#.END
-
diff --git a/asn1/h450/h450.cnf b/asn1/h450/h450.cnf
index 2daf6fef43..9761f16b1f 100644
--- a/asn1/h450/h450.cnf
+++ b/asn1/h450/h450.cnf
@@ -11,7 +11,7 @@ GROUP_BY_PROT
 #.END
 
 #.INCLUDE ../h225/h225-exp.cnf
-#.INCLUDE h450-ros-exp.cnf 
+#.INCLUDE ../h450-ros/h450-ros-exp.cnf 
 
 #.MODULE
 
diff --git a/configure.in b/configure.in
index 4870e46f60..1ce4b5a536 100644
--- a/configure.in
+++ b/configure.in
@@ -1490,6 +1490,8 @@ AC_OUTPUT(
   asn1/h235/Makefile
   asn1/h245/Makefile
   asn1/h248/Makefile
+  asn1/h450/Makefile
+  asn1/h450-ros/Makefile
   asn1/nbap/Makefile
   asn1/qsig/Makefile
   asn1/ranap/Makefile