From c2e3c9efb444dd00c538e0c55666e09fa530ced2 Mon Sep 17 00:00:00 2001
From: Gilbert Ramirez <gram@alumni.rice.edu>
Date: Fri, 24 Sep 1999 04:59:52 +0000
Subject: [PATCH] Many more packaging changes. Lets compilation with new gtk
 subdirectory work if build tree is different than source tree. Some wiretap
 files had to be added to the list of deliverables.

svn path=/trunk/; revision=717
---
 Makefile.am         | 9 ++++++---
 configure.in        | 6 +++---
 wiretap/Makefile.am | 6 +++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 13a9804d52..f013447298 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.75 1999/09/24 03:43:03 gram Exp $
+# $Id: Makefile.am,v 1.76 1999/09/24 04:59:45 gram Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -159,7 +159,7 @@ rdps: rdps.c
 	$(CC) -o rdps $(srcdir)/rdps.c
 
 randpkt.o: randpkt.c
-	$(CC) -DHAVE_CONFIG_H `glib-config --cflags` -c $(srcdir)/randpkt.c
+	$(CC) -DHAVE_CONFIG_H -I. `glib-config --cflags` -c $(srcdir)/randpkt.c
 
 randpkt: randpkt.o wiretap/libwiretap.a
 	$(LINK) -o randpkt randpkt.o wiretap/libwiretap.a `glib-config --libs` -lz
@@ -175,18 +175,21 @@ EXTRA_DIST = \
 	doc/Makefile.am         \
 	doc/dfilter2pod.in      \
 	doc/ethereal.pod.template \
+	doc/randpkt.txt		\
 	ethereal.spec.in         \
 	image/icon-excl.xpm     \
 	image/icon-ethereal.xpm \
 	Makefile.nmake		\
 	manuf                   \
 	print.ps                \
+	README.irix		\
 	README.linux		\
 	README.tru64		\
 	README.win32		\
+	randpkt.c		\
 	rdps.c
 
-SUBDIRS = wiretap gtk @SUBDIRS@
+SUBDIRS = wiretap gtk @ethereal_SUBDIRS@
 
 ethereal.1: ethereal doc/ethereal.pod.template
 	(cd doc ; \
diff --git a/configure.in b/configure.in
index 9c38b06d45..97dec2aaa9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.44 1999/09/24 03:28:59 gram Exp $
+# $Id: configure.in,v 1.45 1999/09/24 04:59:45 gram Exp $
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(etypes.h)
 
@@ -29,7 +29,7 @@ else
   AC_MSG_RESULT(no)
 fi
 
-CFLAGS="$CFLAGS -Iwiretap"
+CFLAGS="$CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap"
 
 # Create DATAFILE_DIR #define for config.h
 DATAFILE_DIR=$sysconfdir
@@ -165,7 +165,7 @@ AC_SUBST(STRERROR_C)
 AC_SUBST(STRERROR_O)
 
 dnl blank for now, but will be used in future
-AC_SUBST(SUBDIRS)
+AC_SUBST(ethereal_SUBDIRS)
 
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SUBDIRS(wiretap)
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 048120cabd..532a37feba 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Wiretap
 #
-# $Id: Makefile.am,v 1.20 1999/09/11 04:50:43 gerald Exp $
+# $Id: Makefile.am,v 1.21 1999/09/24 04:59:52 gram Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -38,6 +38,7 @@ libwiretap_a_SOURCES = \
 	buffer.c		\
 	buffer.h		\
 	file.c			\
+	file.h			\
 	iptrace.c		\
 	iptrace.h		\
 	lanalyzer.c		\
@@ -58,6 +59,9 @@ libwiretap_a_SOURCES = \
 	wtap.h
 
 EXTRA_DIST = \
+	ascend-grammar.c	\
+	ascend-grammar.h	\
+	ascend-scanner.c	\
 	config.h.win32		\
 	Makefile.nmake