Change some additional protocols to the new build system
authorJörg Mayer <jmayer@loplof.de>
Tue, 25 Sep 2007 18:02:49 +0000 (18:02 -0000)
committerJörg Mayer <jmayer@loplof.de>
Tue, 25 Sep 2007 18:02:49 +0000 (18:02 -0000)
svn path=/trunk/; revision=22958

29 files changed:
asn1/Makefile.am
asn1/Makefile.inc
asn1/Makefile.inc.nmake
asn1/acp133/Makefile.common
asn1/acse/Makefile [deleted file]
asn1/acse/Makefile.am [new file with mode: 0644]
asn1/acse/Makefile.common [new file with mode: 0644]
asn1/acse/Makefile.nmake
asn1/acse/acse-exp.cnf
asn1/ansi_map/Makefile [deleted file]
asn1/ansi_map/Makefile.am [new file with mode: 0644]
asn1/ansi_map/Makefile.common [new file with mode: 0644]
asn1/ansi_map/Makefile.nmake
asn1/cdt/Makefile [deleted file]
asn1/cdt/Makefile.am [new file with mode: 0644]
asn1/cdt/Makefile.common [new file with mode: 0644]
asn1/cdt/Makefile.nmake
asn1/cdt/cdt-exp.cnf
asn1/cmip/Makefile [deleted file]
asn1/cmip/Makefile.am [new file with mode: 0644]
asn1/cmip/Makefile.common [new file with mode: 0644]
asn1/cmip/Makefile.nmake
asn1/cmip/cmip-exp.cnf
asn1/cms/Makefile [deleted file]
asn1/cms/Makefile.am [new file with mode: 0644]
asn1/cms/Makefile.common [new file with mode: 0644]
asn1/cms/Makefile.nmake
asn1/cms/cms-exp.cnf
configure.in

index 13983c6533ea0befeb689d5a34b54b0f5e835f62..e083de4554c42e8e9fa5db8d492d4b1e81c3ff41 100644 (file)
 
 SUBDIRS = \
        acp133  \
+       acse    \
+       ansi_map        \
        camel   \
+       cdt     \
+       cmip    \
+       cms     \
        h245    \
        nbap    \
        ranap   \
@@ -32,40 +37,6 @@ SUBDIRS = \
 
 EXTRA_DIST = \
        Makefile.nmake  \
-       acse/acse.asn   \
-       acse/acse.cnf   \
-       acse/acse-exp.cnf       \
-       acse/Makefile   \
-       acse/Makefile.nmake     \
-       acse/packet-acse-template.c     \
-       acse/packet-acse-template.h     \
-       ansi_map/ansi_map.asn   \
-       ansi_map/ansi_map.cnf   \
-       ansi_map/Makefile       \
-       ansi_map/Makefile.nmake \
-       ansi_map/packet-ansi_map-template.c     \
-       ansi_map/packet-ansi_map-template.h     \
-       cdt/cdt.asn     \
-       cdt/cdt.cnf     \
-       cdt/cdt-exp.cnf \
-       cdt/Makefile    \
-       cdt/Makefile.nmake      \
-       cdt/packet-cdt-template.c       \
-       cdt/packet-cdt-template.h       \
-       cmip/CMIP.asn   \
-       cmip/cmip.cnf   \
-       cmip/cmip-exp.cnf       \
-       cmip/Makefile   \
-       cmip/Makefile.nmake     \
-       cmip/packet-cmip-template.c     \
-       cmip/packet-cmip-template.h     \
-       cms/cms.cnf     \
-       cms/cms-exp.cnf \
-       cms/CryptographicMessageSyntax.asn      \
-       cms/Makefile    \
-       cms/Makefile.nmake      \
-       cms/packet-cms-template.c       \
-       cms/packet-cms-template.h       \
        dap/dap.asn     \
        dap/dap.cnf     \
        dap/dap-exp.cnf \
index 5485931633366ee7dccf560d09411b9ac71ba42a..582445f59c05117bc1a0097966691f6fc1919385 100644 (file)
@@ -24,9 +24,9 @@
 
 all: generate_dissector
 
-generate_dissector: $(DISSECTOR_FILES) $(EXTRA_CNF)
+generate_dissector: $(DISSECTOR_FILES)
 
