Fixed randpkt so it isn't linked to X11 libs. Removed randpkt from default

target list, so a 'make randpkt' is required if you want to build it.

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

diff --git a/Makefile.am b/Makefile.am
index 5f748d6c2c54903fc3440cc5a199ec5086c9f9bf..4af7d9e06e9780149d05bb2270ae3b92add37348 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.72 1999/09/14 08:06:22 guy Exp $
+# $Id: Makefile.am,v 1.73 1999/09/17 04:38:14 gram Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -22,7 +22,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-bin_PROGRAMS = ethereal randpkt
+bin_PROGRAMS = ethereal
 
 man_MANS = ethereal.1
 
@@ -157,11 +157,11 @@ ps.c: print.ps rdps
 rdps: rdps.c
        $(CC) -o rdps $(srcdir)/rdps.c
 
-randpkt_SOURCES = \
-       randpkt.c
+randpkt.o: randpkt.c
+       $(CC) -DHAVE_CONFIG_H `glib-config --cflags` -c $(srcdir)/randpkt.c
 
-randpkt_DEPENDENCIES = wiretap/libwiretap.a
-randpkt_LDADD = wiretap/libwiretap.a
+randpkt: randpkt.o wiretap/libwiretap.a
+       $(LINK) -o randpkt randpkt.o wiretap/libwiretap.a `glib-config --libs`
 
 DISTCLEANFILES =       \
        rdps            \

diff --git a/doc/randpkt.txt b/doc/randpkt.txt
index 1b42b2fc7de9a7b65ea9b8c843b2029eb0080679..d2eb412db1be966b52d017af50fe582aeeb5a111 100644 (file)
--- a/doc/randpkt.txt
+++ b/doc/randpkt.txt
@@ -1,10 +1,13 @@
 Random Packet Generator
 -----------------------
-$Id: randpkt.txt,v 1.2 1999/09/10 15:38:58 gram Exp $
+$Id: randpkt.txt,v 1.3 1999/09/17 04:38:23 gram Exp $
 
-This small utility creates a libpcap trace file full of random packets.
+randpkt is a small utility creates a libpcap trace file full of random packets.
 You can control the number of packets, the maximum size of each packet,
-and the type of each packet.
+and the type of each packet. It is not build by default, but you
+can create it in the top-level Ethereal directory by typing:
+
+make randpkt
 
 By creating many randomized packets of a certain type, you can
 test packet sniffers to see how well they handle malformed packets.

diff --git a/randpkt.c b/randpkt.c
index 9a2ade505677b5d5363e3d2f2cb567048aa589f1..c3a4c52b5eaf8858bb6fcbee0c8cdddf3c148507 100644 (file)
--- a/randpkt.c
+++ b/randpkt.c
@@ -4,7 +4,7 @@
  * Creates random packet traces. Useful for debugging sniffers by testing
  * assumptions about the veracity of the data found in the packet.
  *
- * $Id: randpkt.c,v 1.2 1999/09/10 15:38:48 gram Exp $
+ * $Id: randpkt.c,v 1.3 1999/09/17 04:38:14 gram Exp $
  *
  * Copyright (C) 1999 by Gilbert Ramirez <gram@xiexie.org>
  * 
@@ -42,7 +42,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <wtap.h>
+#include "wiretap/wtap.h"
 
 #define array_length(x)        (sizeof x / sizeof x[0])