Fix "make dist".

12 files changed, 50 insertions, 38 deletions

diff --git a/Makefile.am b/Makefile.am
index 17255ef5..4c73270a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,6 @@
 #  $Id$
 #
 
-EXTRA_DIST = ChangeLog README CREDITS
+EXTRA_DIST = ChangeLog README
 
 SUBDIRS = hcid tools scripts pcmcia
diff --git a/Makefile.in b/Makefile.in
index 03dcae4e..b9a21653 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,7 +82,7 @@ PCMCIA = @PCMCIA@
 VERSION = @VERSION@
 YACC = @YACC@
 
-EXTRA_DIST = ChangeLog README CREDITS
+EXTRA_DIST = ChangeLog README
 
 SUBDIRS = hcid tools scripts pcmcia
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/configure b/configure
index fa0617ec..cb27f9a2 100755
--- a/configure
+++ b/configure
@@ -529,16 +529,6 @@ fi
 
 
 
-
-
-
-
-
-
-CFLAGS="-Wall -g -O2"
-
-
-
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -586,7 +576,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:590: checking host system type" >&5
+echo "configure:580: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -607,7 +597,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:611: checking target system type" >&5
+echo "configure:601: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -625,7 +615,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:629: checking build system type" >&5
+echo "configure:619: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -654,7 +644,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:658: checking host system type" >&5
+echo "configure:648: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -687,7 +677,7 @@ echo "$ac_t""$host" 1>&6
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:691: checking for a BSD compatible install" >&5
+echo "configure:681: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -740,7 +730,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:744: checking whether build environment is sane" >&5
+echo "configure:734: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -797,7 +787,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:801: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:791: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -826,7 +816,7 @@ fi
 
 PACKAGE=bluez-utils
 
-VERSION=1.0
+VERSION=2.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -843,7 +833,7 @@ EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:847: checking for working aclocal" >&5
+echo "configure:837: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -856,7 +846,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:860: checking for working autoconf" >&5
+echo "configure:850: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -869,7 +859,7 @@ else
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:873: checking for working automake" >&5
+echo "configure:863: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -882,7 +872,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:886: checking for working autoheader" >&5
+echo "configure:876: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -895,7 +885,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:899: checking for working makeinfo" >&5
+echo "configure:889: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -909,6 +899,16 @@ fi
 
 
 
+
+
+
+
+
+
+CFLAGS="-Wall -g -O2"
+
+
+
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -2074,10 +2074,6 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@DISTRO@%$DISTRO%g
-s%@PCMCIA@%$PCMCIA%g
-s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g
-s%@GLIB_LDFLAGS@%$GLIB_LDFLAGS%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
@@ -2104,6 +2100,10 @@ s%@AUTOMAKE@%$AUTOMAKE%g
 s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
+s%@DISTRO@%$DISTRO%g
+s%@PCMCIA@%$PCMCIA%g
+s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g
+s%@GLIB_LDFLAGS@%$GLIB_LDFLAGS%g
 s%@CC@%$CC%g
 s%@AWK@%$AWK%g
 s%@LD@%$LD%g
diff --git a/configure.in b/configure.in
index 21515cbd..27330f61 100644
--- a/configure.in
+++ b/configure.in
@@ -5,6 +5,12 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 AC_INIT()
 
+dnl Guess host type.
+AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
+
+AM_INIT_AUTOMAKE(bluez-utils, 2.0)
+
 AC_SUBST(DISTRO)
 AC_SUBST(PCMCIA)
 
@@ -15,12 +21,6 @@ CFLAGS="-Wall -g -O2"
 
 AC_PREFIX_DEFAULT()
 
-dnl Guess host type.
-AC_CANONICAL_SYSTEM
-AC_CANONICAL_HOST
-
-AM_INIT_AUTOMAKE(bluez-utils, 1.0)
-
 dnl Check for programs.
 AC_PROG_CC
 AC_PROG_AWK
diff --git a/hcid/Makefile.am b/hcid/Makefile.am
index d20885ac..59358cec 100644
--- a/hcid/Makefile.am
+++ b/hcid/Makefile.am
@@ -4,7 +4,7 @@
 
 sbin_PROGRAMS = hcid
 
-hcid_SOURCES = main.c security.c hcid.h lib.c lib.h parser.y lexer.l kword.c
+hcid_SOURCES = main.c security.c hcid.h lib.c lib.h parser.h parser.y lexer.l kword.h kword.c
 hcid_LDADD   = @GLIB_LDFLAGS@
 
 INCLUDES = @GLIB_CFLAGS@
diff --git a/hcid/Makefile.in b/hcid/Makefile.in
index 4f8abc86..f21d31b8 100644
--- a/hcid/Makefile.in
+++ b/hcid/Makefile.in
@@ -84,7 +84,7 @@ YACC = @YACC@
 
 sbin_PROGRAMS = hcid
 
-hcid_SOURCES = main.c security.c hcid.h lib.c lib.h parser.y lexer.l kword.c
+hcid_SOURCES = main.c security.c hcid.h lib.c lib.h parser.h parser.y lexer.l kword.h kword.c
 hcid_LDADD = @GLIB_LDFLAGS@
 
 INCLUDES = @GLIB_CFLAGS@
diff --git a/pcmcia/Makefile.am b/pcmcia/Makefile.am
index 3664b3e7..485bb06b 100644
--- a/pcmcia/Makefile.am
+++ b/pcmcia/Makefile.am
@@ -2,7 +2,9 @@
 #  $Id$
 #
 
-pcmciadir = /etc/pcmcia
+pcmciadir  = /etc/pcmcia
+
+EXTRA_DIST = bluetooth bluetooth.conf
 
 install-data-local: @PCMCIA@
 
diff --git a/pcmcia/Makefile.in b/pcmcia/Makefile.in
index ed120814..d8fbc707 100644
--- a/pcmcia/Makefile.in
+++ b/pcmcia/Makefile.in
@@ -83,6 +83,8 @@ VERSION = @VERSION@
 YACC = @YACC@
 
 pcmciadir = /etc/pcmcia
+
+EXTRA_DIST = bluetooth bluetooth.conf
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 117c3186..4d86094a 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -4,6 +4,8 @@
 
 bin_SCRIPTS = bluepin
 
+EXTRA_DIST  = bluepin bluetooth.rc.rh bluetooth.rc.deb
+
 install-data-local: @DISTRO@
 
 unknown:
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index ccc6f79f..a6e9f552 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -83,6 +83,8 @@ VERSION = @VERSION@
 YACC = @YACC@
 
 bin_SCRIPTS = bluepin
+
+EXTRA_DIST = bluepin bluetooth.rc.rh bluetooth.rc.deb
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 SCRIPTS =  $(bin_SCRIPTS)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index f8312834..c1a82d7f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,3 +10,5 @@ bin_PROGRAMS  = hcitool l2ping
 man_MANS      = hciattach.8 l2ping.8
 
 noinst_PROGRAMS	= l2test scotest
+
+EXTRA_DIST    = $(man_MANS)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 9070c880..794cfeca 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -89,6 +89,8 @@ bin_PROGRAMS = hcitool l2ping
 man_MANS = hciattach.8 l2ping.8
 
 noinst_PROGRAMS = l2test scotest
+
+EXTRA_DIST = $(man_MANS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)