Include files from the "epan" directory and subdirectories thereof with

"epan/..." pathnames, so as to avoid collisions with header files in any
of the directories in which we look (e.g., "proto.h", as some other
package has its own "proto.h" file which it installs in the top-level
include directory).

Don't add "-I" flags to search "epan", as that's no longer necessary
(and we want includes of "epan" headers to fail if the "epan/" is left
out, so that we don't re-introduce includes lacking "epan/").

svn path=/trunk/; revision=4586

9 files changed, 21 insertions, 21 deletions

diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index 9215ba64c0..ee5ea02043 100644
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -1,12 +1,12 @@
 #
-# $Id: Makefile.nmake,v 1.11 2001/12/12 01:29:08 guy Exp $
+# $Id: Makefile.nmake,v 1.12 2002/01/21 07:37:45 guy Exp $
 #
 
 include ..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I.. /I../epan /I../wiretap /I. \
+CFLAGS=/DHAVE_CONFIG_H /I.. /I../wiretap /I. \
 	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
 	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
 	/I$(PCAP_DIR)\include $(LOCAL_CFLAGS)
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index a676cc0290..12d6ed1686 100644
--- a/plugins/giop/Makefile.nmake
+++ b/plugins/giop/Makefile.nmake
@@ -1,12 +1,12 @@
 #
-# $Id: Makefile.nmake,v 1.4 2001/12/12 01:29:09 guy Exp $
+# $Id: Makefile.nmake,v 1.5 2002/01/21 07:37:46 guy Exp $
 #
 
 include ..\..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../epan /I../../wiretap \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
 	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
 	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
 	/I$(PCAP_DIR)\include $(LOCAL_CFLAGS)
diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c
index 5d1705c7d3..7eb0e0aac6 100644
--- a/plugins/giop/packet-coseventcomm.c
+++ b/plugins/giop/packet-coseventcomm.c
@@ -60,8 +60,8 @@
 
 #include <string.h>
 #include <glib.h>
-#include "packet.h"
-#include "proto.h"
+#include <epan/packet.h>
+#include <epan/proto.h>
 #include "packet-giop.h"
 
 #include "plugins/plugin_api_defs.h"
diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c
index 5bd3a3f115..32282594f9 100644
--- a/plugins/giop/packet-cosnaming.c
+++ b/plugins/giop/packet-cosnaming.c
@@ -61,8 +61,8 @@
 
 #include <string.h>
 #include <glib.h>
-#include "packet.h"
-#include "proto.h"
+#include <epan/packet.h>
+#include <epan/proto.h>
 #include "packet-giop.h"
 
 #include "plugins/plugin_api_defs.h"
diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index dad3f4d622..768c014077 100644
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -1,12 +1,12 @@
 #
-# $Id: Makefile.nmake,v 1.6 2001/12/12 01:29:10 guy Exp $
+# $Id: Makefile.nmake,v 1.7 2002/01/21 07:37:48 guy Exp $
 #
 
 include ..\..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../epan /I../../wiretap \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
 	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
 	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
 	/I$(PCAP_DIR)\include $(LOCAL_CFLAGS)
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index fdc451179c..311f8afdf0 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -3,7 +3,7 @@
  * By Steve Limkemann <stevelim@dgtech.com>
  * Copyright 1998 Steve Limkemann
  *
- * $Id: packet-gryphon.c,v 1.26 2001/12/10 00:26:20 guy Exp $
+ * $Id: packet-gryphon.c,v 1.27 2002/01/21 07:37:48 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -44,7 +44,7 @@
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
-#include "packet.h"
+#include <epan/packet.h>
 #include "packet-gryphon.h"
 
 #include "plugins/plugin_api_defs.h"
diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake
index a1f12b9cfe..a925755d83 100644
--- a/plugins/mgcp/Makefile.nmake
+++ b/plugins/mgcp/Makefile.nmake
@@ -1,12 +1,12 @@
 #
-# $Id: Makefile.nmake,v 1.3 2001/12/12 01:29:11 guy Exp $
+# $Id: Makefile.nmake,v 1.4 2002/01/21 07:37:49 guy Exp $
 #
 
 include ..\..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../epan /I../../wiretap \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
 	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
 	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
 	/I$(PCAP_DIR)\include $(LOCAL_CFLAGS)
diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c
index 5e09043b42..417c69ee9f 100644
--- a/plugins/mgcp/packet-mgcp.c
+++ b/plugins/mgcp/packet-mgcp.c
@@ -2,7 +2,7 @@
  * Routines for mgcp packet disassembly
  * RFC 2705
  *
- * $Id: packet-mgcp.c,v 1.30 2002/01/20 23:25:55 guy Exp $
+ * $Id: packet-mgcp.c,v 1.31 2002/01/21 07:37:49 guy Exp $
  * 
  * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
  *
@@ -47,10 +47,10 @@
 #include <ctype.h>
 #include <time.h>
 #include <string.h>
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
 #include "prefs.h"
-#include "strutil.h"
+#include <epan/strutil.h>
 
 #include "plugins/plugin_api_defs.h"
 
diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h
index f9bc5af54b..fdefaf07e4 100644
--- a/plugins/plugin_api.h
+++ b/plugins/plugin_api.h
@@ -1,7 +1,7 @@
 /* plugin_api.h
  * Routines for Ethereal plugins.
  *
- * $Id: plugin_api.h,v 1.33 2002/01/05 04:12:17 gram Exp $
+ * $Id: plugin_api.h,v 1.34 2002/01/21 07:37:45 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -188,8 +188,8 @@
 
 #endif
 
-#include "packet.h"
-#include "conversation.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
 #include "prefs.h"
 #include "packet-giop.h"