Convert to new Makefile structure. Rename some files to
authorJörg Mayer <jmayer@loplof.de>
Tue, 9 Oct 2007 01:25:40 +0000 (01:25 -0000)
committerJörg Mayer <jmayer@loplof.de>
Tue, 9 Oct 2007 01:25:40 +0000 (01:25 -0000)
use same spelling as generated protocol name.

svn path=/trunk/; revision=23104

asn1/Makefile.am
asn1/logotype-cert-extn/Makefile [deleted file]
asn1/logotype-cert-extn/Makefile.am [new file with mode: 0644]
asn1/logotype-cert-extn/Makefile.common [new file with mode: 0644]
asn1/logotype-cert-extn/Makefile.nmake
asn1/logotype-cert-extn/logotypecertextn.cnf [moved from asn1/logotype-cert-extn/logotype-cert-extn.cnf with 100% similarity]
asn1/logotype-cert-extn/packet-logotypecertextn-template.c [moved from asn1/logotype-cert-extn/packet-logotype-cert-extn-template.c with 100% similarity]
asn1/logotype-cert-extn/packet-logotypecertextn-template.h [moved from asn1/logotype-cert-extn/packet-logotype-cert-extn-template.h with 100% similarity]
configure.in

index f4717fab5c59314fc2581d37fa7a6111cd01b26f..ee77accb2dda1e730c8945aff7f73116cca0d1b7 100644 (file)
@@ -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 (file)
index 62951e6..0000000
+++ /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 (file)
index 0000000..a034690
--- /dev/null
@@ -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 (file)
index 0000000..9f93648
--- /dev/null
@@ -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=
+
index b3976e7b43c22077df9262e86d66d6b9fa1895a1..b3fa922696f2467a745356babed96c8c7dc11de3 100644 (file)
@@ -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
index 1ce4b5a5369a6fe065d40f4bece1755267febe98..c2c2d8670a1f1da8d8d5f175beeca28dbbe9d964 100644 (file)
@@ -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