diff options
| -rw-r--r-- | asn1/Makefile.am | 33 | ||||
| -rw-r--r-- | asn1/logotype-cert-extn/Makefile | 16 | ||||
| -rw-r--r-- | asn1/logotype-cert-extn/Makefile.am | 25 | ||||
| -rw-r--r-- | asn1/logotype-cert-extn/Makefile.common | 50 | ||||
| -rw-r--r-- | asn1/logotype-cert-extn/Makefile.nmake | 61 | ||||
| -rw-r--r-- | asn1/logotype-cert-extn/logotypecertextn.cnf (renamed from asn1/logotype-cert-extn/logotype-cert-extn.cnf) | 0 | ||||
| -rw-r--r-- | asn1/logotype-cert-extn/packet-logotypecertextn-template.c (renamed from asn1/logotype-cert-extn/packet-logotype-cert-extn-template.c) | 0 | ||||
| -rw-r--r-- | asn1/logotype-cert-extn/packet-logotypecertextn-template.h (renamed from asn1/logotype-cert-extn/packet-logotype-cert-extn-template.h) | 0 | ||||
| -rw-r--r-- | configure.in | 3 |
9 files changed, 103 insertions, 85 deletions
diff --git a/asn1/Makefile.am b/asn1/Makefile.am index f4717fab5c..ee77accb2d 100644 --- a/asn1/Makefile.am +++ b/asn1/Makefile.am @@ -43,6 +43,9 @@ SUBDIRS = \ h248 \ h450 \ h450-ros \ + inap \ + ldap \ + logotype-cert-extn \ nbap \ qsig \ ranap \ @@ -55,36 +58,6 @@ SUBDIRS = \ EXTRA_DIST = \ Makefile.nmake \ - inap/inap.asn \ - inap/IN-common-classes.asn \ - inap/IN-common-datatypes.asn \ - inap/IN-errorcodes.asn \ - inap/IN-errortypes.asn \ - inap/IN-object-identifiers.asn \ - inap/IN-operationcodes.asn \ - inap/IN-SCF-SRF-Classes.asn \ - inap/IN-SCF-SRF-datatypes.asn \ - inap/IN-SCF-SRF-ops-args.asn \ - inap/IN-SSF-SCF-Classes.asn \ - inap/IN-SSF-SCF-datatypes.asn \ - inap/IN-SSF-SCF-ops-args.asn \ - inap/inap.cnf \ - inap/Makefile \ - inap/Makefile.nmake \ - inap/packet-inap-template.c \ - inap/packet-inap-template.h \ - ldap/ldap.cnf \ - ldap/Lightweight-Directory-Access-Protocol-V3.asn \ - ldap/Makefile \ - ldap/Makefile.nmake \ - ldap/packet-ldap-template.c \ - ldap/packet-ldap-template.h \ - logotype-cert-extn/LogotypeCertExtn.asn \ - logotype-cert-extn/logotype-cert-extn.cnf \ - logotype-cert-extn/Makefile \ - logotype-cert-extn/Makefile.nmake \ - logotype-cert-extn/packet-logotype-cert-extn-template.c \ - logotype-cert-extn/packet-logotype-cert-extn-template.h \ mms/Makefile \ mms/Makefile.nmake \ mms/mms.asn \ diff --git a/asn1/logotype-cert-extn/Makefile b/asn1/logotype-cert-extn/Makefile deleted file mode 100644 index 62951e6776..0000000000 --- a/asn1/logotype-cert-extn/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $Id$ - -DISSECTOR_FILES=packet-logotypecertextn.c packet-logotypecertextn.h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py LogotypeCertExtn.asn packet-logotype-cert-extn-template.c packet-logotype-cert-extn-template.h logotype-cert-extn.cnf - python ../../tools/asn2wrs.py -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn - -clean: - rm -f parsetab.py $(DISSECTOR_FILES) - -copy_files: generate_dissector - cp $(DISSECTOR_FILES) ../../epan/dissectors diff --git a/asn1/logotype-cert-extn/Makefile.am b/asn1/logotype-cert-extn/Makefile.am new file mode 100644 index 0000000000..a034690647 --- /dev/null +++ b/asn1/logotype-cert-extn/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/logotype-cert-extn/Makefile.common b/asn1/logotype-cert-extn/Makefile.common new file mode 100644 index 0000000000..9f93648572 --- /dev/null +++ b/asn1/logotype-cert-extn/Makefile.common @@ -0,0 +1,50 @@ +# $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=logotypecertextn + +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ + packet-$(PROTOCOL_NAME).h + +NEED_PACKET_PROTO_H = 1 + +EXT_ASN_FILE_LIST = + +ASN_FILE_LIST = \ + LogotypeCertExtn.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/logotype-cert-extn/Makefile.nmake b/asn1/logotype-cert-extn/Makefile.nmake index b3976e7b43..b3fa922696 100644 --- a/asn1/logotype-cert-extn/Makefile.nmake +++ b/asn1/logotype-cert-extn/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=logotypecertextn -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py LogotypeCertExtn.asn packet-logotype-cert-extn-template.c packet-logotype-cert-extn-template.h logotype-cert-extn.cnf -!IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.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/logotype-cert-extn/logotype-cert-extn.cnf b/asn1/logotype-cert-extn/logotypecertextn.cnf index 4f579a0ac2..4f579a0ac2 100644 --- a/asn1/logotype-cert-extn/logotype-cert-extn.cnf +++ b/asn1/logotype-cert-extn/logotypecertextn.cnf diff --git a/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.c b/asn1/logotype-cert-extn/packet-logotypecertextn-template.c index 086fc70999..086fc70999 100644 --- a/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.c +++ b/asn1/logotype-cert-extn/packet-logotypecertextn-template.c diff --git a/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.h b/asn1/logotype-cert-extn/packet-logotypecertextn-template.h index a62df63001..a62df63001 100644 --- a/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.h +++ b/asn1/logotype-cert-extn/packet-logotypecertextn-template.h diff --git a/configure.in b/configure.in index 1ce4b5a536..c2c2d8670a 100644 --- a/configure.in +++ b/configure.in @@ -1492,6 +1492,9 @@ AC_OUTPUT( asn1/h248/Makefile asn1/h450/Makefile asn1/h450-ros/Makefile + asn1/inap/Makefile + asn1/ldap/Makefile + asn1/logotype-cert-extn/Makefile asn1/nbap/Makefile asn1/qsig/Makefile asn1/ranap/Makefile |