osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Gilbert Ramirez 1999-09-24 04:59:52 +00:00
parent 70cd911f61
commit c2e3c9efb4
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@ -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 ; \

6
configure.in
View File

@ -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)

6
wiretap/Makefile.am
View File

@ -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