aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2000-01-15 13:45:06 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2000-01-15 13:45:06 +0000
commitccef52a83ad609036af40a120703b70ef20f04b8 (patch)
tree39965ae29219d393e8352d57cf7ebe0454b30cc0
parent40abaa9d1eb785dfc5a9915299aa2eee82408e95 (diff)
Don't exclude register.c from the distribution tarball because we
no longer optionally compile the snmp dissector. But I left the dist-hook line in the Makefile.am in case we're ever in that situation again. svn path=/trunk/; revision=1492
-rw-r--r--Makefile.am12
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 7e0df2fbee..9974fe725c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
-# $Id: Makefile.am,v 1.155 2000/01/15 13:25:13 gram Exp $
+# $Id: Makefile.am,v 1.156 2000/01/15 13:45:06 gram Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@@ -399,6 +399,12 @@ EXTRA_DIST = \
TODO
#
+# Currently register.c can be included in the distribution because
+# we always build all protocol dissectors. We used to have to check
+# whether or not to build the snmp dissector. If we again need to
+# variably build something, making register.c non-portable, uncomment
+# the dist-hook line below.
+#
# Oh, yuk. We don't want to include "register.c" in the distribution, as
# its contents depend on the configuration, and therefore we want it
# to be built when the first "make" is done; however, Automake insists
@@ -407,8 +413,8 @@ EXTRA_DIST = \
# We work around this by having a "dist-hook" rule that deletes
# "register.c", so that "dist" won't pick it up.
#
-dist-hook:
- @rm -f $(distdir)/register.c
+#dist-hook:
+# @rm -f $(distdir)/register.c
SUBDIRS = wiretap gtk plugins @ethereal_SUBDIRS@