-$(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES)
+$(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
        python $(top_srcdir)/tools/asn2wrs.py \
                $(A2W_FLAGS) \
                -p $(PROTOCOL_NAME) \
index c5c997ee5da3e1c762b64c85db812ff1f98f04f9..c7a1e8ee1e98ccf1af5f3ed5eb2d09212f750104 100644 (file)
@@ -26,9 +26,9 @@ UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
 
 all: generate_dissector
 
-generate_dissector: $(DISSECTOR_FILES) $(EXTRA_CNF)
+generate_dissector: $(DISSECTOR_FILES)
 
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES)
+$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES $(EXTRA_CNF))
 !IFDEF PYTHON
        $(PYTHON) "../../tools/asn2wrs.py" \
                $(A2W_FLAGS) \
index 26e5475aa2baf27880ca8ef4f2cb48c9865480c1..0333518b65b343a34c1ad04f06bec435ddbd1213 100644 (file)
@@ -37,7 +37,6 @@ EXTRA_DIST = \
        $(ASN_FILE_LIST) \
        packet-$(PROTOCOL_NAME)-template.c \
        packet-$(PROTOCOL_NAME)-template.h \
-       $(PROTOCOL_NAME).asn \
        $(PROTOCOL_NAME).cnf
 
 SRC_FILES = \
diff --git a/asn1/acse/Makefile b/asn1/acse/Makefile
deleted file mode 100644 (file)
index fad9cb2..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id$
-
-DISSECTOR_FILES=packet-acse.c packet-acse.h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py acse.asn packet-acse-template.c packet-acse-template.h acse.cnf
-       python ../../tools/asn2wrs.py -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn
-
-clean:
-       rm -f parsetab.py $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-       cp $(DISSECTOR_FILES) ../../epan/dissectors
-
diff --git a/asn1/acse/Makefile.am b/asn1/acse/Makefile.am
new file mode 100644 (file)
index 0000000..a034690
--- /dev/null
@@ -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/acse/Makefile.common b/asn1/acse/Makefile.common
new file mode 100644 (file)
index 0000000..eaa5ac2
--- /dev/null
@@ -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=acse
+
+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=
+
index 2dfe9f52ce5e01a1556e2e2108a2de012a7753f8..b3fa922696f2467a745356babed96c8c7dc11de3 100644 (file)
@@ -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=acse
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py acse.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 acse.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
 
index 71527930ceb0fa7e837481d9537f8d49ad47b98f..1f1c62cd06ecd8e63d8ce21c5f6fc39236a3f50a 100644 (file)
@@ -1,7 +1,7 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
 # ./acse-exp.cnf
-# ../../tools/asn2wrs.py -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn
+# ../../tools/asn2wrs.py -b -e -p acse -c ./acse.cnf -s ./packet-acse-template -D . acse.asn
 
 #.MODULE
 ACSE-1  acse
diff --git a/asn1/ansi_map/Makefile b/asn1/ansi_map/Makefile
deleted file mode 100644 (file)
index 63c9d77..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id$
-
-PROTOCOL_NAME=ansi_map
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py ansi_map.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h ansi_map.cnf
-       python ../../tools/asn2wrs.py -b -X -T -e -p $(PROTOCOL_NAME) -c ansi_map.cnf -s packet-$(PROTOCOL_NAME)-template ansi_map.asn
-
-clean:
-       rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-       cp $(DISSECTOR_FILES) ../../epan/dissectors
-
diff --git a/asn1/ansi_map/Makefile.am b/asn1/ansi_map/Makefile.am
new file mode 100644 (file)
index 0000000..a034690
--- /dev/null
@@ -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/ansi_map/Makefile.common b/asn1/ansi_map/Makefile.common
new file mode 100644 (file)
index 0000000..a0ab6b6
--- /dev/null
@@ -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=ansi_map
+
+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 -X -T
+
+EXTRA_CNF=
+
index 13dbe4aeaa770c4e71e8f9c10c5c330ea96d0523..b3fa922696f2467a745356babed96c8c7dc11de3 100644 (file)
@@ -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=ansi_map
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py ansi_map.asn packet-ansi_map-template.c packet-ansi_map-template.h ansi_map.cnf
-!IFDEF PYTHON
-       $(PYTHON) "../../tools/asn2wrs.py" -b -X -T -e -p $(PROTOCOL_NAME) -c ansi_map.cnf -s packet-ansi_map-template ansi_map.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/cdt/Makefile b/asn1/cdt/Makefile
deleted file mode 100644 (file)
index a4dd2d2..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id$
-
-PROTOCOL_NAME=cdt
-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 
-       python ../../tools/asn2wrs.py -b -X -T -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn
-
-clean:
-       rm -f parsetab.py $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-       cp $(DISSECTOR_FILES) ../../epan/dissectors
diff --git a/asn1/cdt/Makefile.am b/asn1/cdt/Makefile.am
new file mode 100644 (file)
index 0000000..a034690
--- /dev/null
@@ -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/cdt/Makefile.common b/asn1/cdt/Makefile.common
new file mode 100644 (file)
index 0000000..a0aa43d
--- /dev/null
@@ -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=cdt
+
+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 -X -T -e
+
+EXTRA_CNF=
+
index 9638ac6f9898a6208ec25a1020d472173a36ad0c..b3fa922696f2467a745356babed96c8c7dc11de3 100644 (file)
@@ -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=cdt
-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 -X -T -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
+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
index fc0212a03bee6629909576922838c4c74826a302..4a8ceeef0916d9ecd2cb22ba0640b346a8e76d98 100644 (file)
@@ -1,7 +1,7 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
 # ./cdt-exp.cnf
