From Joakim Wiberg: update to the CIP dissector, reverting to the

"EtherNet/IP" name in his original version ("IP" there is "Industrial
Protocol", not "Internet Protocol"), and to the original file name, and
getting rid of some unused variables.

svn path=/trunk/; revision=7851

Makefile.am

@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.588 2003/06/11 09:17:00 guy Exp $
+# $Id: Makefile.am,v 1.589 2003/06/11 22:36:17 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -112,7 +112,6 @@ DISSECTOR_SRC = \
 	packet-cdp.c   \
 	packet-cgmp.c  \
 	packet-chdlc.c  \
-	packet-cip.c   \
 	packet-clearcase.c  \
 	packet-clip.c  \
 	packet-clnp.c  \
@@ -185,6 +184,7 @@ DISSECTOR_SRC = \
 	packet-eapol.c \
 	packet-eigrp.c \
 	packet-enc.c	\
+	packet-enip.c   \
 	packet-esis.c  \
 	packet-eth.c   \
 	packet-etherip.c	\

Makefile.nmake

@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.305 2003/06/11 09:02:18 guy Exp $
+# $Id: Makefile.nmake,v 1.306 2003/06/11 22:36:17 guy Exp $
 
 include config.nmake
 include <win32.mak>
@@ -55,7 +55,6 @@ DISSECTOR_SRC = \
 	packet-cdp.c   \
 	packet-cgmp.c  \
 	packet-chdlc.c  \
-	packet-cip.c   \
 	packet-clearcase.c  \
 	packet-clip.c  \
 	packet-clnp.c  \
@@ -128,6 +127,7 @@ DISSECTOR_SRC = \
 	packet-eapol.c \
 	packet-eigrp.c \
 	packet-enc.c	\
+	packet-enip.c   \
 	packet-esis.c  \
 	packet-eth.c   \
 	packet-etherip.c	\