put next few simple ASN.1 dissectors into the new makefile structure

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22994 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/Makefile.am b/asn1/Makefile.am
index e083de4554c42e8e9fa5db8d492d4b1e81c3ff41..b6ba419378dbcc4be7fc31e85c854ac6c72023b9 100644 (file)
--- a/asn1/Makefile.am
+++ b/asn1/Makefile.am
@@ -33,7 +33,11 @@ SUBDIRS = \
        nbap    \
        ranap   \
        rnsap   \
-       sabp
+       rrc     \
+       rrlp    \
+       sabp    \
+       t38     \
+       ulp
 
 EXTRA_DIST = \
        Makefile.nmake  \
@@ -350,21 +354,6 @@ EXTRA_DIST = \
        ros/Remote-Operations-Useful-Definitions.asn    \
        ros/ros.cnf     \
        ros/ros-exp.cnf \
-       rrc/Makefile    \
-       rrc/Makefile.nmake      \
-       rrc/packet-rrc-template.c       \
-       rrc/Class-definitions.asn       \
-       rrc/PDU-definitions.asn \
-       rrc/InformationElements.asn \
-       rrc/Constant-definitions.asn \
-       rrc/Internode-definitions.asn   \
-       rrc/rrc.cnf     \
-       rrlp/Makefile   \
-       rrlp/Makefile.nmake     \
-       rrlp/packet-rrlp-template.c     \
-       rrlp/RRLP-Messages.asn  \
-       rrlp/RRLP-Components.asn        \
-       rrlp/rrlp.cnf   \
        rtse/Makefile   \
        rtse/Makefile.nmake     \
        rtse/packet-rtse-template.c     \
@@ -397,12 +386,6 @@ EXTRA_DIST = \
        spnego/packet-spnego-template.h \
        spnego/spnego.asn       \
        spnego/spnego.cnf       \
-       t38/t38.cnf     \
-       t38/T38(2002).asn       \
-       t38/Makefile    \
-       t38/Makefile.nmake      \
-       t38/packet-t38-template.c       \
-       t38/packet-t38-template.h       \
        tcap/Makefile   \
        tcap/Makefile.nmake     \
        tcap/packet-tcap-template.c     \
@@ -414,13 +397,6 @@ EXTRA_DIST = \
        tcap/TCAPPackage.asn    \
        tcap/UnidialoguePDUs.asn        \
        tcap/tcap.cnf   \
-       ulp/Makefile    \
-       ulp/Makefile.nmake      \
-       ulp/packet-ulp-template.c       \
-       ulp/ULP.asn     \
-       ulp/SUPL.asn    \
-       ulp/ULP-Components.asn  \
-       ulp/ulp.cnf     \
        wlancertextn/Makefile   \
        wlancertextn/Makefile.nmake     \
        wlancertextn/packet-wlancertextn-template.c     \

diff --git a/asn1/rrc/Makefile b/asn1/rrc/Makefile
deleted file mode 100644 (file)
index 6922630..0000000
--- a/asn1/rrc/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id$
-
-DISSECTOR_FILES=packet-rrc.c
-RRC_ASN=Class-definitions.asn PDU-definitions.asn InformationElements.asn Constant-definitions.asn Internode-definitions.asn
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(RRC_ASN) packet-rrc-template.c rrc.cnf
-       python ../../tools/asn2wrs.py -p rrc -c rrc.cnf -s packet-rrc-template $(RRC_ASN)
-
-clean:
-       rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-       cp $(DISSECTOR_FILES) ../../epan/dissectors
-

diff --git a/asn1/rrc/Makefile.nmake b/asn1/rrc/Makefile.nmake
index e1408078608e7713fb6a26a814b3f2f0b947c126..b3fa922696f2467a745356babed96c8c7dc11de3 100644 (file)
--- a/asn1/rrc/Makefile.nmake
+++ b/asn1/rrc/Makefile.nmake
@@ -1,40 +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=rrc
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c 
-RRC_ASN=Class-definitions.asn PDU-definitions.asn InformationElements.asn Constant-definitions.asn Internode-definitions.asn
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(RRC_ASN) packet-rrc-template.c rrc.cnf
-!IFDEF PYTHON
-       $(PYTHON) "../../tools/asn2wrs.py" -p $(PROTOCOL_NAME) -c rrc.cnf -s packet-rrc-template $(RRC_ASN)
-!ELSE
-       @echo Error: You need Python to use asn2wrs.py
-       @exit 1
-!ENDIF
-
-clean:
-       rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES)
-
-# 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
-       $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c
-       del /f packet-$(PROTOCOL_NAME).c.tmp
 