-# ../../tools/asn2wrs.py -b -X -T -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn
+# ../../tools/asn2wrs.py -b -X -T -e -p cdt -c ./cdt.cnf -s ./packet-cdt-template -D . cdt.asn
 
 #.MODULE
 CompressedDataType  cdt
diff --git a/asn1/cmip/Makefile b/asn1/cmip/Makefile
deleted file mode 100644 (file)
index 3dcb989..0000000
+++ /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 (file)
index 0000000..a034690
--- /dev/null
@@ -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 (file)
index 0000000..4be89d1
--- /dev/null
@@ -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=
+
index 8ea69b5432531b3d06cd6df6fd2963b7caa4c6e3..b3fa922696f2467a745356babed96c8c7dc11de3 100644 (file)
@@ -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
index 609f2ec9ca422116d657ecb89445d779597a7379..b48ba0cf6717499a98be275208cf7818a9e14fac 100644 (file)
@@ -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
 
diff --git a/asn1/cms/Makefile b/asn1/cms/Makefile
deleted file mode 100644 (file)
index a9e3ea5..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# $Id$
-
-DISSECTOR_FILES=packet-cms.c packet-cms.h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py CryptographicMessageSyntax.asn packet-cms-template.c packet-cms-template.h cms.cnf
-       python ../../tools/asn2wrs.py -b -X -T -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn
-
-clean:
-       rm -f parsetab.py $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-       cp $(DISSECTOR_FILES) ../../epan/dissectors
diff --git a/asn1/cms/Makefile.am b/asn1/cms/Makefile.am
new file mode 100644 (file)
index 0000000..a034690
--- /dev/null
@@ -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/cms/Makefile.common b/asn1/cms/Makefile.common
new file mode 100644 (file)
index 0000000..0a66da4
--- /dev/null
@@ -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=cms
+
+DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
+       packet-$(PROTOCOL_NAME).h
+
+NEED_PACKET_PROTO_H = 1
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = CryptographicMessageSyntax.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=
+
index cb239e7ecb1f3428353f38125089a337e499bca5..b3fa922696f2467a745356babed96c8c7dc11de3 100644 (file)
@@ -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=cms
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py CryptographicMessageSyntax.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf
-!IFDEF PYTHON
-       $(PYTHON) "../../tools/asn2wrs.py" -b -X -T -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template CryptographicMessageSyntax.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
 
index 2da2a37aecfc109726fb2b1bb95d9231edbad991..71ba075c2b19a0c22ed0c5ac82737ef5f5b0058c 100644 (file)
@@ -1,7 +1,7 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
 # ./cms-exp.cnf
-# ../../tools/asn2wrs.py -b -X -T -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn
+# ../../tools/asn2wrs.py -b -X -T -e -p cms -c ./cms.cnf -s ./packet-cms-template -D . CryptographicMessageSyntax.asn
 
 #.MODULE
 CryptographicMessageSyntax  cms
index dded0b694b9ffbc961749902843fcc47bd6c7087..0142909f5620816bf2220622726fefc00156dbef 100644 (file)
@@ -1466,7 +1466,12 @@ AC_OUTPUT(
   doxygen.cfg
   asn1/Makefile
   asn1/acp133/Makefile
+  asn1/acse/Makefile
+  asn1/ansi_map/Makefile
   asn1/camel/Makefile
+  asn1/cdt/Makefile
+  asn1/cmip/Makefile
+  asn1/cms/Makefile
   asn1/h245/Makefile
   asn1/nbap/Makefile
   asn1/ranap/Makefile