Try to fix the build...

svn path=/trunk/; revision=23109

3 files changed, 74 insertions, 23 deletions

diff --git a/asn1/inap/Makefile b/asn1/inap/Makefile
deleted file mode 100644
index 4f7ee2e516..0000000000
--- a/asn1/inap/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-
-PROTOCOL_NAME=inap
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-ROS_ASN= ../ros/Remote-Operations-Information-Objects.asn 
-1248_1_ASN_FILES= IN-object-identifiers.asn IN-common-datatypes.asn
-1248_2_ASN_FILES=IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn
-1248_3_ASN_FILES=IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn
-1248_CLASSES_ASN=IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn
-ASN_FILE_LIST=$(ROS_ASN) $(1248_CLASSES_ASN) inap.asn $(1248_1_ASN_FILES) $(1248_2_ASN_FILES) $(1248_3_ASN_FILES)
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(ASN_FILE_LIST) packet-inap-template.c packet-inap-template.h inap.cnf 
-	python ../../tools/asn2wrs.py -b -X -e -p $(PROTOCOL_NAME) -c inap.cnf -s packet-inap-template $(ASN_FILE_LIST)
-
-clean:
-	rm -f parsetab.py $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-	cp $(DISSECTOR_FILES) ../../epan/dissectors
diff --git a/asn1/inap/Makefile.am b/asn1/inap/Makefile.am
new file mode 100644
index 0000000000..a034690647
--- /dev/null
+++ b/asn1/inap/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/inap/Makefile.common b/asn1/inap/Makefile.common
new file mode 100644
index 0000000000..bf3c6209b7
--- /dev/null
+++ b/asn1/inap/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=inap
+
+DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
+	packet-$(PROTOCOL_NAME).h
+
+NEED_PACKET_PROTO_H = 1
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = inap.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 -X -T -e
+
+EXTRA_CNF=
+