diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | epan/configure.in | 4 | ||||
| -rw-r--r-- | help/Makefile.am | 48 |
4 files changed, 57 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index cc926ce7a3..a6cdc08bc7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.668 2003/12/13 00:38:09 gerald Exp $ +# $Id: Makefile.am,v 1.669 2003/12/13 18:05:48 gerald Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -1303,12 +1303,12 @@ endif #dist-hook: # @rm -f $(distdir)/register.c -DIST_SUBDIRS = tools wiretap doc epan plugins packaging gtk +DIST_SUBDIRS = tools wiretap doc epan plugins packaging gtk help if HAVE_PLUGINS -SUBDIRS = tools wiretap doc epan plugins packaging @ethereal_SUBDIRS@ +SUBDIRS = tools wiretap doc epan plugins packaging help @ethereal_SUBDIRS@ else -SUBDIRS = tools wiretap doc epan packaging @ethereal_SUBDIRS@ +SUBDIRS = tools wiretap doc epan packaging help @ethereal_SUBDIRS@ endif ethereal.1: ethereal doc/ethereal.pod diff --git a/configure.in b/configure.in index 8d3ed407dc..b19c9bc46e 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.235 2003/12/10 21:50:04 gerald Exp $ +# $Id: configure.in,v 1.236 2003/12/13 18:05:48 gerald Exp $ dnl dnl Process this file with autoconf 2.13 or later to produce a dnl configure script; 2.12 doesn't generate a "configure" script that @@ -17,7 +17,7 @@ dnl Check for CPU / vendor / OS AC_CANONICAL_HOST AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(ethereal, 0.10.0) +AM_INIT_AUTOMAKE(ethereal, 0.10.0a) dnl Checks for programs. AC_PROG_CC @@ -855,6 +855,7 @@ AC_OUTPUT( Makefile doc/Makefile gtk/Makefile + help/Makefile packaging/Makefile packaging/nsis/Makefile packaging/rpm/Makefile diff --git a/epan/configure.in b/epan/configure.in index 61d2ce21d6..a57e2533b1 100644 --- a/epan/configure.in +++ b/epan/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.52 2003/12/11 18:37:13 guy Exp $ +# $Id: configure.in,v 1.53 2003/12/13 18:05:48 gerald Exp $ dnl dnl Process this file with autoconf 2.13 or later to produce a dnl configure script; 2.12 doesn't generate a "configure" script that @@ -17,7 +17,7 @@ dnl Check for CPU / vendor / OS AC_CANONICAL_HOST AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(libethereal.a, 0.10.0) +AM_INIT_AUTOMAKE(libethereal.a, 0.10.0a) AM_CONFIG_HEADER(config.h) dnl Checks for programs. diff --git a/help/Makefile.am b/help/Makefile.am new file mode 100644 index 0000000000..74073048e1 --- /dev/null +++ b/help/Makefile.am @@ -0,0 +1,48 @@ +# Makefile.am +# Automake file for Ethereal help files +# +# $Id: Makefile.am,v 1.1 2003/12/13 18:05:49 gerald Exp $ +# +# Ethereal - Network traffic analyzer +# By Gerald Combs <gerald@ethereal.com> +# Copyright 2003 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +SUFFIXES = .txt .h +.txt.h: $(@@:.h=.txt) + @ echo making $@ + @ rm -f $@ + $(SHELL) convert-include.sh $* + + +BUILT_SOURCES = \ + capture_filters.h \ + display_filters.h \ + faq.h \ + overview.h \ + well_known.h + + +helpfile_SOURCES = \ + capture_filters.txt \ + display_filters.txt \ + faq.txt \ + overview.txt \ + well_known.txt + +EXTRA_DIST = $(BUILT_SOURCES) $(helpfile_SOURCES) convert-include.sh Makefile.nmake + +CLEANFILES = $(BUILT_SOURCES) |