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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@717 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.am b/Makefile.am
index 13a9804d52eb500148573897e5a3028edd919d81..f013447298ea9ccb70632fc1ce83cd708fc20164 100644 (file)
--- 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 9c38b06d45aaeece7bf50fdde1fb5f7b8e32ef48..97dec2aaa9688bb573a9ec4a9fda58556e7b24f7 100644 (file)
--- 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 048120cabd980cfceaa93d175ff25a3d7674a995..532a37febafc05ca13a01f3326b00a12bed29b0f 100644 (file)
--- 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