-copy_files: generate_dissector fix_eol
-       xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+include Makefile.common
+include ../../config.nmake
+include ../Makefile.inc.nmake
 

diff --git a/asn1/rrlp/Makefile b/asn1/rrlp/Makefile
deleted file mode 100644 (file)
index 71d5c00..0000000
--- a/asn1/rrlp/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id$
-
-DISSECTOR_FILES=packet-rrlp.c
-RRLP_ASN=RRLP-Messages.asn RRLP-Components.asn ../gsmmap/MAP-ExtensionDataTypes.asn ../gsmmap/MAP-LCS-DataTypes.asn 
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(RRLP_ASN) packet-rrlp-template.c rrlp.cnf
-       python ../../tools/asn2wrs.py -p rrlp -c rrlp.cnf -s packet-rrlp-template $(RRLP_ASN)
-
-clean:
-       rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-       cp $(DISSECTOR_FILES) ../../epan/dissectors
-

diff --git a/asn1/rrlp/Makefile.nmake b/asn1/rrlp/Makefile.nmake
index 5c4c1ac2009db0523ed838c0da994bc18e505716..b3fa922696f2467a745356babed96c8c7dc11de3 100644 (file)
--- a/asn1/rrlp/Makefile.nmake
+++ b/asn1/rrlp/Makefile.nmake
@@ -1,40 +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=rrlp
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c 
-RRLP_ASN=RRLP-Messages.asn RRLP-Components.asn ../gsmmap/MAP-ExtensionDataTypes.asn ../gsmmap/MAP-LCS-DataTypes.asn 
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(RRLP_ASN) packet-rrlp-template.c rrlp.cnf
-!IFDEF PYTHON
-       $(PYTHON) "../../tools/asn2wrs.py" -p $(PROTOCOL_NAME) -c rrlp.cnf -s packet-rrlp-template $(RRLP_ASN)
-!ELSE
-       @echo Error: You need Python to use asn2wrs.py
-       @exit 1
-!ENDIF
-
-clean:
-       rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES)
-
-# 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
-       $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c
-       del /f packet-$(PROTOCOL_NAME).c.tmp
 
-copy_files: generate_dissector fix_eol
-       xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+include Makefile.common
+include ../../config.nmake
+include ../Makefile.inc.nmake
 

diff --git a/asn1/t38/Makefile b/asn1/t38/Makefile
deleted file mode 100644 (file)
index 95ca7af..0000000
--- a/asn1/t38/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id$
-
-PROTOCOL_NAME=t38
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-T38_ASN=T38\(2002\).asn
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py packet-t38-template.c packet-t38-template.h t38.cnf
-       python ../../tools/asn2wrs.py -p $(PROTOCOL_NAME) -c t38.cnf -s packet-t38-template $(T38_ASN)
-
-clean:
-       rm -f parsetab.py $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-       cp $(DISSECTOR_FILES) ../../epan/dissectors

diff --git a/asn1/t38/Makefile.nmake b/asn1/t38/Makefile.nmake
index ee234c2ab5fb89e59bb42bf43ded43596a9613d0..b3fa922696f2467a745356babed96c8c7dc11de3 100644 (file)
--- a/asn1/t38/Makefile.nmake
+++ b/asn1/t38/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=t38
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
-T38_ASN=T38(2002).asn
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(T38_ASN) packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf
-!IFDEF PYTHON
-       $(PYTHON) "../../tools/asn2wrs.py" -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(T38_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/ulp/Makefile b/asn1/ulp/Makefile
deleted file mode 100644 (file)
index 286d4fa..0000000
--- a/asn1/ulp/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id$
-
-DISSECTOR_FILES=packet-ulp.c
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py ULP.asn SUPL.asn ULP-Components.asn packet-ulp-template.c ulp.cnf
-       python ../../tools/asn2wrs.py -p ulp -c ulp.cnf -s packet-ulp-template  ULP.asn SUPL.asn ULP-Components.asn
-
-clean:
-       rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES)
-
-copy_files: generate_dissector
-       cp $(DISSECTOR_FILES) ../../epan/dissectors
-

