Convert asn1/dap/

svn path=/trunk/; revision=22997
This commit is contained in:
Jörg Mayer 2007-09-27 09:24:38 +00:00
parent 6055995bf1
commit 682332dcc0
7 changed files with 120 additions and 71 deletions

View File

@ -29,6 +29,7 @@ SUBDIRS = \
cdt \
cmip \
cms \
dap \
h245 \
nbap \
ranap \
@ -41,13 +42,6 @@ SUBDIRS = \
EXTRA_DIST = \
Makefile.nmake \
dap/dap.asn \
dap/dap.cnf \
dap/dap-exp.cnf \
dap/Makefile \
dap/Makefile.nmake \
dap/packet-dap-template.c \
dap/packet-dap-template.h \
disp/disp.asn \
disp/disp.cnf \
disp/disp-exp.cnf \

View File

@ -1,23 +0,0 @@
# $Id$
DISSECTOR_FILES=packet-dap.c packet-dap.h
all: generate_dissector
generate_dissector: $(DISSECTOR_FILES)
ASN_EXPORTS= ../x509if/x509if-exp.cnf \
../x509af/x509af-exp.cnf \
../dsp/dsp-exp.cnf \
../ros/ros-exp.cnf \
../acse/acse-exp.cnf
$(DISSECTOR_FILES): ../../tools/asn2wrs.py dap.asn packet-dap-template.c packet-dap-template.h dap.cnf $(ASN_EXPORTS)
python ../../tools/asn2wrs.py -b -e -p dap -c dap.cnf -s packet-dap-template dap.asn
clean:
rm -f parsetab.py $(DISSECTOR_FILES)
copy_files: generate_dissector
cp $(DISSECTOR_FILES) ../../epan/dissectors

25
asn1/dap/Makefile.am Normal file
View File

@ -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

70
asn1/dap/Makefile.common Normal file
View File

@ -0,0 +1,70 @@
# $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=dap
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= \
../x509if/x509if-exp.cnf \
../x509af/x509af-exp.cnf \
../dsp/dsp-exp.cnf \
../ros/ros-exp.cnf \
../acse/acse-exp.cnf
../x509if/x509if-exp.cnf:
(cd ../x509if && $(MAKE) $(MAKEFLAGS))
../x509af/x509af-exp.cnf:
(cd ../x509af && $(MAKE) $(MAKEFLAGS))
../dsp/dsp-exp.cnf:
(cd ../dsp && $(MAKE) $(MAKEFLAGS))
../ros/ros-exp.cnf:
(cd ../ros && $(MAKE) $(MAKEFLAGS))
../acse/asce-exp.cnf:
(cd ../asce && $(MAKE) $(MAKEFLAGS))

View 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 Makefile.common
include ../../config.nmake
UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
PROTOCOL_NAME=dap
DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
all: generate_dissector
generate_dissector: $(DISSECTOR_FILES)
$(DISSECTOR_FILES): ../../tools/asn2wrs.py dap.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 dap.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.inc.nmake

View File

@ -1,7 +1,7 @@
# Do not modify this file.
# It is created automatically by the ASN.1 to Wireshark dissector compiler
# ./dap-exp.cnf
# ../../tools/asn2wrs.py -b -e -p dap -c dap.cnf -s packet-dap-template dap.asn
# ../../tools/asn2wrs.py -b -e -p dap -c ./dap.cnf -s ./packet-dap-template -D . dap.asn
#.MODULE
DirectoryAbstractService dap

View File

@ -1472,6 +1472,7 @@ AC_OUTPUT(
asn1/cdt/Makefile
asn1/cmip/Makefile
asn1/cms/Makefile
asn1/dap/Makefile
asn1/h245/Makefile
asn1/nbap/Makefile
asn1/ranap/Makefile