Convert acp133 to new build structure.

Update some svn:ignore files, remove no longer needed Makefiles

svn path=/trunk/; revision=22957
This commit is contained in:
Jörg Mayer 2007-09-25 17:09:01 +00:00
parent 6d1791db07
commit 9ad70d3450
11 changed files with 100 additions and 156 deletions

View File

@ -22,6 +22,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
SUBDIRS = \
acp133 \
camel \
h245 \
nbap \
@ -31,12 +32,6 @@ SUBDIRS = \
EXTRA_DIST = \
Makefile.nmake \
acp133/acp133.asn \
acp133/acp133.cnf \
acp133/Makefile \
acp133/Makefile.nmake \
acp133/packet-acp133-template.c \
acp133/packet-acp133-template.h \
acse/acse.asn \
acse/acse.cnf \
acse/acse-exp.cnf \

View File

@ -1,17 +0,0 @@
# $Id$
DISSECTOR_FILES=packet-acp133.c packet-acp133.h
all: generate_dissector
generate_dissector: $(DISSECTOR_FILES)
$(DISSECTOR_FILES): ../../tools/asn2wrs.py acp133.asn packet-acp133-template.c packet-acp133-template.h acp133.cnf
python ../../tools/asn2wrs.py -b -e -X -T -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn
clean:
rm -f parsetab.py $(DISSECTOR_FILES)
copy_files: generate_dissector
cp $(DISSECTOR_FILES) ../../epan/dissectors

25
asn1/acp133/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

View File

@ -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=acp133
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).asn \
$(PROTOCOL_NAME).cnf
SRC_FILES = \
$(EXTRA_DIST) \
$(EXT_ASN_FILE_LIST)
A2W_FLAGS= -b -e -X -T
EXTRA_CNF=

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=acp133
DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
all: generate_dissector
generate_dissector: $(DISSECTOR_FILES)
$(DISSECTOR_FILES): ../../tools/asn2wrs.py acp133.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 acp133.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,16 +0,0 @@
# $Id$
DISSECTOR_FILES=packet-h245.c packet-h245.h
all: generate_dissector
generate_dissector: $(DISSECTOR_FILES)
$(DISSECTOR_FILES): ../../tools/asn2wrs.py packet-h245-template.c packet-h245-template.h h245.cnf MULTIMEDIA-SYSTEM-CONTROL.asn
python ../../tools/asn2wrs.py -e -p h245 -c h245.cnf -s packet-h245-template MULTIMEDIA-SYSTEM-CONTROL.asn
clean:
rm -f parsetab.py $(DISSECTOR_FILES)
copy_files: generate_dissector
cp $(DISSECTOR_FILES) ../../epan/dissectors

View File

@ -1,19 +0,0 @@
# $Id$
PROTOCOL_NAME=nbap
DISSECTOR_FILES=packet-nbap.c
NBAP_ASN=NBAP-CommonDataTypes.asn NBAP-Constants.asn NBAP-Containers.asn NBAP-IEs.asn NBAP-PDU-Contents.asn NBAP-PDU-Descriptions.asn
all: generate_dissector
generate_dissector: $(DISSECTOR_FILES)
$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(NBAP_ASN) packet-nbap-template.c nbap.cnf
python ../../tools/asn2wrs.py -p $(PROTOCOL_NAME) -c nbap.cnf -s packet-nbap-template $(NBAP_ASN)
clean:
rm -f parsetab.py $(DISSECTOR_FILES)
copy_files: generate_dissector
cp $(DISSECTOR_FILES) ../../epan/dissectors

View File

@ -1,19 +0,0 @@
# $Id$
PROTOCOL_NAME=ranap
DISSECTOR_FILES=packet-ranap.c packet-ranap.h
RANAP_ASN=RANAP-CommonDataTypes.asn RANAP-Constants.asn RANAP-Containers.asn RANAP-IEs.asn RANAP-PDU-Contents.asn RANAP-PDU-Descriptions.asn
all: generate_dissector
generate_dissector: $(DISSECTOR_FILES)
$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(RANAP_ASN) packet-ranap-template.c packet-ranap-template.h ranap.cnf
python ../../tools/asn2wrs.py -p ranap -c ranap.cnf -s packet-ranap-template $(RANAP_ASN)
clean:
rm -f parsetab.py $(DISSECTOR_FILES)
copy_files: generate_dissector
cp $(DISSECTOR_FILES) ../../epan/dissectors

View File

@ -1,19 +0,0 @@
# $Id$
PROTOCOL_NAME=rnsap
DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c
RNSAP_ASN=RNSAP-CommonDataTypes.asn RNSAP-Constants.asn RNSAP-Containers.asn RNSAP-IEs.asn RNSAP-PDU-Contents.asn RNSAP-PDU-Descriptions.asn
all: generate_dissector
generate_dissector: $(DISSECTOR_FILES)
$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(RNSAP_ASN) packet-rnsap-template.c rnsap.cnf
python ../../tools/asn2wrs.py -p $(PROTOCOL_NAME) -c rnsap.cnf -s packet-rnsap-template $(RNSAP_ASN)
clean:
rm -f parsetab.py $(DISSECTOR_FILES)
copy_files: generate_dissector
cp $(DISSECTOR_FILES) ../../epan/dissectors

View File

@ -1,19 +0,0 @@
# $Id$
PROTOCOL_NAME=sabp
DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c
SABP_ASN=SABP-CommonDataTypes.asn SABP-Constants.asn SABP-Containers.asn SABP-IEs.asn SABP-PDU-Contents.asn SABP-PDU-Descriptions.asn
all: generate_dissector
generate_dissector: $(DISSECTOR_FILES)
$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SABP_ASN) packet-sabp-template.c sabp.cnf
python ../../tools/asn2wrs.py -p $(PROTOCOL_NAME) -c sabp.cnf -s packet-sabp-template $(SABP_ASN)
clean:
rm -f parsetab.py $(DISSECTOR_FILES)
copy_files: generate_dissector
cp $(DISSECTOR_FILES) ../../epan/dissectors

View File

@ -1465,12 +1465,13 @@ AC_OUTPUT(
Makefile
doxygen.cfg
asn1/Makefile
asn1/acp133/Makefile
asn1/camel/Makefile
asn1/h245/Makefile
asn1/nbap/Makefile
asn1/ranap/Makefile
asn1/rnsap/Makefile
asn1/sabp/Makefile
asn1/camel/Makefile
doc/Makefile
epan/Makefile
epan/crypt/Makefile