Update of /cvsroot/audacity/audacity-src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv26469
Modified Files:
configure configure.in Makefile.in
Log Message:
Removing help
Index: Makefile.in
===================================================================
RCS file: /cvsroot/audacity/audacity-src/Makefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile.in 7 Aug 2005 20:46:14 -0000 1.21
+++ Makefile.in 18 Mar 2007 01:42:53 -0000 1.22
@@ -11,7 +11,7 @@
EXTRAUNINSTALLTARGETS= @EXTRAUNINSTALLTARGETS@
.PHONY: all
-all: audacity help/audacity.1.gz audacity-1.2-help.htb
+all: audacity help/audacity.1.gz
.PHONY: audacity
audacity:
@@ -31,8 +31,6 @@
# install docs
$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)
- -test -f audacity-1.2-help.htb && $(INSTALL) -m 644
audacity-1.2-help.htb \
- $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/audacity-1.2-help.htb
$(INSTALL) -d $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)
$(INSTALL) -m 644 README.txt
$(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/README.txt
$(INSTALL) -m 644 LICENSE.txt
$(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/LICENSE.txt
@@ -82,10 +80,6 @@
# gzipping the file this way prevents audacity.1 from getting deleted
cat help/audacity.1 | gzip -9 > help/audacity.1.gz
-audacity-1.2-help.htb: help/wxhelp/*
- rm -f audacity-1.2-help.htb
- cd help/wxhelp && $(ZIP) ../../audacity-1.2-help.htb *.htm images/*.png
*.hhc *.hhk *.hhp
-
dox:
doxygen audacity.dox
@@ -99,8 +93,6 @@
$(MAKE) -C lib-src clean
$(MAKE) -C src clean
$(MAKE) -C tests clean
- rm -f audacity-help.htb
- rm -f audacity-1.2-help.htb
rm -f audacity
rm -f help/audacity.1.gz
Index: configure
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- configure 21 Jan 2007 16:27:03 -0000 1.102
+++ configure 18 Mar 2007 01:42:53 -0000 1.103
@@ -1,54 +1,25 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.59.
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
[...9356 lines suppressed...]
- { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure
$ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args
--cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+ { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args
--cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+echo "$as_me: running $ac_sub_configure $ac_sub_configure_args
--cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
# The eval makes quoting arguments work.
- eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
- --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
+ eval $ac_sub_configure $ac_sub_configure_args \
+ --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir"
>&5
echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
{ (exit 1); exit 1; }; }
fi
- cd "$ac_popdir"
+ cd $ac_popdir
done
fi
Index: configure.in
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- configure.in 21 Jan 2007 16:27:03 -0000 1.95
+++ configure.in 18 Mar 2007 01:42:53 -0000 1.96
@@ -320,27 +320,6 @@
use_rtaudio=$withval,
use_rtaudio="no")
-AC_ARG_WITH(help,
- [AC_HELP_STRING([--with-help],
- [Make the help file "audacity-1.2-help.htb" [default=yes]])],
- use_help=$withval,
- use_help="yes")
-
-dnl if [[ $use_help = "yes" ]] ; then
-dnl enable help
-dnl fi
-
-dnl --- look for "ZIP"
-
-AC_PATH_PROG(ZIP, zip, no)
-if [[ $ZIP = "no" ]] ; then
- AC_MSG_ERROR("Could not find zip - needed to create the help file");
-
- dnl TODO
-
- dnl make non-fatal - i.e. just don't build help
-fi
-
dnl --- check for required libraries ---
dnl wxWidgets -- we assume that if wx-config is found, wxWidgets is
successfully installed.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
