You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(25) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
|
Feb
(6) |
Mar
(2) |
Apr
(12) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2005 |
Jan
|
Feb
(2) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
From: Simon R. <sr...@us...> - 2006-11-18 19:37:48
|
Update of /cvsroot/xvoice/xvoice/src In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30134/src Modified Files: Target.cc Log Message: Commented out _curWin test, references cannot be compared to NULL Index: Target.cc =================================================================== RCS file: /cvsroot/xvoice/xvoice/src/Target.cc,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** Target.cc 15 May 2003 14:29:35 -0000 1.32 --- Target.cc 18 Nov 2006 19:37:41 -0000 1.33 *************** *** 676,679 **** --- 676,680 ---- ret = TFOCUS; + #ifdef STRANGE_STUFF /* When we first start up, under some window managers _curWin ends up being null, and under others it doesn't. I don't fully *************** *** 683,686 **** --- 684,688 ---- _curWin = win; } + #endif // proceed to get first valid window name of nearest parent |
From: Simon R. <sr...@us...> - 2006-11-18 19:35:52
|
Update of /cvsroot/xvoice/xvoice/src In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29313/src Modified Files: Target.h Log Message: Removed class name from member declarations Index: Target.h =================================================================== RCS file: /cvsroot/xvoice/xvoice/src/Target.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Target.h 15 May 2003 14:29:35 -0000 1.19 --- Target.h 18 Nov 2006 19:35:45 -0000 1.20 *************** *** 93,97 **** */ ! int Target::sendText( const char* text ); /* --- 93,97 ---- */ ! int sendText( const char* text ); /* *************** *** 121,126 **** TargetData* data; ! winInfo::winInfo(Window w, char const* n); ! winInfo::~winInfo(); bool operator==(winInfo w) { return (w.window==window); --- 121,126 ---- TargetData* data; ! winInfo(Window w, char const* n); ! ~winInfo(); bool operator==(winInfo w) { return (w.window==window); |
From: Wes H. <har...@us...> - 2005-03-10 15:21:00
|
Update of /cvsroot/xvoice/xvoice/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9155 Modified Files: App.cc Log Message: do a mkdir on the modules directory Index: App.cc =================================================================== RCS file: /cvsroot/xvoice/xvoice/src/App.cc,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** App.cc 29 May 2004 18:00:23 -0000 1.34 --- App.cc 10 Mar 2005 15:20:48 -0000 1.35 *************** *** 40,43 **** --- 40,44 ---- #include <sys/dir.h> #include <sys/param.h> + #include <sys/stat.h> #include <sys/types.h> #include <regex.h> *************** *** 186,189 **** --- 187,191 ---- } unlink (getAutoGrammarFile().c_str()); + return 0; } *************** *** 340,343 **** --- 342,346 ---- return; + mkdir(modulesDir, 0755); if (!autof) { if ((autof = fopen(getAutoGrammarFile().c_str(),"a")) == NULL) { |
From: Brian C. <bc...@us...> - 2005-02-16 08:28:01
|
Update of /cvsroot/xvoice/xvoice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19020 Modified Files: Makefile.am Makefile.in Log Message: Added README.VNC to the distribution files Index: Makefile.in =================================================================== RCS file: /cvsroot/xvoice/xvoice/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.in 16 Feb 2005 08:22:37 -0000 1.14 --- Makefile.in 16 Feb 2005 08:27:49 -0000 1.15 *************** *** 144,148 **** target_alias = @target_alias@ EXTRA_DIST = CODEGUIDE COMMANDS xvoice.png xvoice.xml xvoice.spec.in vimcmds\ ! focustracker.c updatevnc --- 144,148 ---- target_alias = @target_alias@ EXTRA_DIST = CODEGUIDE COMMANDS xvoice.png xvoice.xml xvoice.spec.in vimcmds\ ! focustracker.c updatevnc README.VNC Index: Makefile.am =================================================================== RCS file: /cvsroot/xvoice/xvoice/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 16 Feb 2005 08:22:37 -0000 1.8 --- Makefile.am 16 Feb 2005 08:27:49 -0000 1.9 *************** *** 1,4 **** EXTRA_DIST = CODEGUIDE COMMANDS xvoice.png xvoice.xml xvoice.spec.in vimcmds\ ! focustracker.c updatevnc SUBDIRS = src --- 1,4 ---- EXTRA_DIST = CODEGUIDE COMMANDS xvoice.png xvoice.xml xvoice.spec.in vimcmds\ ! focustracker.c updatevnc README.VNC SUBDIRS = src |
From: Brian C. <bc...@us...> - 2005-02-16 08:22:46
|
Update of /cvsroot/xvoice/xvoice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18067 Modified Files: Makefile.in Makefile.am Added Files: README.VNC focustracker.c updatevnc Log Message: Added utilities for VNC --- NEW FILE: focustracker.c --- /* * focustracker.c * * Description: A utility for tracking the focus of a remote VNC * session. * * Copyright (c) 2005, Brian Craft * See the LICENSE file. All rights not granted therein are reserved. * * 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., 675 Mass Ave, Cambridge, MA 02139, USA. * */ #include <X11/Xlib.h> #include <stdlib.h> #include <unistd.h> #include <stdio.h> #include <string.h> Display *display; static unsigned char xerror; static int (*old_handler)(Display *, XErrorEvent *); int xerror_handler(Display* d, XErrorEvent *ev) { xerror = ev->error_code; return True; } static void set_trap() { xerror = 0; old_handler = XSetErrorHandler(xerror_handler); } static int remove_trap() { XSetErrorHandler(old_handler); return xerror; } #define MAX 500 void focusedTarget() { Window wx; int i; Window parent_win; Window root_win; Window *dummy_child_list; Window w; unsigned int dummy_n_children; char *n; static char last[MAX+1] = ""; XGetInputFocus(display,&wx,&i); /* wx == the current focused window in the following */ /* XGetInputFocus returns RevertToPointerRoot for most windows * but RevertToParent for GTK+ 2 windows. In the latter case * the window name is given by a parent window. We look up the * tree to find a window title below. */ // proceed to get first valid window name of nearest parent root_win = 0; for (w = wx; root_win == 0 || w != root_win; w = parent_win) { set_trap(); i = XFetchName(display, w, &n); if (remove_trap() == BadWindow) { /* * Wait for next timeout. Let bad window be gc'd. */ break; } else { if (i) // XFetchName succeeded { break; } } XQueryTree(display, w, &root_win, &parent_win, &dummy_child_list, &dummy_n_children); } if (i) { // last XFetchName succeeded if (strncmp(last, n, MAX)) { printf("%s\n", n); fflush(stdout); strncpy(last, n, MAX); } XFree(n); } } int main(int argc, char *argv[]) { char *display_name = NULL; if (argc != 2) { fprintf(stderr, "usage: %s <display>\n", argv[0]); exit(1); } display_name = argv[1]; if (!(display = XOpenDisplay(display_name))) { fprintf(stderr, "%s: can't open display %s\n", argv[0], XDisplayName(display_name)); exit(1); } while (1) { focusedTarget(); sleep(1); } } --- NEW FILE: README.VNC --- Controlling applications in a VNC window is a special problem for xvoice because the focused application cannot be detected from the local host. Additionally, new commands are needed to manage the remote windows, and xvoice cannot start applications on the remote host. Ideally xvoice would run on the remote host while talking to the local voice engine. Since that isn't currently possible, here are some work-arounds. FOCUS WINDOW The program focustracker can be run on the remote machine via ssh to determine which window is currently focused. Piping the output of this program to the updatevnc script will keep the VNC window title updated with the name of the remote focused window. Compile focustracker on the remote host with something like gcc -o focustracker -L/usr/X11R6/lib -lX11 focustracker.c Run it via ssh with something like the following, if the VNC session is display :1 on the remote host: ssh remotehost focustracker :1 | updatevnc MANAGING REMOTE WINDOWS The local window manager will intercept key events for managing windows. Your VNC viewer should have some mechanism to send these sequences, by-passing the local window manager. TightVNC allows key mappings to be reconfigured via Xt properties on the VNC window. For example, to make the left "Windows" key send a left "Alt" to the remote session, you can set the following property: *desktop.translations: #override\n\ <KeyDown>Super_L: SendRFBEvent(keydown,Alt_L)\n\ <KeyUp>Super_L: SendRFBEvent(keyup,Alt_L) On most distributions you can drop this in ~/.Xresources or ~/.Xdefaults to have it loaded when you start X. You can load it from the command line with xrdb. Then new voice commands can be written using the Super_L keysym. For example, this snippet will maximize a window in a VNC session in the default configuration of metacity: | maximize remote window -> <key char='&Super_L;' action='down'/> <key char='&F10;' /> <key char='&Super_L;' action='up'/> Index: Makefile.in =================================================================== RCS file: /cvsroot/xvoice/xvoice/Makefile.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.in 2 Apr 2004 21:35:13 -0000 1.13 --- Makefile.in 16 Feb 2005 08:22:37 -0000 1.14 *************** *** 143,147 **** sysconfdir = @sysconfdir@ target_alias = @target_alias@ ! EXTRA_DIST = CODEGUIDE COMMANDS xvoice.png xvoice.xml xvoice.spec.in vimcmds SUBDIRS = src --- 143,149 ---- sysconfdir = @sysconfdir@ target_alias = @target_alias@ ! EXTRA_DIST = CODEGUIDE COMMANDS xvoice.png xvoice.xml xvoice.spec.in vimcmds\ ! focustracker.c updatevnc ! SUBDIRS = src --- NEW FILE: updatevnc --- #!/bin/sh function reset { xprop -id $WID -set WM_NAME "$WTITLE" } function findvnc { VNCWINDOW="" while [ "x$VNCWINDOW" = "x" ]; do VNCWINDOW=`xwininfo -root -tree | grep VNC` sleep 1; done WID=`echo $VNCWINDOW | sed -e 's/ *\(0x[^ ]\+\).*/\1/'` WTITLE=`echo $VNCWINDOW | sed -e 's/ *0x[^ ]\+ "\([^"]\+\)".*/\1/'` } findvnc trap reset EXIT while true; do read title xprop -id $WID -set WM_NAME "$title" if [ $? -ne 0 ]; then findvnc fi done Index: Makefile.am =================================================================== RCS file: /cvsroot/xvoice/xvoice/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 23 Dec 2003 01:30:52 -0000 1.7 --- Makefile.am 16 Feb 2005 08:22:37 -0000 1.8 *************** *** 1,3 **** ! EXTRA_DIST = CODEGUIDE COMMANDS xvoice.png xvoice.xml xvoice.spec.in vimcmds SUBDIRS = src --- 1,4 ---- ! EXTRA_DIST = CODEGUIDE COMMANDS xvoice.png xvoice.xml xvoice.spec.in vimcmds\ ! focustracker.c updatevnc SUBDIRS = src |
From: Wes H. <har...@us...> - 2004-05-29 18:00:34
|
Update of /cvsroot/xvoice/xvoice/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11199 Modified Files: App.cc Log Message: - grammer -> grammar as requested by Jessica Index: App.cc =================================================================== RCS file: /cvsroot/xvoice/xvoice/src/App.cc,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** App.cc 20 Dec 2003 02:34:32 -0000 1.33 --- App.cc 29 May 2004 18:00:23 -0000 1.34 *************** *** 272,276 **** pathname.c_str()); } else { ! fprintf(stderr, "Loaded grammer in %s\n", pathname.c_str()); } --- 272,276 ---- pathname.c_str()); } else { ! fprintf(stderr, "Loaded grammar in %s\n", pathname.c_str()); } *************** *** 292,296 **** /* check most recently modified files. if nothing newer than the ! grammerDir save directory, then we're safe */ bool needGrammarCompile() { --- 292,296 ---- /* check most recently modified files. if nothing newer than the ! grammarDir save directory, then we're safe */ bool needGrammarCompile() { *************** *** 329,333 **** } } ! xvoice_status("Grammer files already pre-compiled"); return false; } --- 329,333 ---- } } ! xvoice_status("Grammar files already pre-compiled"); return false; } *************** *** 343,347 **** if ((autof = fopen(getAutoGrammarFile().c_str(),"a")) == NULL) { fprintf(stderr, ! "couldn't write to path %s. Auto-grammer not built\n", getAutoGrammarFile().c_str()); return; --- 343,347 ---- if ((autof = fopen(getAutoGrammarFile().c_str(),"a")) == NULL) { fprintf(stderr, ! "couldn't write to path %s. Auto-grammar not built\n", getAutoGrammarFile().c_str()); return; *************** *** 369,373 **** if ((autof = fopen(getAutoGrammarFile().c_str(),"a")) == NULL) { fprintf(stderr, ! "couldn't write to path %s. Auto-grammer not built\n", getAutoGrammarFile().c_str()); return false; --- 369,373 ---- if ((autof = fopen(getAutoGrammarFile().c_str(),"a")) == NULL) { fprintf(stderr, ! "couldn't write to path %s. Auto-grammar not built\n", getAutoGrammarFile().c_str()); return false; |
From: Wes H. <har...@us...> - 2004-05-29 17:58:15
|
Update of /cvsroot/xvoice/xvoice/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10654 Modified Files: xvoice.cc Log Message: - Create the ~/.xvoice/modules directory if it doesn't exist. Index: xvoice.cc =================================================================== RCS file: /cvsroot/xvoice/xvoice/src/xvoice.cc,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** xvoice.cc 23 Dec 2003 06:51:38 -0000 1.22 --- xvoice.cc 29 May 2004 17:58:05 -0000 1.23 *************** *** 131,135 **** void xvoice_init(VClient *cl, bool UNUSED(save)) { ! fstring filename; struct stat s; char *home=getenv("HOME"); --- 131,135 ---- void xvoice_init(VClient *cl, bool UNUSED(save)) { ! fstring filename, moduledir; struct stat s; char *home=getenv("HOME"); *************** *** 160,163 **** --- 160,172 ---- } + filename.resize(0); + filename.appendf("%s/.%s/modules", home, PACKAGE); + if (stat(filename.c_str(), &s) != 0) { + if (mkdir(filename.c_str(), 0755) < 0) { + LogMessage(E_FATAL, "Could not create data directory %s!\n", + filename.c_str()); + } + } + loadGrammars(); |
From: Jessica P. H. <jph...@ar...> - 2004-04-30 11:42:11
|
On Fri, 30 Apr 2004, Philip Rhoades wrote: > There is no voice recognition involved, we simply need a voice file that is > saved on a server from a TC so that a typist can play it back and do the > typing. This is the wrong list -- it's not a discussion list, it's for reports on cvs activity in xvoice; and even if it were for discussion, it'd be for speech recognition discussion. I'd try a general gnome mailing list; they might have ideas for you. Or even a general linux list, some LUG (Linux Users Group) list maybe? Good luck, Jessica |
From: Philip R. <ph...@ch...> - 2004-04-30 03:56:58
|
People, I have 5 Windows PC users with Winscribe: http://www.winscribe.com/ that I want to change to a Linux environment - most of the rest of the organisation (120 people) have Linux Thin Clients (TC) working with Linux servers. There is no voice recognition involved, we simply need a voice file that is saved on a server from a TC so that a typist can play it back and do the typing. Any ideas, solutions? Thanks, Phil. -- Philip Rhoades Pricom Pty Limited (ACN 003 252 275 ABN 91 003 252 275) GPO Box 3411 Sydney NSW 2001 Australia Mobile: +61:0411-185-652 Fax: +61:2:8923-5363 E-mail: ph...@pr... ______________________________________________________________________ This email has been scanned by the MessageLabs Email Security System. For more information please visit http://www.messagelabs.com/email ______________________________________________________________________ |
From: Wes H. <har...@us...> - 2004-04-02 23:25:14
|
Update of /cvsroot/xvoice/xvoice/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5650/modules Modified Files: general.xml Log Message: put the word "type" in front of the entries. This requires a change in dictated grammar, but greatly helps the diction of small phrases that sound close to letter sounds. Index: general.xml =================================================================== RCS file: /cvsroot/xvoice/xvoice/modules/general.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** general.xml 22 Dec 2003 21:09:52 -0000 1.1 --- general.xml 2 Apr 2004 23:13:00 -0000 1.2 *************** *** 5,11 **** INCLUDE "numbers.bnf" INCLUDE "keys.bnf" ! <<root>> = number {<number>} -> {1} ! | <modanychar> | <number> | <real-number> ! | <multichar> . ]]> </application> --- 5,12 ---- INCLUDE "numbers.bnf" INCLUDE "keys.bnf" ! <<root>> = type {<number>} -> {1} ! | type {<modanychar>} -> {1} ! | type {<real-number>} -> {1} ! | type {<multichar>} -> {1} . ]]> </application> |
From: Wes H. <har...@us...> - 2004-04-02 23:24:19
|
Update of /cvsroot/xvoice/xvoice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5557 Modified Files: xvoice.spec.in Log Message: changed my email address Index: xvoice.spec.in =================================================================== RCS file: /cvsroot/xvoice/xvoice/xvoice.spec.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** xvoice.spec.in 2 Apr 2004 23:11:34 -0000 1.5 --- xvoice.spec.in 2 Apr 2004 23:12:06 -0000 1.6 *************** *** 17,21 **** %changelog ! * Fri Apr 2 2004 Wes Hardaker <we...@ha...> - Second changelog entry, much more than a second RPM relase --- 17,21 ---- %changelog ! * Fri Apr 2 2004 Wes Hardaker <har...@us...> - Second changelog entry, much more than a second RPM relase |
From: Wes H. <har...@us...> - 2004-04-02 23:23:55
|
Update of /cvsroot/xvoice/xvoice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5472 Modified Files: xvoice.spec.in Log Message: added a change log entry (ha... the last one was from 2000) Index: xvoice.spec.in =================================================================== RCS file: /cvsroot/xvoice/xvoice/xvoice.spec.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** xvoice.spec.in 24 Feb 2004 20:32:34 -0000 1.4 --- xvoice.spec.in 2 Apr 2004 23:11:34 -0000 1.5 *************** *** 17,20 **** --- 17,22 ---- %changelog + * Fri Apr 2 2004 Wes Hardaker <we...@ha...> + - Second changelog entry, much more than a second RPM relase * Fri Mar 10 2000 Brian Craft <bc...@th...> |
From: Jessica P. H. <jph...@us...> - 2004-04-02 22:10:23
|
Update of /cvsroot/xvoice/xvoice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25006 Modified Files: AUTHORS Log Message: corrected the spelling of my name Index: AUTHORS =================================================================== RCS file: /cvsroot/xvoice/xvoice/AUTHORS,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AUTHORS 2 Apr 2004 21:43:07 -0000 1.6 --- AUTHORS 2 Apr 2004 21:58:10 -0000 1.7 *************** *** 2,6 **** to the project page, which has info about development and the developers. ! v0.9 by Brian Craft, Deborah Kaplan, Jessica Heckman, Wes Hardaker. v0.8 changes by Brian Craft (bc...@th...) --- 2,6 ---- to the project page, which has info about development and the developers. ! v0.9 by Brian Craft, Deborah Kaplan, Jessica Hekman, Wes Hardaker. v0.8 changes by Brian Craft (bc...@th...) |
From: Wes H. <har...@us...> - 2004-04-02 21:55:19
|
Update of /cvsroot/xvoice/xvoice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22087 Modified Files: AUTHORS Log Message: added myself Index: AUTHORS =================================================================== RCS file: /cvsroot/xvoice/xvoice/AUTHORS,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AUTHORS 16 Jan 2002 05:41:17 -0000 1.5 --- AUTHORS 2 Apr 2004 21:43:07 -0000 1.6 *************** *** 2,6 **** to the project page, which has info about development and the developers. ! v0.9 by Brian Craft, Deborah Kaplan, Jessica Heckman. v0.8 changes by Brian Craft (bc...@th...) --- 2,6 ---- to the project page, which has info about development and the developers. ! v0.9 by Brian Craft, Deborah Kaplan, Jessica Heckman, Wes Hardaker. v0.8 changes by Brian Craft (bc...@th...) |
From: Wes H. <har...@us...> - 2004-04-02 21:49:19
|
Update of /cvsroot/xvoice/xvoice/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20982/src Modified Files: wmMainWin.cc Log Message: add stdarg.h Index: wmMainWin.cc =================================================================== RCS file: /cvsroot/xvoice/xvoice/src/wmMainWin.cc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wmMainWin.cc 15 May 2003 14:29:35 -0000 1.14 --- wmMainWin.cc 2 Apr 2004 21:36:59 -0000 1.15 *************** *** 31,34 **** --- 31,35 ---- #include <cstdio> #include <cstdarg> + #include <stdarg.h> #include <X11/xpm.h> |
From: Wes H. <har...@us...> - 2004-04-02 21:48:14
|
Update of /cvsroot/xvoice/xvoice/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20840/src Modified Files: Error.cc Log Message: add stdarg.h Index: Error.cc =================================================================== RCS file: /cvsroot/xvoice/xvoice/src/Error.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Error.cc 15 May 2003 14:29:34 -0000 1.7 --- Error.cc 2 Apr 2004 21:36:02 -0000 1.8 *************** *** 29,32 **** --- 29,33 ---- #include <cstdio> #include <cstdarg> + #include <stdarg.h> #include "Error.h" |
From: Wes H. <har...@us...> - 2004-04-02 21:47:36
|
Update of /cvsroot/xvoice/xvoice/src/expat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20660/src/expat Modified Files: Makefile.am Makefile.in Log Message: Update to a recent automake Index: Makefile.in =================================================================== RCS file: /cvsroot/xvoice/xvoice/src/expat/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile.in 23 Dec 2003 06:54:35 -0000 1.11 --- Makefile.in 2 Apr 2004 21:35:18 -0000 1.12 *************** *** 1,6 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation --- 1,6 ---- ! # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation *************** *** 14,37 **** @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ --- 14,21 ---- *************** *** 39,57 **** top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : --- 23,33 ---- top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 60,90 **** PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ CC = @CC@ CPP = @CPP@ CXX = @CXX@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GNOME_CONFIG = @GNOME_CONFIG@ GTK_CONFIG = @GTK_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ ! OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ USE_SHELL = @USE_SHELL@ VERSION = @VERSION@ XV_CFLAGS = @XV_CFLAGS@ XV_CXXFLAGS = @XV_CXXFLAGS@ --- 36,102 ---- PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ + CXXFLAGS = @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ GNOME_CONFIG = @GNOME_CONFIG@ GTK_CONFIG = @GTK_CONFIG@ + HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@ + HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@ + HAVE_ESD_FALSE = @HAVE_ESD_FALSE@ + HAVE_ESD_TRUE = @HAVE_ESD_TRUE@ + HAVE_SMAPI_FALSE = @HAVE_SMAPI_FALSE@ + HAVE_SMAPI_TRUE = @HAVE_SMAPI_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ ! OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_SHELL = @USE_SHELL@ VERSION = @VERSION@ + VVINSTALLED_SYSTEM_FALSE = @VVINSTALLED_SYSTEM_FALSE@ + VVINSTALLED_SYSTEM_TRUE = @VVINSTALLED_SYSTEM_TRUE@ XV_CFLAGS = @XV_CFLAGS@ XV_CXXFLAGS = @XV_CXXFLAGS@ *************** *** 93,99 **** --- 105,146 ---- XV_VV = @XV_VV@ XV_VV_LIBS = @XV_VV_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ + am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ + am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ noinst_LIBRARIES = libexpat.a *************** *** 113,119 **** xmltok_impl.h ! CFLAGS = $(XV_CFLAGS) ! CXXFLAGS = $(XV_CXXFLAGS) subdir = src/expat mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h --- 160,167 ---- xmltok_impl.h ! AM_CFLAGS = $(XV_CFLAGS) ! AM_CXXFLAGS = $(XV_CXXFLAGS) subdir = src/expat + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h *************** *** 127,135 **** libexpat_a_OBJECTS = $(am_libexpat_a_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles --- 175,179 ---- *************** *** 144,148 **** $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(libexpat_a_SOURCES) ! DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libexpat_a_SOURCES) --- 188,192 ---- $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(libexpat_a_SOURCES) ! DIST_COMMON = $(srcdir)/Makefile.in Makefile.am SOURCES = $(libexpat_a_SOURCES) *************** *** 177,201 **** @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltok.Po@am__quote@ - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ! CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: --- 221,256 ---- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltok.Po@am__quote@ .c.o: ! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! @am__fastdepCC_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! @am__fastdepCC_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` .c.lo: ! @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! @am__fastdepCC_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: *************** *** 212,215 **** --- 267,273 ---- ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS *************** *** 237,240 **** --- 295,313 ---- $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ *************** *** 243,247 **** distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --- 316,320 ---- distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) *************** *** 250,254 **** distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ --- 323,333 ---- distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ *************** *** 275,279 **** installdirs: - install: install-am install-exec: install-exec-am --- 354,357 ---- *************** *** 287,291 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 365,369 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install *************** *** 295,299 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 373,377 ---- distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 306,312 **** distclean: distclean-am ! ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 384,391 ---- distclean: distclean-am ! -rm -rf ./$(DEPDIR) ! -rm -f Makefile ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 329,333 **** maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic --- 408,413 ---- maintainer-clean: maintainer-clean-am ! -rm -rf ./$(DEPDIR) ! -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic *************** *** 337,345 **** mostlyclean-libtool uninstall-am: uninstall-info-am ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLIBRARIES distclean distclean-compile \ ! distclean-depend distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ --- 417,433 ---- mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLIBRARIES ctags distclean \ ! distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ *************** *** 347,352 **** install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ! tags uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 435,440 ---- install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ! pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: Makefile.am =================================================================== RCS file: /cvsroot/xvoice/xvoice/src/expat/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 18 Mar 2000 18:38:11 -0000 1.4 --- Makefile.am 2 Apr 2004 21:35:18 -0000 1.5 *************** *** 15,18 **** xmltok.h\ xmltok_impl.h ! CFLAGS = $(XV_CFLAGS) ! CXXFLAGS = $(XV_CXXFLAGS) --- 15,18 ---- xmltok.h\ xmltok_impl.h ! AM_CFLAGS = $(XV_CFLAGS) ! AM_CXXFLAGS = $(XV_CXXFLAGS) |
From: Wes H. <har...@us...> - 2004-04-02 21:47:32
|
Update of /cvsroot/xvoice/xvoice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20660 Modified Files: Makefile.in aclocal.m4 configure Added Files: depcomp Log Message: Update to a recent automake Index: aclocal.m4 =================================================================== RCS file: /cvsroot/xvoice/xvoice/aclocal.m4,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** aclocal.m4 23 Dec 2003 01:30:52 -0000 1.10 --- aclocal.m4 2 Apr 2004 21:35:14 -0000 1.11 *************** *** 1,5 **** ! # aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- ! # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation --- 1,5 ---- ! # generated automatically by aclocal 1.7.9 -*- Autoconf -*- ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation *************** *** 17,21 **** # your package does certain things. But this isn't really a big deal. ! # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. --- 17,21 ---- # your package does certain things. But this isn't really a big deal. ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. *************** *** 35,48 **** # 02111-1307, USA. ! # serial 8 ! ! # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ! # written in clear, in which case automake, when reading aclocal.m4, ! # will think it sees a *use*, and therefore will trigger all it's ! # C support machinery. Also note that it means that autoscan, seeing ! # CC etc. in the Makefile, will ask for an AC_PROG_CC use... ! ! AC_PREREQ([2.52]) # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow --- 35,41 ---- # 02111-1307, USA. ! # serial 10 ! AC_PREREQ([2.54]) # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow *************** *** 70,73 **** --- 63,76 ---- fi + # test whether we have cygpath + if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi + fi + AC_SUBST([CYGPATH_W]) + # Define the identity of the package. dnl Distinguish between old-style and new-style calls. *************** *** 77,82 **** AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl ! AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl ! AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl _AM_IF_OPTION([no-define],, --- 80,85 ---- AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl ! AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ! AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, *************** *** 99,115 **** AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl _AM_IF_OPTION([no-dependencies],, ! [AC_PROVIDE_IFELSE([AC_PROG_][CC], [_AM_DEPENDENCIES(CC)], ! [define([AC_PROG_][CC], ! defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl ! AC_PROVIDE_IFELSE([AC_PROG_][CXX], [_AM_DEPENDENCIES(CXX)], ! [define([AC_PROG_][CXX], ! defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) ]) # Copyright 2002 Free Software Foundation, Inc. --- 102,140 ---- AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([no-dependencies],, ! [AC_PROVIDE_IFELSE([AC_PROG_CC], [_AM_DEPENDENCIES(CC)], ! [define([AC_PROG_CC], ! defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ! AC_PROVIDE_IFELSE([AC_PROG_CXX], [_AM_DEPENDENCIES(CXX)], ! [define([AC_PROG_CXX], ! defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) ]) + + # When config.status generates a header, we must update the stamp-h file. + # This file resides in the same directory as the config header + # that is generated. The stamp files are numbered to have different names. + + # Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the + # loop where config.status creates the headers, so we can generate + # our stamp files there. + AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], + [# Compute $1's index in $config_headers. + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done + echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + # Copyright 2002 Free Software Foundation, Inc. *************** *** 132,136 **** # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. ! AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) # AM_SET_CURRENT_AUTOMAKE_VERSION --- 157,161 ---- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. ! AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) # AM_SET_CURRENT_AUTOMAKE_VERSION *************** *** 139,143 **** # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.6.3])]) # Helper functions for option handling. -*- Autoconf -*- --- 164,168 ---- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.7.9])]) # Helper functions for option handling. -*- Autoconf -*- *************** *** 425,431 **** AC_SUBST([INSTALL_STRIP_PROGRAM])]) ! # serial 4 -*- Autoconf -*- ! # Copyright 1999, 2000, 2001 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify --- 450,489 ---- AC_SUBST([INSTALL_STRIP_PROGRAM])]) ! # -*- Autoconf -*- ! # Copyright (C) 2003 Free Software Foundation, Inc. ! # 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, 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. ! ! # serial 1 ! ! # Check whether the underlying file-system supports filenames ! # with a leading dot. For instance MS-DOS doesn't. ! AC_DEFUN([AM_SET_LEADING_DOT], ! [rm -rf .tst 2>/dev/null ! mkdir .tst 2>/dev/null ! if test -d .tst; then ! am__leading_dot=. ! else ! am__leading_dot=_ ! fi ! rmdir .tst 2>/dev/null ! AC_SUBST([am__leading_dot])]) ! ! # serial 5 -*- Autoconf -*- ! ! # Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify *************** *** 488,491 **** --- 546,556 ---- cp "$am_depcomp" conftest.dir cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub am_cv_$1_dependencies_compiler_type=none *************** *** 494,503 **** fi for depmode in $am_compiler_list; do # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. ! echo '#include "conftest.h"' > conftest.c ! echo 'int i;' > conftest.h ! echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf case $depmode in --- 559,575 ---- fi for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. ! : > sub/conftest.c ! for i in 1 2 3 4 5 6; do ! echo '#include "conftst'$i'.h"' >> sub/conftest.c ! : > sub/conftst$i.h ! done ! echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf case $depmode in *************** *** 517,527 **** # handle `-M -o', and we need to detect this. if depmode=$depmode \ ! source=conftest.c object=conftest.o \ ! depfile=conftest.Po tmpdepfile=conftest.TPo \ ! $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && ! grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ! am_cv_$1_dependencies_compiler_type=$depmode ! break fi done --- 589,606 ---- # handle `-M -o', and we need to detect this. if depmode=$depmode \ ! source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ! depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ! $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ! >/dev/null 2>conftest.err && ! grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ! grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ! # icc doesn't choke on unknown options, it will just issue warnings ! # (even with -Werror). So we grep stderr for any message ! # that says an option was ignored. ! if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else ! am_cv_$1_dependencies_compiler_type=$depmode ! break ! fi fi done *************** *** 534,537 **** --- 613,619 ---- ]) AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) + AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) *************** *** 542,555 **** # This macro is AC_REQUIREd in _AM_DEPENDENCIES AC_DEFUN([AM_SET_DEPDIR], ! [rm -f .deps 2>/dev/null ! mkdir .deps 2>/dev/null ! if test -d .deps; then ! DEPDIR=.deps ! else ! # MS-DOS does not allow filenames that begin with a dot. ! DEPDIR=_deps ! fi ! rmdir .deps 2>/dev/null ! AC_SUBST([DEPDIR]) ]) --- 624,629 ---- # This macro is AC_REQUIREd in _AM_DEPENDENCIES AC_DEFUN([AM_SET_DEPDIR], ! [AC_REQUIRE([AM_SET_LEADING_DOT])dnl ! AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ]) *************** *** 653,657 **** ]) ! # Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- # This program is free software; you can redistribute it and/or modify --- 727,733 ---- ]) ! # Check to see how 'make' treats includes. -*- Autoconf -*- ! ! # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify *************** *** 678,683 **** [am_make=${MAKE-make} cat > confinc << 'END' ! doit: @echo done END # If we don't find an include directive, just comment out the code. --- 754,760 ---- [am_make=${MAKE-make} cat > confinc << 'END' ! am__doit: @echo done + .PHONY: am__doit END # If we don't find an include directive, just comment out the code. *************** *** 693,697 **** # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. ! if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then am__include=include am__quote= --- 770,774 ---- # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. ! if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then am__include=include am__quote= *************** *** 707,713 **** fi fi ! AC_SUBST(am__include) ! AC_SUBST(am__quote) ! AC_MSG_RESULT($_am_result) rm -f confinc confmf ]) --- 784,790 ---- fi fi ! AC_SUBST([am__include]) ! AC_SUBST([am__quote]) ! AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) *************** *** 753,757 **** AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ! AC_MSG_ERROR([conditional \"$1\" was never defined. Usually this means the macro was only invoked conditionally.]) fi])]) --- 830,834 ---- AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ! AC_MSG_ERROR([conditional "$1" was never defined. Usually this means the macro was only invoked conditionally.]) fi])]) *************** *** 780,837 **** # serial 6 ! # When config.status generates a header, we must update the stamp-h file. ! # This file resides in the same directory as the config header ! # that is generated. We must strip everything past the first ":", ! # and everything past the last "/". ! ! # _AM_DIRNAME(PATH) ! # ----------------- ! # Like AS_DIRNAME, only do it during macro expansion ! AC_DEFUN([_AM_DIRNAME], ! [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, ! m4_if(regexp([$1], [^//\([^/]\|$\)]), -1, ! m4_if(regexp([$1], [^/.*]), -1, ! [.], ! patsubst([$1], [^\(/\).*], [\1])), ! patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), ! patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl ! ])# _AM_DIRNAME ! ! ! # The stamp files are numbered to have different names. ! # We could number them on a directory basis, but that's additional ! # complications, let's have a unique counter. ! m4_define([_AM_STAMP_Count], [0]) ! ! ! # _AM_STAMP(HEADER) ! # ----------------- ! # The name of the stamp file for HEADER. ! AC_DEFUN([_AM_STAMP], ! [m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl ! AS_ESCAPE(_AM_DIRNAME(patsubst([$1], ! [:.*])))/stamp-h[]_AM_STAMP_Count]) ! ! ! # _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS) ! # ------------------------------------------------------------ ! # We used to try to get a real timestamp in stamp-h. But the fear is that ! # that will cause unnecessary cvs conflicts. ! AC_DEFUN([_AM_CONFIG_HEADER], ! [# Add the stamp file to the list of files AC keeps track of, ! # along with our hook. ! AC_CONFIG_HEADERS([$1], ! [# update the timestamp ! echo 'timestamp for $1' >"_AM_STAMP([$1])" ! $2], ! [$3]) ! ])# _AM_CONFIG_HEADER ! ! ! # AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS) ! # -------------------------------------------------------------- ! AC_DEFUN([AM_CONFIG_HEADER], ! [AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) ! ])# AM_CONFIG_HEADER # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- --- 857,862 ---- # serial 6 ! # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ! AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- Index: Makefile.in =================================================================== RCS file: /cvsroot/xvoice/xvoice/Makefile.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.in 23 Dec 2003 01:30:52 -0000 1.12 --- Makefile.in 2 Apr 2004 21:35:13 -0000 1.13 *************** *** 1,6 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation --- 1,6 ---- ! # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation *************** *** 14,37 **** @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ --- 14,21 ---- *************** *** 39,57 **** top_builddir = . - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : --- 23,33 ---- top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 60,90 **** PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ CC = @CC@ CPP = @CPP@ CXX = @CXX@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GNOME_CONFIG = @GNOME_CONFIG@ GTK_CONFIG = @GTK_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ ! OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ USE_SHELL = @USE_SHELL@ VERSION = @VERSION@ XV_CFLAGS = @XV_CFLAGS@ XV_CXXFLAGS = @XV_CXXFLAGS@ --- 36,102 ---- PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ + CXXFLAGS = @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ GNOME_CONFIG = @GNOME_CONFIG@ GTK_CONFIG = @GTK_CONFIG@ + HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@ + HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@ + HAVE_ESD_FALSE = @HAVE_ESD_FALSE@ + HAVE_ESD_TRUE = @HAVE_ESD_TRUE@ + HAVE_SMAPI_FALSE = @HAVE_SMAPI_FALSE@ + HAVE_SMAPI_TRUE = @HAVE_SMAPI_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ ! OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_SHELL = @USE_SHELL@ VERSION = @VERSION@ + VVINSTALLED_SYSTEM_FALSE = @VVINSTALLED_SYSTEM_FALSE@ + VVINSTALLED_SYSTEM_TRUE = @VVINSTALLED_SYSTEM_TRUE@ XV_CFLAGS = @XV_CFLAGS@ XV_CXXFLAGS = @XV_CXXFLAGS@ *************** *** 93,99 **** --- 105,146 ---- XV_VV = @XV_VV@ XV_VV_LIBS = @XV_VV_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ + am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ + am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ EXTRA_DIST = CODEGUIDE COMMANDS xvoice.png xvoice.xml xvoice.spec.in vimcmds *************** *** 120,132 **** ! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ ! uninstall-info-recursive all-recursive install-data-recursive \ ! install-exec-recursive installdirs-recursive install-recursive \ ! uninstall-recursive check-recursive installcheck-recursive ! DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ ! Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess \ ! config.h.in config.sub configure configure.in depcomp \ ! install-sh ltconfig ltmain.sh missing mkinstalldirs \ ! xvoice.spec.in DIST_SUBDIRS = $(SUBDIRS) all: config.h --- 167,180 ---- ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive ! DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ ! COPYING ChangeLog INSTALL Makefile.am NEWS TODO acconfig.h \ ! aclocal.m4 config.guess config.h.in config.sub configure \ ! configure.in depcomp install-sh ltconfig ltmain.sh missing \ ! mkinstalldirs xvoice.spec.in DIST_SUBDIRS = $(SUBDIRS) all: config.h *************** *** 288,295 **** --- 336,350 ---- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS *************** *** 307,313 **** tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ --- 362,374 ---- tags=; \ here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -f $$subdir/TAGS && \ ! tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ *************** *** 322,325 **** --- 383,401 ---- $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ *************** *** 328,332 **** distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --- 404,408 ---- distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) *************** *** 340,343 **** --- 416,420 ---- GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print *************** *** 346,350 **** mkdir $(distdir) $(mkinstalldirs) $(distdir)/. ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ --- 423,433 ---- mkdir $(distdir) $(mkinstalldirs) $(distdir)/. ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ *************** *** 380,384 **** done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="${top_distdir}" distdir="$(distdir)" \ dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ --- 463,467 ---- done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ *************** *** 402,411 **** GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) ! mkdir $(distdir)/=build ! mkdir $(distdir)/=inst chmod a-w $(distdir) ! dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ ! && cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix=$$dc_install_base \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ --- 485,495 ---- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) ! mkdir $(distdir)/_build ! mkdir $(distdir)/_inst chmod a-w $(distdir) ! dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ ! && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ ! && cd $(distdir)/_build \ ! && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ *************** *** 415,422 **** && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ! && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ ! || { echo "ERROR: files left after uninstall:" ; \ ! find $$dc_install_base -type f -print ; \ ! exit 1; } >&2 ) \ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && rm -f $(distdir).tar.gz \ --- 499,513 ---- && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ! && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ! distuninstallcheck \ ! && chmod -R a-w "$$dc_install_base" \ ! && ({ \ ! (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ! distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ! } || { rm -rf "$$dc_destdir"; exit 1; }) \ ! && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && rm -f $(distdir).tar.gz \ *************** *** 425,435 **** @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' distcleancheck: distclean ! if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi ! test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ! || { echo "ERROR: files left after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 --- 516,535 ---- @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' + distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 distcleancheck: distclean ! @if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi ! @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ! || { echo "ERROR: files left in build directory after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 *************** *** 452,456 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 552,556 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install *************** *** 460,464 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 560,564 ---- distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 471,474 **** --- 571,575 ---- distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ distclean-tags *************** *** 495,499 **** maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) ! -rm -rf autom4te.cache maintainer-clean-am: distclean-am maintainer-clean-generic --- 596,601 ---- maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) ! -rm -rf $(top_srcdir)/autom4te.cache ! -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic *************** *** 502,505 **** --- 604,615 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-info-am uninstall-modulesDATA \ uninstall-pixmapDATA uninstall-xvoiceDATA *************** *** 507,515 **** uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive dist dist-all \ ! dist-gzip distcheck distclean distclean-generic distclean-hdr \ ! distclean-libtool distclean-recursive distclean-tags \ ! distcleancheck distdir dvi dvi-am dvi-recursive info info-am \ info-recursive install install-am install-data install-data-am \ install-data-recursive install-exec install-exec-am \ --- 617,626 ---- uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive ctags \ ! ctags-recursive dist dist-all dist-gzip distcheck distclean \ ! distclean-generic distclean-hdr distclean-libtool \ ! distclean-recursive distclean-tags distcleancheck distdir \ ! distuninstallcheck dvi dvi-am dvi-recursive info info-am \ info-recursive install install-am install-data install-data-am \ install-data-recursive install-exec install-exec-am \ *************** *** 521,525 **** maintainer-clean-generic maintainer-clean-recursive mostlyclean \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! tags tags-recursive uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-modulesDATA \ uninstall-pixmapDATA uninstall-recursive uninstall-xvoiceDATA --- 632,637 ---- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ! tags-recursive uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-modulesDATA \ uninstall-pixmapDATA uninstall-recursive uninstall-xvoiceDATA --- NEW FILE: depcomp --- #! /bin/sh # depcomp - compile a program generating dependencies as side-effects # Copyright 1999, 2000, 2003 Free Software Foundation, Inc. # 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, 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. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # Originally written by Alexandre Oliva <ol...@dc...>. if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 fi # `libtool' can also be set to `yes' or `no'. if test -z "$depfile"; then base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` dir=`echo "$object" | sed 's,/.*$,/,'` if test "$dir" = "$object"; then dir= fi # FIXME: should be _deps on DOS. depfile="$dir.deps/$base" fi tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case # here, because this file can only contain one case statement. if test "$depmode" = hp; then # HP compiler uses -M and no extra arg. gccflag=-M depmode=gcc fi if test "$depmode" = dashXmstdout; then # This is just like dashmstdout with a different argument. dashmflag=-xM depmode=dashmstdout fi case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile" exit $stat fi mv "$tmpdepfile" "$depfile" ;; gcc) ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like ## -MM, not -M (despite what the docs say). ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then gccflag=-MD, fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the `deleted header file' problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. tr ' ' ' ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as ## well. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; hp) # This case exists only to let depend.m4 do its work. It works by # looking at the text of this script. This case will never be run, # since it is checked for above. exit 1 ;; sgi) if test "$libtool" = yes; then "$@" "-Wp,-MDupdate,$tmpdepfile" else "$@" -MDupdate "$tmpdepfile" fi stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; # the IRIX cc adds comments like `#:fec' to the end of the # dependency line. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' ' ' ' >> $depfile echo >> $depfile # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> $depfile else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile # "include basename.Plo" scheme. echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the # current directory. Also, the AIX compiler puts `$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` tmpdepfile="$stripped.u" if test "$libtool" = yes; then "$@" -Wc,-M else "$@" -M fi stat=$? if test -f "$tmpdepfile"; then : else stripped=`echo "$stripped" | sed 's,^.*/,,'` tmpdepfile="$stripped.u" fi if test $stat -eq 0; then : else rm -f "$tmpdepfile" exit $stat fi if test -f "$tmpdepfile"; then outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile # "include basename.Plo" scheme. echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; icc) # Intel's C compiler understands `-MD -MF file'. However on # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h # which is wrong. We want: # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h # and will wrap long lines using \ : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" # Each line is of the form `foo.o: dependent.h', # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put # dependencies in `foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then tmpdepfile1="$dir.libs/$base.lo.d" tmpdepfile2="$dir.libs/$base.d" "$@" -Wc,-MD else tmpdepfile1="$dir$base.o.d" tmpdepfile2="$dir$base.d" "$@" -MD fi stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi if test -f "$tmpdepfile1"; then tmpdepfile="$tmpdepfile1" else tmpdepfile="$tmpdepfile2" fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" # That's a tab and a space in the []. sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. dashmstdout) # Important note: in order to support this mode, a compiler *must* # always write the preprocessed file to stdout, regardless of -o. "$@" || exit $? # Remove the call to Libtool. if test "$libtool" = yes; then while test $1 != '--mode=compile'; do shift done shift fi # Remove `-o $object'. IFS=" " for arg do case $arg in -o) shift ;; $object) shift ;; *) set fnord "$@" "$arg" shift # fnord shift # $arg ;; esac done test -z "$dashmflag" && dashmflag=-M # Require at least two characters before searching for `:' # in the target name. This is to cope with DOS-style filenames: # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. "$@" $dashmflag | sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" tr ' ' ' ' < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; dashXmstdout) # This case only exists to satisfy depend.m4. It is never actually # run, as this mode is specially recognized in the preamble. exit 1 ;; makedepend) "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then while test $1 != '--mode=compile'; do shift done shift fi # X makedepend shift cleared=no for arg in "$@"; do case $cleared in no) set ""; shift cleared=yes ;; esac case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done obj_suffix="`echo $object | sed 's/^.*\././'`" touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; cpp) # Important note: in order to support this mode, a compiler *must* # always write the preprocessed file to stdout. "$@" || exit $? # Remove the call to Libtool. if test "$libtool" = yes; then while test $1 != '--mode=compile'; do shift done shift fi # Remove `-o $object'. IFS=" " for arg do case $arg in -o) shift ;; $object) shift ;; *) set fnord "$@" "$arg" shift # fnord shift # $arg ;; esac done "$@" -E | sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; msvisualcpp) # Important note: in order to support this mode, a compiler *must* # always write the preprocessed file to stdout, regardless of -o, # because we must use -o when running libtool. "$@" || exit $? IFS=" " for arg do case "$arg" in "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift shift ;; *) set fnord "$@" "$arg" shift shift ;; esac done "$@" -E | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; none) exec "$@" ;; *) echo "Unknown depmode $depmode" 1>&2 exit 1 ;; esac exit 0 Index: configure =================================================================== RCS file: /cvsroot/xvoice/xvoice/configure,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** configure 24 Feb 2004 21:34:44 -0000 1.21 --- configure 2 Apr 2004 21:35:17 -0000 1.22 *************** *** 1,8 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.57. # ! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. --- 1,7 ---- #! /bin/sh [...4344 lines suppressed...] sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } *************** *** 11403,11410 **** as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X\(//\)[^/]' \| \ ! X"$as_dir" : 'X\(//\)$' \| \ ! X"$as_dir" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } --- 11973,11980 ---- as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X\(//\)[^/]' \| \ ! X"$as_dir" : 'X\(//\)$' \| \ ! X"$as_dir" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } |
From: Wes H. <har...@us...> - 2004-04-02 21:47:31
|
Update of /cvsroot/xvoice/xvoice/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20660/src Modified Files: Makefile.am Makefile.in Log Message: Update to a recent automake Index: Makefile.in =================================================================== RCS file: /cvsroot/xvoice/xvoice/src/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 23 Dec 2003 06:51:38 -0000 1.18 --- Makefile.in 2 Apr 2004 21:35:18 -0000 1.19 *************** *** 1,6 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation --- 1,6 ---- ! # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation *************** *** 14,37 **** @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ --- 14,21 ---- *************** *** 39,57 **** top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : --- 23,33 ---- top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 60,90 **** PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ CC = @CC@ CPP = @CPP@ CXX = @CXX@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GNOME_CONFIG = @GNOME_CONFIG@ GTK_CONFIG = @GTK_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ ! OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ USE_SHELL = @USE_SHELL@ VERSION = @VERSION@ XV_CFLAGS = @XV_CFLAGS@ XV_CXXFLAGS = @XV_CXXFLAGS@ --- 36,102 ---- PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ + CXXFLAGS = @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ GNOME_CONFIG = @GNOME_CONFIG@ GTK_CONFIG = @GTK_CONFIG@ + HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@ + HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@ + HAVE_ESD_FALSE = @HAVE_ESD_FALSE@ + HAVE_ESD_TRUE = @HAVE_ESD_TRUE@ + HAVE_SMAPI_FALSE = @HAVE_SMAPI_FALSE@ + HAVE_SMAPI_TRUE = @HAVE_SMAPI_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ ! OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_SHELL = @USE_SHELL@ VERSION = @VERSION@ + VVINSTALLED_SYSTEM_FALSE = @VVINSTALLED_SYSTEM_FALSE@ + VVINSTALLED_SYSTEM_TRUE = @VVINSTALLED_SYSTEM_TRUE@ XV_CFLAGS = @XV_CFLAGS@ XV_CXXFLAGS = @XV_CXXFLAGS@ *************** *** 93,99 **** --- 105,146 ---- XV_VV = @XV_VV@ XV_VV_LIBS = @XV_VV_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ + am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ + am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ SUBDIRS = expat *************** *** 126,140 **** EXTRA_DIST = wmvoice-master.xpm ! CFLAGS = $(XV_CFLAGS) -DDATADIR=$(datadir) -DUSE_SHELL=\"@USE_SHELL@\" ! CXXFLAGS = $(XV_CXXFLAGS) -DDATADIR=\"$(datadir)\" -DUSE_SHELL=\"@USE_SHELL@\" INCLUDES = $(XV_GNOME_CFLAGS) -I$(XV_VV)/include BASE_LIBS = -lXtst -L./expat -lexpat @HAVE_SMAPI_TRUE@xvoice_LDADD = $(BASE_LIBS) $(XV_VV_LIBS) -lsmapi -lvtbnfc31 \ @HAVE_SMAPI_TRUE@ $(XV_GNOME_LIBS) - @HAVE_SMAPI_FALSE@xvoice_LDADD = $(BASE_LIBS) $(XV_GNOME_LIBS) wmvoice_LDADD = -L/usr/X11R6/lib -lX11 -lXpm $(BASE_LIBS) $(XV_VV_LIBS) \ --- 173,187 ---- EXTRA_DIST = wmvoice-master.xpm ! AM_CFLAGS = $(XV_CFLAGS) -DDATADIR=$(datadir) -DUSE_SHELL=\"@USE_SHELL@\" ! AM_CXXFLAGS = $(XV_CXXFLAGS) -DDATADIR=\"$(datadir)\" -DUSE_SHELL=\"@USE_SHELL@\" INCLUDES = $(XV_GNOME_CFLAGS) -I$(XV_VV)/include BASE_LIBS = -lXtst -L./expat -lexpat + @HAVE_SMAPI_FALSE@xvoice_LDADD = $(BASE_LIBS) $(XV_GNOME_LIBS) @HAVE_SMAPI_TRUE@xvoice_LDADD = $(BASE_LIBS) $(XV_VV_LIBS) -lsmapi -lvtbnfc31 \ @HAVE_SMAPI_TRUE@ $(XV_GNOME_LIBS) wmvoice_LDADD = -L/usr/X11R6/lib -lX11 -lXpm $(BASE_LIBS) $(XV_VV_LIBS) \ *************** *** 154,157 **** --- 201,205 ---- lib_LTLIBRARIES = $(ESDLIB) $(ARTSLIB) subdir = src + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h *************** *** 181,189 **** xvoice_LDFLAGS = - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles --- 229,233 ---- *************** *** 216,224 **** $(wmvoice_SOURCES) $(xvoice_SOURCES) ! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ ! uninstall-info-recursive all-recursive install-data-recursive \ ! install-exec-recursive installdirs-recursive install-recursive \ ! uninstall-recursive check-recursive installcheck-recursive ! DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(libxvarts_la_SOURCES) $(libxvesd_la_SOURCES) $(wmvoice_SOURCES) $(xvoice_SOURCES) --- 260,269 ---- $(wmvoice_SOURCES) $(xvoice_SOURCES) ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive ! DIST_COMMON = $(srcdir)/Makefile.in Makefile.am DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(libxvarts_la_SOURCES) $(libxvesd_la_SOURCES) $(wmvoice_SOURCES) $(xvoice_SOURCES) *************** *** 257,261 **** @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ --- 302,306 ---- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ *************** *** 276,280 **** f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ done --- 321,325 ---- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ else :; fi; \ done *************** *** 323,366 **** @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xvoice.Po@am__quote@ - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ! CCDEPMODE = @CCDEPMODE@ .cc.o: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .cc.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXXCOMPILE) -c -o $@ `cygpath -w $<` .cc.lo: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ! CXXDEPMODE = @CXXDEPMODE@ mostlyclean-libtool: --- 368,436 ---- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xvoice.Po@am__quote@ .c.o: ! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! @am__fastdepCC_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! @am__fastdepCC_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` .c.lo: ! @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! @am__fastdepCC_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .cc.o: ! @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .cc.obj: ! @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` .cc.lo: ! @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: *************** *** 428,435 **** --- 498,512 ---- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS *************** *** 447,453 **** tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ --- 524,536 ---- tags=; \ here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -f $$subdir/TAGS && \ ! tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ *************** *** 462,465 **** --- 545,563 ---- $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ *************** *** 468,472 **** distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --- 566,570 ---- distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) *************** *** 475,479 **** distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ --- 573,583 ---- distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ *************** *** 528,532 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 632,636 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install *************** *** 536,540 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 640,644 ---- distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 547,553 **** distclean: distclean-recursive ! ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-recursive --- 651,658 ---- distclean: distclean-recursive ! -rm -rf ./$(DEPDIR) ! -rm -f Makefile ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-recursive *************** *** 571,575 **** maintainer-clean: maintainer-clean-recursive ! maintainer-clean-am: distclean-am maintainer-clean-generic --- 676,681 ---- maintainer-clean: maintainer-clean-recursive ! -rm -rf ./$(DEPDIR) ! -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic *************** *** 579,582 **** --- 685,696 ---- mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ uninstall-libLTLIBRARIES uninstall-local *************** *** 584,591 **** uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ ! clean-libtool clean-recursive distclean distclean-compile \ ! distclean-depend distclean-generic distclean-libtool \ distclean-recursive distclean-tags distdir dvi dvi-am \ dvi-recursive info info-am info-recursive install install-am \ --- 698,705 ---- uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ ! clean-libtool clean-recursive ctags ctags-recursive distclean \ ! distclean-compile distclean-generic distclean-libtool \ distclean-recursive distclean-tags distdir dvi dvi-am \ dvi-recursive info info-am info-recursive install install-am \ *************** *** 599,606 **** maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! tags tags-recursive uninstall uninstall-am \ ! uninstall-binPROGRAMS uninstall-info-am \ ! uninstall-info-recursive uninstall-libLTLIBRARIES \ ! uninstall-local uninstall-recursive --- 713,720 ---- maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ! tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \ ! uninstall-info-am uninstall-info-recursive \ ! uninstall-libLTLIBRARIES uninstall-local uninstall-recursive Index: Makefile.am =================================================================== RCS file: /cvsroot/xvoice/xvoice/src/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile.am 23 Dec 2003 06:51:38 -0000 1.17 --- Makefile.am 2 Apr 2004 21:35:18 -0000 1.18 *************** *** 27,32 **** EXTRA_DIST = wmvoice-master.xpm ! CFLAGS = $(XV_CFLAGS) -DDATADIR=$(datadir) -DUSE_SHELL=\"@USE_SHELL@\" ! CXXFLAGS = $(XV_CXXFLAGS) -DDATADIR=\"$(datadir)\" -DUSE_SHELL=\"@USE_SHELL@\" INCLUDES = $(XV_GNOME_CFLAGS) -I$(XV_VV)/include --- 27,32 ---- EXTRA_DIST = wmvoice-master.xpm ! AM_CFLAGS = $(XV_CFLAGS) -DDATADIR=$(datadir) -DUSE_SHELL=\"@USE_SHELL@\" ! AM_CXXFLAGS = $(XV_CXXFLAGS) -DDATADIR=\"$(datadir)\" -DUSE_SHELL=\"@USE_SHELL@\" INCLUDES = $(XV_GNOME_CFLAGS) -I$(XV_VV)/include |
From: Wes H. <har...@us...> - 2004-03-18 21:39:12
|
Update of /cvsroot/xvoice/xvoice/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12093 Added Files: webdesign.xml Log Message: Added the web design vocabulary from tracker item 622824 (submitted by "thecyberpunk") --- NEW FILE: webdesign.xml --- <xvoice> <vocab name='Web Design' enableOn="web design"> <![CDATA[ <<root>> = start html -> <key char='<html>'/> |end html -> <key char='<\\\\html>'/> |start head -> <key char='<head>'/> |end head -> <key char='<\\\\head>'/> |start title -> <key char='<title>'/> |end title -> <key char='<\\\\title>'/> |start body -> <key char='<body>'/> |end body -> <key char='<\\\\body>'/> |start table -> <key char='<table>'/> |end table -> <key char='<\\\\table>'/> |start column -> <key char='<td>'/> |end column -> <key char='<\\\\td>'/> |start row -> <key char='\\t<tr>'/> |end row -> <key char='<\\\\tr>'/> |start ordered list -> <key char='<ol>'/> |end ordered list -> <key char='<\\\\ol>'/> |start unordered list -> <key char='<ul>'/> |end unordered list -> <key char='<\\\\ul>'/> |start list item -> <key char='<li>'/> |end list item -> <key char='<\\\\li>'/> |start paragraph -> <key char='<p>'/> |end paragraph -> <key char='<\\\\p>'/> |start bold -> <key char='<b>'/> |end bold -> <key char='<\\\\b>'/> |start underline -> <key char='<u>'/> |end underline -> <key char='<\\\\u>'/> |start link -> <key char='<a href="">'/> |end link -> <key char='<\\\\a>'/> |create anchor -> <key char='<a name="">lt;\\\\a>'/> |start division -> <key char='<div>'/> |end division -> <key char='<\\\\div>'/> |start span -> <key char='<span>'/> |end span -> <key char='<\\\\span>'/> |start form -> <key char='<form>'/> |end form -> <key char='<\\\\form>'/> |input check box -> <key char='<input type="checkbox" name="">'/> |input radio -> <key char='<input type="radio" name="">'/> |input hidden -> <key char='<input type="hidden" name="">'/> |input password -> <key char='<input type="password" name="">'/> |input submit -> <key char='<input type="submit" value="">'/> |input reset -> <key char='<input type="reset">'/> |input start text area -> <key char='<textarea>'/> |input end text area -> <key char='<\\\\textarea>'/> |attribute width -> <key char='width=""'/> |attribute height -> <key char='height=""'/> |attribute size -> <key char='size=""'/> |attribute vertical align -> <key char='valign=""'/> |attribute align -> <key char='align=""'/> |attribute source -> <key char='src=""'/> |attribute border-> <key char='border=""'/> |attribute left margin -> <key char='topmargin=""'/> |attribute top margin -> <key char='leftmargin=""'/> |attribute alterate text -> <key char='alt=""'/> |attribute action -> <key char='action=""'/> |attribute method -> <key char='method=""'/> |insert attributes -> <key char='&Left; '/> . ]]> </vocab> </xvoice> |
From: Wes H. <har...@us...> - 2004-03-18 21:29:11
|
Update of /cvsroot/xvoice/xvoice/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9981 Modified Files: emacs.xml Log Message: Viavoice understands the word "emacs" so change "editor" to "emacs" for enableOn Index: emacs.xml =================================================================== RCS file: /cvsroot/xvoice/xvoice/modules/emacs.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** emacs.xml 22 Dec 2003 21:08:29 -0000 1.1 --- emacs.xml 18 Mar 2004 21:19:30 -0000 1.2 *************** *** 1,4 **** <xvoice> ! <application name='emacs' expr='X?emacs.*' enableOn="editor"><![CDATA[ INCLUDE "numbers.bnf" INCLUDE "keys.bnf" --- 1,4 ---- <xvoice> ! <application name='emacs' expr='X?emacs.*' enableOn="emacs"><![CDATA[ INCLUDE "numbers.bnf" INCLUDE "keys.bnf" |
From: <har...@us...> - 2004-02-24 21:41:33
|
Update of /cvsroot/xvoice/xvoice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28376 Modified Files: configure configure.in libtool Log Message: bumped version number Index: configure =================================================================== RCS file: /cvsroot/xvoice/xvoice/configure,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** configure 23 Dec 2003 06:51:07 -0000 1.20 --- configure 24 Feb 2004 21:34:44 -0000 1.21 *************** *** 1717,1721 **** # Define the identity of the package. PACKAGE=xvoice ! VERSION="0.9.5" --- 1717,1721 ---- # Define the identity of the package. PACKAGE=xvoice ! VERSION="0.9.6" Index: configure.in =================================================================== RCS file: /cvsroot/xvoice/xvoice/configure.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** configure.in 23 Dec 2003 06:51:07 -0000 1.19 --- configure.in 24 Feb 2004 21:34:44 -0000 1.20 *************** *** 11,15 **** AC_INIT(src/Target.h) ! AM_INIT_AUTOMAKE(xvoice, "0.9.5") AM_CONFIG_HEADER(config.h) --- 11,15 ---- AC_INIT(src/Target.h) ! AM_INIT_AUTOMAKE(xvoice, "0.9.6") AM_CONFIG_HEADER(config.h) Index: libtool =================================================================== RCS file: /cvsroot/xvoice/xvoice/libtool,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** libtool 23 Dec 2003 01:30:52 -0000 1.1 --- libtool 24 Feb 2004 21:34:44 -0000 1.2 *************** *** 2,6 **** # libtool - Provide generalized library-building support services. ! # Generated automatically by (GNU xvoice 0.9.5) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # --- 2,6 ---- # libtool - Provide generalized library-building support services. ! # Generated automatically by (GNU xvoice 0.9.6) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # *************** *** 39,43 **** # ### BEGIN LIBTOOL CONFIG ! # Libtool was configured on host wanderer.hardakers.net: # Shell to use when invoking shell scripts. --- 39,43 ---- # ### BEGIN LIBTOOL CONFIG ! # Libtool was configured on host wes.hardakers.net: # Shell to use when invoking shell scripts. |
From: <har...@us...> - 2004-02-24 20:41:47
|
Update of /cvsroot/xvoice/xvoice/src/expat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13576/src/expat Added Files: .cvsignore Log Message: cvs ignore .libs and Makefile --- NEW FILE: .cvsignore --- Makefile |
From: <har...@us...> - 2004-02-24 20:41:25
|
Update of /cvsroot/xvoice/xvoice/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13477/src Added Files: .cvsignore Log Message: cvs ignore .libs and Makefile --- NEW FILE: .cvsignore --- .libs Makefile |
From: <har...@us...> - 2004-02-24 20:40:55
|
Update of /cvsroot/xvoice/xvoice/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13369/src Added Files: xvoice.sh Log Message: added missing sh wrapper script I forgot to check in (opps) --- NEW FILE: xvoice.sh --- #!/bin/sh # required to force xvoice to ignore glibc library clashes export LD_ASSUME_KERNEL=2.4.1 # source the viavoice runtime environment . vvsetenv # if -g, run in gdb (developer option) if test "$1" = "-g" ; then shift gdb="gdb " if test -f xvoice ; then gdb="$gdb ./" fi flags= # if -l, run xvoice from the local directory (developer option) elif test "$1" = "-l" ; then shift gdb="./" flags=--disable-crash-dialog # disable the crash dialog, since it doesn't work else gdb= flags=--disable-crash-dialog fi exec ${gdb}xvoice.bin $flags $* |