- Rework the Makefile structure to generate external -cnf files

   a protocol depends on.
- Make sure we need to add asn files to only 1 Makefile instead
   of 3 (Makefile, Makefile.nmake, ../Makefile.am)
- Change the Makefiles of the camel protocol to use the new structure.

svn path=/trunk/; revision=22950

1 files changed, 71 insertions, 0 deletions

diff --git a/asn1/Makefile.inc.nmake b/asn1/Makefile.inc.nmake
new file mode 100644
index 0000000000..6a082a5be0
--- /dev/null
+++ b/asn1/Makefile.inc.nmake
@@ -0,0 +1,71 @@
+# To be included into the asn1 Makefiles for Windows builds
+#
+# $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.
+
+
+UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
+
+all: generate_dissector
+
+generate_dissector: $(DISSECTOR_FILES) $(EXTRA_CNF)
+
+$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES)
+!IFDEF PYTHON
+	$(PYTHON) "../../tools/asn2wrs.py" \
+		$(A2W_FLAGS) \
+		-p $(PROTOCOL_NAME) \
+		-c $(PROTOCOL_NAME).cnf \
+		-s packet-$(PROTOCOL_NAME)-template \
+		$(ASN_FILE_LIST)
+!ELSE
+	@echo Error: You need Python to use asn2wrs.py
+	@exit 1
+!ENDIF
+
+clean:
+	rm -f parsetab.py \
+		parsetab.pyc \
+		$(DISSECTOR_FILES) \
+		*-exp.cnf \
+		packet-*-{dis-tab,ettarr,ett,fn,hfarr,hf,table*,val}.[hc]
+
+
+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
+	xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+	xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
+