diff options
-rw-r--r-- | asn1/Makefile.am | 39 | ||||
-rw-r--r-- | asn1/Makefile.inc | 4 | ||||
-rw-r--r-- | asn1/Makefile.inc.nmake | 4 | ||||
-rw-r--r-- | asn1/acp133/Makefile.common | 1 | ||||
-rw-r--r-- | asn1/acse/Makefile | 17 | ||||
-rw-r--r-- | asn1/acse/Makefile.am | 25 | ||||
-rw-r--r-- | asn1/acse/Makefile.common | 49 | ||||
-rw-r--r-- | asn1/acse/Makefile.nmake | 62 | ||||
-rw-r--r-- | asn1/acse/acse-exp.cnf | 2 | ||||
-rw-r--r-- | asn1/ansi_map/Makefile | 18 | ||||
-rw-r--r-- | asn1/ansi_map/Makefile.am | 25 | ||||
-rw-r--r-- | asn1/ansi_map/Makefile.common | 49 | ||||
-rw-r--r-- | asn1/ansi_map/Makefile.nmake | 62 | ||||
-rw-r--r-- | asn1/cdt/Makefile | 17 | ||||
-rw-r--r-- | asn1/cdt/Makefile.am | 25 | ||||
-rw-r--r-- | asn1/cdt/Makefile.common | 49 | ||||
-rw-r--r-- | asn1/cdt/Makefile.nmake | 61 | ||||
-rw-r--r-- | asn1/cdt/cdt-exp.cnf | 2 | ||||
-rw-r--r-- | asn1/cmip/Makefile | 19 | ||||
-rw-r--r-- | asn1/cmip/Makefile.am | 25 | ||||
-rw-r--r-- | asn1/cmip/Makefile.common | 55 | ||||
-rw-r--r-- | asn1/cmip/Makefile.nmake | 63 | ||||
-rw-r--r-- | asn1/cmip/cmip-exp.cnf | 8 | ||||
-rw-r--r-- | asn1/cms/Makefile | 16 | ||||
-rw-r--r-- | asn1/cms/Makefile.am | 25 | ||||
-rw-r--r-- | asn1/cms/Makefile.common | 49 | ||||
-rw-r--r-- | asn1/cms/Makefile.nmake | 62 | ||||
-rw-r--r-- | asn1/cms/cms-exp.cnf | 2 | ||||
-rw-r--r-- | configure.in | 5 |
29 files changed, 507 insertions, 333 deletions
diff --git a/asn1/Makefile.am b/asn1/Makefile.am index 13983c6533..e083de4554 100644 --- a/asn1/Makefile.am +++ b/asn1/Makefile.am @@ -23,7 +23,12 @@ 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 \ diff --git a/asn1/Makefile.inc b/asn1/Makefile.inc index 5485931633..582445f59c 100644 --- a/asn1/Makefile.inc +++ b/asn1/Makefile.inc @@ -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) \ diff --git a/asn1/Makefile.inc.nmake b/asn1/Makefile.inc.nmake index c5c997ee5d..c7a1e8ee1e 100644 --- a/asn1/Makefile.inc.nmake +++ b/asn1/Makefile.inc.nmake @@ -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) \ diff --git a/asn1/acp133/Makefile.common b/asn1/acp133/Makefile.common index 26e5475aa2..0333518b65 100644 --- a/asn1/acp133/Makefile.common +++ b/asn1/acp133/Makefile.common @@ -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 index fad9cb2656..0000000000 --- a/asn1/acse/Makefile +++ /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 index 0000000000..a034690647 --- /dev/null +++ b/asn1/acse/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/acse/Makefile.common b/asn1/acse/Makefile.common new file mode 100644 index 0000000000..eaa5ac2277 --- /dev/null +++ b/asn1/acse/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=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= + diff --git a/asn1/acse/Makefile.nmake b/asn1/acse/Makefile.nmake index 2dfe9f52ce..b3fa922696 100644 --- a/asn1/acse/Makefile.nmake +++ b/asn1/acse/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=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 diff --git a/asn1/acse/acse-exp.cnf b/asn1/acse/acse-exp.cnf index 71527930ce..1f1c62cd06 100644 --- a/asn1/acse/acse-exp.cnf +++ b/asn1/acse/acse-exp.cnf @@ -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 index 63c9d77722..0000000000 --- a/asn1/ansi_map/Makefile +++ /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 index 0000000000..a034690647 --- /dev/null +++ b/asn1/ansi_map/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/ansi_map/Makefile.common b/asn1/ansi_map/Makefile.common new file mode 100644 index 0000000000..a0ab6b6dbf --- /dev/null +++ b/asn1/ansi_map/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=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= + diff --git a/asn1/ansi_map/Makefile.nmake b/asn1/ansi_map/Makefile.nmake index 13dbe4aeaa..b3fa922696 100644 --- a/asn1/ansi_map/Makefile.nmake +++ b/asn1/ansi_map/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=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 index a4dd2d20db..0000000000 --- a/asn1/cdt/Makefile +++ /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 index 0000000000..a034690647 --- /dev/null +++ b/asn1/cdt/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/cdt/Makefile.common b/asn1/cdt/Makefile.common new file mode 100644 index 0000000000..a0aa43db12 --- /dev/null +++ b/asn1/cdt/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=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= + diff --git a/asn1/cdt/Makefile.nmake b/asn1/cdt/Makefile.nmake index 9638ac6f98..b3fa922696 100644 --- a/asn1/cdt/Makefile.nmake +++ b/asn1/cdt/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=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 diff --git a/asn1/cdt/cdt-exp.cnf b/asn1/cdt/cdt-exp.cnf index fc0212a03b..4a8ceeef09 100644 --- a/asn1/cdt/cdt-exp.cnf +++ b/asn1/cdt/cdt-exp.cnf @@ -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 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 diff --git a/asn1/cms/Makefile b/asn1/cms/Makefile deleted file mode 100644 index a9e3ea5b58..0000000000 --- a/asn1/cms/Makefile +++ /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 index 0000000000..a034690647 --- /dev/null +++ b/asn1/cms/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/cms/Makefile.common b/asn1/cms/Makefile.common new file mode 100644 index 0000000000..0a66da413e --- /dev/null +++ b/asn1/cms/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=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= + diff --git a/asn1/cms/Makefile.nmake b/asn1/cms/Makefile.nmake index cb239e7ecb..b3fa922696 100644 --- a/asn1/cms/Makefile.nmake +++ b/asn1/cms/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=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 diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf index 2da2a37aec..71ba075c2b 100644 --- a/asn1/cms/cms-exp.cnf +++ b/asn1/cms/cms-exp.cnf @@ -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 diff --git a/configure.in b/configure.in index dded0b694b..0142909f56 100644 --- a/configure.in +++ b/configure.in @@ -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 |