diff options
author | Jörg Mayer <jmayer@loplof.de> | 2007-10-09 17:58:29 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2007-10-09 17:58:29 +0000 |
commit | 03eee8b93096d6f9b10cc2c00e18a39a7166527d (patch) | |
tree | 36f368ee355caf350bca0f0a278f67d6c5c0ba92 | |
parent | f52c1fc8f39de944dabb07933d5097024b9ac8a7 (diff) | |
download | wireshark-03eee8b93096d6f9b10cc2c00e18a39a7166527d.tar.gz |
More Makefile updates
svn path=/trunk/; revision=23113
-rw-r--r-- | asn1/Makefile.am | 18 | ||||
-rw-r--r-- | asn1/mms/Makefile | 17 | ||||
-rw-r--r-- | asn1/mms/Makefile.am | 25 | ||||
-rw-r--r-- | asn1/mms/Makefile.common | 49 | ||||
-rw-r--r-- | asn1/mms/Makefile.nmake | 62 | ||||
-rw-r--r-- | asn1/mpeg-pes/Makefile.am | 25 | ||||
-rw-r--r-- | asn1/mpeg-pes/Makefile.common | 47 | ||||
-rw-r--r-- | asn1/mpeg-pes/Makefile.nmake | 28 | ||||
-rw-r--r-- | asn1/mpeg-pes/mpeg-pes.asn (renamed from asn1/mpeg/mpeg-pes.asn) | 0 | ||||
-rw-r--r-- | asn1/mpeg-pes/mpeg-pes.cnf (renamed from asn1/mpeg/mpeg-pes.cnf) | 0 | ||||
-rw-r--r-- | asn1/mpeg-pes/packet-mpeg-pes-template.c (renamed from asn1/mpeg/packet-mpeg-pes-template.c) | 0 | ||||
-rw-r--r-- | asn1/mpeg/Makefile | 16 | ||||
-rw-r--r-- | asn1/mpeg/Makefile.am | 25 | ||||
-rw-r--r-- | asn1/mpeg/Makefile.common | 47 | ||||
-rw-r--r-- | asn1/mpeg/Makefile.nmake | 70 | ||||
-rw-r--r-- | configure.in | 3 |
16 files changed, 296 insertions, 136 deletions
diff --git a/asn1/Makefile.am b/asn1/Makefile.am index ee77accb2d..49f2bfc23e 100644 --- a/asn1/Makefile.am +++ b/asn1/Makefile.am @@ -46,6 +46,9 @@ SUBDIRS = \ inap \ ldap \ logotype-cert-extn \ + mms \ + mpeg-audio \ + mpeg-pes \ nbap \ qsig \ ranap \ @@ -58,21 +61,6 @@ SUBDIRS = \ EXTRA_DIST = \ Makefile.nmake \ - mms/Makefile \ - mms/Makefile.nmake \ - mms/mms.asn \ - mms/mms.cnf \ - mms/mms-exp.cnf \ - mms/packet-mms-template.c \ - mms/packet-mms-template.h \ - mpeg/Makefile \ - mpeg/Makefile.nmake \ - mpeg/mpeg-audio.asn \ - mpeg/mpeg-audio.cnf \ - mpeg/mpeg-pes.asn \ - mpeg/mpeg-pes.cnf \ - mpeg/packet-mpeg-audio-template.c \ - mpeg/packet-mpeg-pes-template.c \ nbap/Makefile \ ns-cert-exts/Makefile \ ns-cert-exts/Makefile.nmake \ diff --git a/asn1/mms/Makefile b/asn1/mms/Makefile deleted file mode 100644 index 3d866cecb0..0000000000 --- a/asn1/mms/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $Id$ - -DISSECTOR_FILES=packet-mms.c packet-mms.h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py mms.asn packet-mms-template.c packet-mms-template.h mms.cnf - python ../../tools/asn2wrs.py -b -X -T -e -p mms -c mms.cnf -s packet-mms-template mms.asn - -clean: - rm -f parsetab.py $(DISSECTOR_FILES) - -copy_files: generate_dissector - cp $(DISSECTOR_FILES) ../../epan/dissectors - diff --git a/asn1/mms/Makefile.am b/asn1/mms/Makefile.am new file mode 100644 index 0000000000..a034690647 --- /dev/null +++ b/asn1/mms/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/mms/Makefile.common b/asn1/mms/Makefile.common new file mode 100644 index 0000000000..1ec919acbc --- /dev/null +++ b/asn1/mms/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=mms + +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/mms/Makefile.nmake b/asn1/mms/Makefile.nmake index 5a758224c5..b3fa922696 100644 --- a/asn1/mms/Makefile.nmake +++ b/asn1/mms/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=mms -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py mms.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 mms.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/mpeg-pes/Makefile.am b/asn1/mpeg-pes/Makefile.am new file mode 100644 index 0000000000..a034690647 --- /dev/null +++ b/asn1/mpeg-pes/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/mpeg-pes/Makefile.common b/asn1/mpeg-pes/Makefile.common new file mode 100644 index 0000000000..c6638a4700 --- /dev/null +++ b/asn1/mpeg-pes/Makefile.common @@ -0,0 +1,47 @@ +# $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=mpeg-pes + +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c + +# NEED_PACKET_PROTO_H = 0 + +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 \ + $(PROTOCOL_NAME).cnf + +SRC_FILES = \ + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) + +A2W_FLAGS= -e + +EXTRA_CNF= + diff --git a/asn1/mpeg-pes/Makefile.nmake b/asn1/mpeg-pes/Makefile.nmake new file mode 100644 index 0000000000..b3fa922696 --- /dev/null +++ b/asn1/mpeg-pes/Makefile.nmake @@ -0,0 +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 +include ../Makefile.inc.nmake + diff --git a/asn1/mpeg/mpeg-pes.asn b/asn1/mpeg-pes/mpeg-pes.asn index caec6f2dc8..caec6f2dc8 100644 --- a/asn1/mpeg/mpeg-pes.asn +++ b/asn1/mpeg-pes/mpeg-pes.asn diff --git a/asn1/mpeg/mpeg-pes.cnf b/asn1/mpeg-pes/mpeg-pes.cnf index a2d0a97573..a2d0a97573 100644 --- a/asn1/mpeg/mpeg-pes.cnf +++ b/asn1/mpeg-pes/mpeg-pes.cnf diff --git a/asn1/mpeg/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c index caab6b7e3b..caab6b7e3b 100644 --- a/asn1/mpeg/packet-mpeg-pes-template.c +++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c diff --git a/asn1/mpeg/Makefile b/asn1/mpeg/Makefile deleted file mode 100644 index 28d92eb7c1..0000000000 --- a/asn1/mpeg/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $Id$ - -DISSECTOR_FILES=packet-mpeg-audio.c packet-mpeg-pes.c - -all: $(DISSECTOR_FILES) - -clean: - rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) - -copy_files: all - cp $(DISSECTOR_FILES) ../../epan/dissectors - -.PHONY: all clean copy_files - -packet-%.c: ../../tools/asn2wrs.py %.asn %.cnf packet-%-template.c - python ../../tools/asn2wrs.py -e -p $* -c $*.cnf -s packet-$*-template $*.asn diff --git a/asn1/mpeg/Makefile.am b/asn1/mpeg/Makefile.am new file mode 100644 index 0000000000..a034690647 --- /dev/null +++ b/asn1/mpeg/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/mpeg/Makefile.common b/asn1/mpeg/Makefile.common new file mode 100644 index 0000000000..02ff064a4e --- /dev/null +++ b/asn1/mpeg/Makefile.common @@ -0,0 +1,47 @@ +# $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=mpeg-audio + +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c + +# NEED_PACKET_PROTO_H = 0 + +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 \ + $(PROTOCOL_NAME).cnf + +SRC_FILES = \ + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) + +A2W_FLAGS= -e + +EXTRA_CNF= + diff --git a/asn1/mpeg/Makefile.nmake b/asn1/mpeg/Makefile.nmake index 34e89794ae..b3fa922696 100644 --- a/asn1/mpeg/Makefile.nmake +++ b/asn1/mpeg/Makefile.nmake @@ -1,54 +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=mpeg -MPEG_AUDIO=packet-$(PROTOCOL_NAME)-audio.c -MPEG_PES=packet-$(PROTOCOL_NAME)-pes.c -DISSECTOR_FILES=$(MPEG_AUDIO) $(MPEG_PES) -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(MPEG_AUDIO): ../../tools/asn2wrs.py $(PROTOCOL_NAME)-audio.asn packet-$(PROTOCOL_NAME)-audio-template.c $(PROTOCOL_NAME)-audio.cnf -!IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -e -p $(PROTOCOL_NAME)-audio -c $(PROTOCOL_NAME)-audio.cnf -s packet-$(PROTOCOL_NAME)-audio-template mpeg-audio.asn -!ELSE - @echo Error: You need Python to use asn2wrs.py - @exit 1 -!ENDIF - -$(MPEG_PES): ../../tools/asn2wrs.py $(PROTOCOL_NAME)-pes.asn packet-$(PROTOCOL_NAME)-pes-template.c $(PROTOCOL_NAME)-pes.cnf -!IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -e -p $(PROTOCOL_NAME)-pes -c $(PROTOCOL_NAME)-pes.cnf -o $(PROTOCOL_NAME)-pes -s packet-$(PROTOCOL_NAME)-pes-template $(PROTOCOL_NAME)-pes.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)-audio.c packet-$(PROTOCOL_NAME)-audio.c.tmp - move packet-$(PROTOCOL_NAME)-pes.c packet-$(PROTOCOL_NAME)-pes.c.tmp - $(UNIX2DOS) < packet-$(PROTOCOL_NAME)-audio.c.tmp > packet-$(PROTOCOL_NAME)-audio.c - $(UNIX2DOS) < packet-$(PROTOCOL_NAME)-pes.c.tmp > packet-$(PROTOCOL_NAME)-pes.c - del /f packet-$(PROTOCOL_NAME)-audio.c.tmp packet-$(PROTOCOL_NAME)-pes.c.tmp +include Makefile.common +include ../../config.nmake +include ../Makefile.inc.nmake -copy_files: generate_dissector fix_eol - xcopy packet-$(PROTOCOL_NAME)-audio.c ..\..\epan\dissectors /d /y - xcopy packet-$(PROTOCOL_NAME)-pes.c ..\..\epan\dissectors /d /y diff --git a/configure.in b/configure.in index c2c2d8670a..feef1044e8 100644 --- a/configure.in +++ b/configure.in @@ -1495,6 +1495,9 @@ AC_OUTPUT( asn1/inap/Makefile asn1/ldap/Makefile asn1/logotype-cert-extn/Makefile + asn1/mms/Makefile + asn1/mpeg-audio/Makefile + asn1/mpeg-pes/Makefile asn1/nbap/Makefile asn1/qsig/Makefile asn1/ranap/Makefile |