diff --git a/asn1/ulp/Makefile.nmake b/asn1/ulp/Makefile.nmake
index 7c67989423ef4a01af5139379f5c3ee6e5f308ac..b3fa922696f2467a745356babed96c8c7dc11de3 100644 (file)
--- a/asn1/ulp/Makefile.nmake
+++ b/asn1/ulp/Makefile.nmake
@@ -1,44 +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=ulp
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c
-ULP_ASN=ULP.asn SUPL.asn ULP-Components.asn
-
-all: generate_dissector
-
-generate_dissector: $(DISSECTOR_FILES)
-
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(ULP_ASN) packet-ulp-template.c ulp.cnf
-!IFDEF PYTHON
-       $(PYTHON) "../../tools/asn2wrs.py" -p $(PROTOCOL_NAME) -c ulp.cnf -s packet-ulp-template $(ULP_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
-       $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c
-       del /f packet-$(PROTOCOL_NAME).c.tmp
 
-copy_files: generate_dissector fix_eol
-       xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+include Makefile.common
+include ../../config.nmake
+include ../Makefile.inc.nmake
 

diff --git a/config.nmake b/config.nmake
index 7a9ce5a526ef8500644fcef78808b2c818e702ff..43cc1c8a65c4fa6b8ffd0c7faa670aa04362bd38 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -29,7 +29,7 @@ WTAP_VERSION_MICRO=1
 # Base directory, where your libraries reside, which are needed to 
 # compile the sources. This setting is used only inside this file.
 #
-WIRESHARK_LIBS=C:\wireshark-win32-libs
+WIRESHARK_LIBS=D:\Ethereal
 
 # 
 # Base directory, where your programs reside. 
@@ -319,7 +319,7 @@ POD2HTML=$(SH) pod2html
 PYTHON="C:/python24/python.exe"
 #PYTHON="C:/python25/python.exe"
 # add native python to the path (not needed if cygwin's python is used)
-PATH=c:\python24;$(PATH)
+#PATH=c:\python24;$(PATH)
 #PATH=c:\python25;$(PATH)
 
 # command for python (cygwin's python package, not recommended)
@@ -339,7 +339,7 @@ YACC=bison
 # If you don't have NSIS, comment this line out, so that MAKENSIS
 # isn't defined.
 #
-MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe"
+#MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe"
 
 #
 # Optional: To build the developers API documentation with doxygen and dot.
@@ -371,7 +371,7 @@ MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe"
 # If you don't want the online help (or don't have the tools),
 # comment this line out, so that HHC_DIR isn't defined.
 #
-HHC_DIR=$(PROGRAM_FILES)/HTML Help Workshop
+#HHC_DIR=$(PROGRAM_FILES)/HTML Help Workshop
 
 
 ##### Flags, PATHs and Miscellaneous #####
@@ -792,7 +792,7 @@ LIBWIRESHARK_CONFIG=
 !ENDIF
 
 # Construct the path
-PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH)
+PATH=$(CYGWIN_PATH);$(PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH)
 
 
 # "convert" the MSVC variant into the required MSC compiler version

diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index 9bf33f812b1475d8ce7cc5e7f091ac61eb5386ac..ae4adafb139e394b9a356a87a88b441229b6ac38 100644 (file)
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* .\packet-t38.c                                                             */
+/* ./packet-t38.c                                                             */
 /* ../../tools/asn2wrs.py -p t38 -c t38.cnf -s packet-t38-template T38(2002).asn */
 
 /* Input file: packet-t38-template.c */

diff --git a/epan/dissectors/packet-t38.h b/epan/dissectors/packet-t38.h
index 57f36107508213b9d8a821bb0cf2471a28948f11..a3a31862fe141762817dbf960d191ec653623df3 100644 (file)
--- a/epan/dissectors/packet-t38.h
+++ b/epan/dissectors/packet-t38.h
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* .\packet-t38.h                                                             */
+/* ./packet-t38.h                                                             */
 /* ../../tools/asn2wrs.py -p t38 -c t38.cnf -s packet-t38-template T38(2002).asn */
 
 /* Input file: packet-t38-template.h */