debian/0000755000000000000000000000000012233433533007167 5ustar debian/TODO0000644000000000000000000000100011112236154007641 0ustar $Id: TODO,v 1.14 2004/09/30 01:04:04 hmh Exp $ High priority: - safe timidity sequencer (cheuid) - verify mime handling - fix upstream crap of a build system, that is overriding all of our cflags/cppflags. - autobuild logs show problems with the Tk Interface build - mipsel autobuild fails due to retarded link of X crap in "calcnewt" that is a build-time exec tool Low priority: - Realtime scheduling - slow-cpu version of timidity (linear interpol, etc) - sequencer: ALSASEQ variable, set it? debian/watch0000644000000000000000000000023311112236154010211 0ustar version=3 opts=uversionmangle=s/(tar|gz|tgz|bz2|\.\.)//g \ http://sf.net/timidity/TiMidity\+\+-?_?([\w+\d+\.]+|\d+)(\.tar|\.tgz)(\.gz|\.bz2|) debian false debian/timidity.cfg0000644000000000000000000000224111146336631011506 0ustar # Instrument configuration file for timidity # $Id: timidity.cfg,v 1.7 2005/09/03 19:26:03 hmh Exp $ # You can change just about every option in TiMidity++ using # This config file. Please refer to the timidity.cfg(5) manpage # for more details ## If you have a slow CPU, uncomment these: #opt EFresamp=d #disable resampling #opt EFvlpf=d #disable VLPF #opt EFreverb=d #disable reverb #opt EFchorus=d #disable chorus #opt EFdelay=d #disable delay #opt anti-alias=d #disable sample anti-aliasing #opt EWPVSETOZ #disable all Midi Controls #opt p32a #default to 32 voices with auto reduction #opt s32kHz #default sample frequency to 32kHz #opt fast-decay #fast decay notes ## If you have a moderate CPU, try these: #opt EFresamp=l #opt EFreverb=g,42 #opt EFchorus=s #opt s32kHz #opt p64a # Disabling some of the Midi Controls can help with the CPU usage a lot. # The same goes to the VLPF, sample anti-aliasing and effects such as # reverb and chorus # By default, try to use the instrument patches from freepats: source /etc/timidity/freepats.cfg # alternatively, you can use the fluid-soundfont: #source /etc/timidity/fluidr3_gm.cfg #source /etc/timidity/fluidr3_gs.cfg debian/changelog0000644000000000000000000007342212233433533011051 0ustar timidity (2.13.2-40.2) unstable; urgency=low * Non-maintainer upload. * Fixed FTBFS after dropping /usr/bin/tclsh alternatives and updating Tcl/Tk to 8.6. (Closes: #725040). -- Sergei Golovan Mon, 28 Oct 2013 14:07:01 +0400 timidity (2.13.2-40.1) unstable; urgency=low * Non-maintainer upload. * No longer remove /etc/init.d/timidity in timidity-daemon's "prerm remove". Thanks to Guo Yixuan for digging into this issue. (Closes: #688713) -- Sébastien Villemot Thu, 11 Oct 2012 20:08:58 +0200 timidity (2.13.2-40) unstable; urgency=low * New maintainer (Closes: #585039). * Specify multiarch path to libaudio to fix FTBFS (Closes: #639196, #641415) (LP: #832841). * Bump standards-version to 3.9.2; no changes necessary. * Add lintian override for embedded mikmod copy; I'll deal with this later (opens #649344). -- Geoffrey Thomas Sat, 19 Nov 2011 23:45:23 -0500 timidity (2.13.2-39) unstable; urgency=low * Orphan the package. -- Joost Yervante Damad Tue, 08 Jun 2010 18:33:18 +0200 timidity (2.13.2-38) unstable; urgency=low * Close stdin and stderr (Closes: #581914) * not all individual upgrades work out fine, normally the ones involving released versions should (Closes: #538967) * be less quiet about failure to stop (Closes: #563251) -- Joost Yervante Damad Fri, 21 May 2010 10:50:43 +0200 timidity (2.13.2-37) unstable; urgency=low * update source format to 3.0 * update standards version to 3.8.3 * rebuild to make sure proper esd lib is used * user was using old config file (Closes: #545492) * sometimes other applications block the sound card (Closes: #440852, #557638) (see also https://bugs.launchpad.net/ubuntu/+source/timidity/+bug/120810 ) -- Joost Yervante Damad Wed, 30 Dec 2009 16:32:31 +0100 timidity (2.13.2-36) unstable; urgency=low * Make sure stop is only invoked when init.d script actually exists (Closes: #546815) -- Joost Yervante Damad Wed, 16 Sep 2009 13:53:56 +0200 timidity (2.13.2-35) unstable; urgency=low * apply fedora_forkfix with thanks to Alban Browaeys for pointing out the patch and Paul Menzel for doing initial testing. (Closes: #544061) (Closes: #545476) * lots of upgrade testing, this version should survive an upgrade from a pre-timidity-daemon version unharmed (Closes: #538967) -- Joost Yervante Damad Fri, 11 Sep 2009 09:16:27 +0200 timidity (2.13.2-34) unstable; urgency=low * also remove config file from timidity if it is still owned by timidity (which hopefully fixes the problem also for the reporter...) (Closes: #538967) -- Joost Yervante Damad Mon, 07 Sep 2009 07:53:02 +0200 timidity (2.13.2-33) unstable; urgency=low * remove /etc/init.d/timidity on removal of timidity-daemon (Closes: #538967) * don't Depend on freepats a Recommends is good enough as it will still be installed by default for basic users (Closes: #542937) * use Recommends for timidity-daemon to allow smoother upgrade for basic users -- Joost Yervante Damad Mon, 24 Aug 2009 19:37:30 +0200 timidity (2.13.2-32) unstable; urgency=low * fix installation of /etc/default/timidity (although it was done as documented in man dh_installinit with the --name option method) -- Joost Yervante Damad Thu, 23 Jul 2009 06:58:11 +0200 timidity (2.13.2-31) unstable; urgency=low * relocate /etc/init.d/timidity to timidity-daemon * don't depend on existance of file in /usr/share/doc/* (Closes: #537830) * fix typo in timidity-daemon.postinst -- Joost Yervante Damad Tue, 21 Jul 2009 16:11:26 +0200 timidity (2.13.2-30) unstable; urgency=low * don't chown in postinst anymore (Closes: #537812) -- Joost Yervante Damad Tue, 21 Jul 2009 09:55:03 +0200 timidity (2.13.2-29) unstable; urgency=low * don't make /var/run/timidity part of the package as /var/run could be a temp filesystem, instead make the dir in the init script -- Joost Yervante Damad Sat, 18 Jul 2009 14:13:39 +0200 timidity (2.13.2-28) unstable; urgency=low * make sure timidity.deamon is removed not just on purge but also on remove check for existance of /var/run/timidity instead (which is now also used to make the pid file) * fix pid handling (pid files are icky) -- Joost Yervante Damad Sat, 18 Jul 2009 13:07:03 +0200 timidity (2.13.2-27) unstable; urgency=low * introduce timidity-deamon to ease the choice of the user and/or other packages to want a system-wide timidity alsa sequencer daemon (Closes: #531080) * update standards version to 3.8.2 * debhelper compat level 7 -- Joost Yervante Damad Fri, 17 Jul 2009 08:47:58 +0200 timidity (2.13.2-26) unstable; urgency=low * (hopefully) fix drum panning with thanks to Steve Graham for providing a fix (Closes: #536252) -- Joost Yervante Damad Fri, 17 Jul 2009 08:10:30 +0200 timidity (2.13.2-25) unstable; urgency=low * fix -q-q typo in debian/rules (Closes: #530957) -- Joost Yervante Damad Fri, 29 May 2009 07:57:52 +0200 timidity (2.13.2-24) unstable; urgency=low * stop depending on ARTS (closes: #528182) -- Joost Yervante Damad Tue, 12 May 2009 19:45:41 +0200 timidity (2.13.2-23) unstable; urgency=low * build depend on libjack-dev isof libjack0... (closes: #527435) * fix timidity-el section => lisp * fix debian/timidity-interfaces-extra.desktop binary path * add status method to init.d script (closes: #527884) with thanks to Peter Eisentraut for providing a patch * be a little more clear in the init.d message when it is not enabled although it's rather verbose :( (closes: #460588) -- Joost Yervante Damad Mon, 23 Mar 2009 19:42:09 +0100 timidity (2.13.2-22) unstable; urgency=low * do not build with -Werror; some archs use different compilers -- Joost Yervante Damad Wed, 18 Feb 2009 18:17:00 +0100 timidity (2.13.2-21) unstable; urgency=low * Document how to enable the ALSA sequencer interface in README.Debian (Closes: #493224) * merge changes from ubuntu: - install Japanese docs - debian/timidity-interfaces-extra.desktop - debian/timidity.postinst - debian/timidity.preinst - debian/timidity.prerm - debian/TiMidity-uj_UTF8.ad * stricter compilation with EXTRAFLAGS - lots of tiny compile fixes * lintian fixes * suggest fluid-soundfont; explain how to use it in README.Debian * no longer depend on x-dev (Closes: #515467) -- Joost Yervante Damad Mon, 16 Feb 2009 20:23:24 +0100 timidity (2.13.2-20) unstable; urgency=high * add workaround in init.d script logging when timidity is not enabled to accomodate splashy, with thanks to Daniel Nicoletti for debugging the problem and providing a solution (Closes: #493263) -- Joost Yervante Damad Tue, 05 Aug 2008 19:54:19 +0200 timidity (2.13.2-19) unstable; urgency=low * Depend: on freepats instead of Recommends: as this keeps confusing users (Closes: #460424) * Fix spelling of S-Lang (Closes: #460448) * Fix init.d LSB header: timidity needs /usr (Closes: #459406) -- Joost Yervante Damad Sat, 12 Jan 2008 21:10:48 +0100 timidity (2.13.2-18) unstable; urgency=low * Grammar fix in the English manpage, with thanks to "A. Costa" for providing a patch! (Closes: #455700) -- Joost Yervante Damad Mon, 17 Dec 2007 20:43:02 +0100 timidity (2.13.2-17) unstable; urgency=low * remove -B2,8 from /etc/default/timidity (from Ubuntu): disable buffer fragments * lsb-init fixes from Ubuntu -- Joost Yervante Damad Mon, 10 Dec 2007 19:08:32 +0100 timidity (2.13.2-16) unstable; urgency=low * timidity is no longer team-maintained, back to just me * next version won't be in the debian-multimedia SVN * fix watch file (Closes: #449654), with thanks to Raphael Geissert! * menu file Apps -> Applications -- Joost Yervante Damad Sun, 09 Dec 2007 14:36:13 +0100 timidity (2.13.2-15) unstable; urgency=low * Fix off-by-one crash error in panning reverb (Closes: #440543) -- Joost Yervante Damad Mon, 03 Sep 2007 12:15:58 +0200 timidity (2.13.2-14) unstable; urgency=low * Add note to README.Debian about how to get a systemwide timidity sequencer to work together with the pulseaudio system (Closes: #428353) * lintian fixes: first run configure before doing make clean in the debian/rules clean target * use neat exponentional backup select in interface/alsaseq_c.c with thanks to "C. " (Closes: #433643) -- Joost Yervante Damad Thu, 26 Jul 2007 20:40:14 +0200 timidity (2.13.2-13) unstable; urgency=low * Make work with flac 1.1.4 API (Closes: #426669, #427593) * Fix lintian warning about Source-Version -- Joost Yervante Damad Sun, 10 Jun 2007 09:52:13 +0200 timidity (2.13.2-12) unstable; urgency=low * honor CFLAGS (Closes: #421502) * stop with 01 iso 99 (Closes: #418873) -- Joost Yervante Damad Sat, 12 May 2007 16:04:06 +0200 timidity (2.13.2-11) unstable; urgency=low * add menu icon (Closes: #299394) Icon is based on interface/w32g_icon.ico which is part of the source distribution and available under the same license as timidity [lintian fixes] * use /lib/lsb/init-functions * add INIT INFO section to init.d script -- Joost Yervante Damad Thu, 29 Mar 2007 21:00:13 +0200 timidity (2.13.2-10) unstable; urgency=low * fix error message (Closes: #335295) * fix typos in manpages (Closes: #409588, #409590) * fix location of configfile in manpage (Closes: #360403) * use opt anti-alias=d instead of opt no-anti-alias (Closes: #396004) * mention 8MBGMSFX.SF2 in README.Debian (Closes: #350984) * don't url_unexpand_home_dir when opening a file with common.c:open_file (Closes: #327042) [lintian fixes] * make timidity binNMUable * make /usr/lib/timidity/tk*.tcl scripts executable -- Joost Yervante Damad Sat, 24 Mar 2007 08:09:43 +0100 timidity (2.13.2-9) unstable; urgency=low * Apply patch from version 2.13.2-7.3 which crossed my upload and fixes bug #414929. * Fix changelog to properly include 2.13.2-7.3 entry. -- Joost Yervante Damad Fri, 23 Mar 2007 19:55:50 +0100 timidity (2.13.2-8) unstable; urgency=low * New maintainer (Closes: #415829) -- Joost Yervante Damad Fri, 23 Mar 2007 19:49:25 +0100 timidity (2.13.2-7.3) unstable; urgency=high * Non-maintainer upload. * High-urgency upload for RC bugfix. * Call start-stop-daemon with --oknodo when stopping timidity in the init script, so that a stopped daemon isn't treated as an error on upgrade. Closes: #414929. * Also, don't use --exec with start-stop-daemon --stop, as this will fail to find a running daemon if the on-disk binary has been moved out from under us for any reason; use --name instead. -- Steve Langasek Thu, 22 Mar 2007 16:05:48 -0700 timidity (2.13.2-7.2) unstable; urgency=low * Non-maintainer upload with maintainer permission. * Don't enable alsa on non-linux architectures. * Don't build-depend on libasound2-dev on kfreebsd-i386, * kfreebsd-amd64 and hurd-i386 (closes: #327689) -- Aurelien Jarno Sun, 11 Mar 2007 01:29:56 +0100 timidity (2.13.2-7.1) unstable; urgency=high * Non-maintainer upload. * High-urgency upload for RC bugfix. * Build-depend on libx11-dev, libxext-dev, libxmu-dev, libxpm-dev, libxt-dev, x-dev instead of on the obsolete xlibs-dev (closes: #346962). * Build-depend on libxaw7-dev instead of libxaw8-dev -- according to the XSF, libxaw8-dev is expected to be dropped in Xorg 7.0. -- Steve Langasek Sun, 8 Jan 2006 23:06:19 -0800 timidity (2.13.2-7) unstable; urgency=low * Update libjack-dev dependencies (closes: #317227) * Update libflac-dev dependencies (closes: #325947) * Fix support for seekable FLAC streams by using the correct API (flac_a.c) for metadata, which does NOT have callbacks on seekable streams. Not that it matters much, as apparently TiMidity++ never tries to produce seekable FLAC streams currently * Build against libslang2-dev (closes: #315238) * Build against new libxaw8-dev, instead of libxaw7-dev * Execute libarts1 transition by rebuilding, no changes * Remove redeclaration of voices in interface/xaw_i.c:264, patch from Ubuntu (closes: #324400) * Bump standards version to 3.6.2 (no changes) * This upload addresses all bugs in the intended 6.1 NMU by Loïc Minier , even if it fixes them diferently. Therefore, it closes: #326454 * s/antialias/anti-alias/ in timidity.cfg (closes: #310307) * Fix spelling errors in some manpages, thanks to A Costa (closes: #300337, #309888) * Remove references to some old cruft utilities from manpage (closes: #292415) * Add a midrange sample config option set (closes: #305918) -- Henrique de Moraes Holschuh Sat, 3 Sep 2005 16:23:40 -0300 timidity (2.13.2-6) unstable; urgency=medium * Rebuild against libflac 1.1.1-5. This does NOT fix the whole fucked-up soname issue, since oggflac's still broken. But it will make the package installable for the time being (closes: #289251) -- Henrique de Moraes Holschuh Thu, 20 Jan 2005 17:08:57 -0200 timidity (2.13.2-5) unstable; urgency=high * The arts_free() fixes are now considered stable (although aRts support is still much worse than ALSA support, and it has some ugly open bugs), so set urgency=high on this upload * Fix gcc 3.4 FTBFS problem, thanks to Andreas Jochens for the patch (closes: #280267) -- Henrique de Moraes Holschuh Thu, 11 Nov 2004 11:54:26 -0200 timidity (2.13.2-4) unstable; urgency=low * aRts arts_free() fixes, chapter II: do not call arts_free() at all during normal program operation. Install atexit() handler to call arts_free() on clean exits. Thanks to Georg Wittenburg for feedback on how 2.13.2-3 worked out. -- Henrique de Moraes Holschuh Thu, 4 Nov 2004 21:15:23 -0200 timidity (2.13.2-3) unstable; urgency=low * It seems that doing some QA work and submiting a patch to the upstream BTS can really wake them up :) * upstream CVS: Fix NULL pointer derreference on empty sample names * Minor updates to package descriptions in the control file * Add primary watch file entry based on prdownloads.sf.net, since the ftp servers for sf.net are not realiable at all * Drop all aRts functionality that requires arts_free(). See Debian bug #247793, TiMidity++ bug #25, KDE bug #84514. aRts users, you better give me some feedback about how well 2.13.2-3 works with aRts, otherwise I will seriously consider killing aRts support altogether for the next stable release (closes: #239982) -- Henrique de Moraes Holschuh Sun, 31 Oct 2004 11:21:18 -0300 timidity (2.13.2-2) unstable; urgency=high * upstream CVS: Fix division by zero on module loading (closes: #268730) * upstream CVS: Minor fixes * Fix bad behaviour when playing modules, if a bad period is found, Patch based on Eric's patch on upstream BTS report #34. Forwarded to upstream BTS as report #37 -- Henrique de Moraes Holschuh Wed, 20 Oct 2004 15:11:31 -0300 timidity (2.13.2-1) unstable; urgency=high * New upstream source: * timidity.c: one s/strcat/strncat/. * Quote properly all M4 stuff in autoconf/ * This should get us in sync with upstream, in a very safe way :P * Urgency high because there are only obvious trivial changes -- Henrique de Moraes Holschuh Tue, 12 Oct 2004 19:23:28 -0300 timidity (2.13.1-1) unstable; urgency=low * New upstream source: * check_midi_file() in readmidi.c is now synchronized with the file format classification mechanism (closes: #216270) * Detect output device AFTER processing getlong options (closes: #245244) * Support OGG Speex encoder * Support OGG FLAC encoder * New app-defaults file for XAW interface * Lots of MIDI rendering fixes * Fixes some potential buffer/string overflows * Added libspeex-dev, liboggflac-dev, libflac-dev to Build-Depends * Readded GTK interface, now using GTK 2.0 (closes: #241136) -- Henrique de Moraes Holschuh Fri, 1 Oct 2004 12:58:34 -0300 timidity (2.13.0.final-2) unstable; urgency=medium * Update build-deps a bit: + remove libgtk1.2-dev, since we disabled the GTK frontend because of glib1.2/glib2.0 clashes caused by libarts1, and the stupid idea of not using symbol versioning in these libs on the first place + rename nas-dev to libaudio-dev * Fix bashism on initscript (really closes: #267300) * Add watch file for uscan/DEHS -- Henrique de Moraes Holschuh Wed, 29 Sep 2004 00:32:54 -0300 timidity (2.13.0.final-1) unstable; urgency=medium * Merged in new upstream release (closes: #255735) + Ogg Vorbis output module fixed (closes: #190316) * Fix build of Tcl/Tk frontend (closes: #237487) * Document in README.Debian how to reduce timidity's CPU usage, now that interpolation is completely runtime-configured * Recommends: freepats, now that it is packaged (closes: #239163) * Add a default minimal config for MIDI that attempts to use FreePats (closes: #237667, #254640, #258515) * In the minimal config, add commented-out options to get timidity to use much less CPU power (closes: #237506, #238207) * Move config file from /etc/timidity.cfg to /etc/timidity/timidity.cfg * Remove /usr/local timidity.cfg path from manpages (closes: #263904) * Fix -Or -> -OR typo in manpages (closes: #239978) * Start alsa sequencer very late, note that this change might only hold for new installs (closes: #243087) * Fix initscript pmidi test (closes: #239977) * Make sure to use Alsa sound output by default when using the initscript (closes: #242287) * The GTK interface is broken in 2.13.0, so I am removing it, and making sure nothing is left in the non-upstream docs (closes: #237487) * Install XAW interface app-default files into the proper directories * Fix file selector color in XAW interface when not playing in trace mode (closes: #243727) -- Henrique de Moraes Holschuh Sat, 7 Aug 2004 16:16:04 -0300 timidity (2.13.0-rc1-CVS20040221-2) unstable; urgency=low * Remove bashism from initscript (closes: #236593); * Rebuild against a libjack that is in the archive. Oops! (closes: #236751). -- Henrique de Moraes Holschuh Mon, 8 Mar 2004 19:37:05 -0300 timidity (2.13.0-rc1-CVS20040221-1) unstable; urgency=low * Merged in CVS changes up to 2004-02-21: + TiMidity++ will identify itself as 2.13.0-rc1, + Huge stack of added functionality and bug fixes, + Support ARtS and JACK output, + Use Gauss method for resampling; * Build-depends on JACK and ARtS libraries, as well as Tcl/Tk 8.4; * Rework package descriptions a bit more; * Rework copyright file; * Revise debian/rules, and switch to debhelper compatibility mode version 4; * Reworked packaging is compliant to Debian policy 3.6.1; * New timidity-interfaces-extra package with the reduced-functionality interfaces; * ALSA sequencer fully integrated (closes: #203099); * Install english documentation in binary package (closes: #188778); * Upstream has now manpages with the new upstream URL, and documents the SF2 patch files (called "SoundFonts" by upstream) (closes: #188140); * Remove /etc/timidity.cfg, since we simply have nothing useful to ship in there right now (closes: #233961); * Document in README.Debian that the user needs a patchset and a proper /etc/timidity.cfg if he is to get any sound out of MIDI files; * Add logic to clean up upstream utter mess of executable files and old cruft in the tarball. -- Henrique de Moraes Holschuh Mon, 23 Feb 2004 12:11:39 -0300 timidity (2.11.3-1) unstable; urgency=high * New upstream source (closes: #161678); * Release this, so that it enters testing ASAP, and we can move on with a CVS package * Switch mime handling to the XAW interface for now (closes: #153912) * Switch menu handling to the XAW interface, and fix menu entry (closes: #158111) * Update copyright file with new upstream locations and package state (closes: #167241) * This version works as a ALSA sound server (against ALSA 0.9, anyway) (closes: #203555) -- Henrique de Moraes Holschuh Thu, 25 Dec 2003 16:47:02 -0200 timidity (2.11.2-3) unstable; urgency=low * Switch to autotools-dev link behaviour (closes: #225046) * Rebuild autotools toolchain on CVS export * Use AM_MAINTAINER_MODE to avoid trouble with autotools chain * Fix acinclude.m4 CONFIG_INTERFACE to work with automake 1.7 * Add -fno-strict-aliasing to CFLAGS * Support DEB_BUILD_OPTIONS -- Henrique de Moraes Holschuh Thu, 25 Dec 2003 12:07:00 -0200 timidity (2.11.2-2) unstable; urgency=low * The "I am back from the bitbucket!" release. This one is just a quick new-maintainer-around upload, with some minor cleanup; * New maintainer (closes: #222958); * Acknowledging NMUs: + closes: #127375, #130238, #135493, #98151, #150747, #103097 + closes: #97894, #150947, #143409, #126994, #106530, #132847 + closes: #185357, #184842, #150746, #135493, #149320, #166869; * Remove full-stops from short descriptions, and version debhelper deps correctly -- Henrique de Moraes Holschuh Sun, 14 Dec 2003 16:56:21 -0200 timidity (2.11.2-1.5) unstable; urgency=low * NMU from Minneapolis BSP. * NEWS: Commented out refrences to timidity-patches in the configuration file. Uncomment these if you need to use them. (Closes: #166869) * Removed suggestion on nonexistant timidity-patches. -- Scott M. Dier Sat, 13 Dec 2003 21:31:48 -0600 timidity (2.11.2-1.4) unstable; urgency=low * NMU to fix further breakage caused by libvorbis0 -> libvorbis0a (closes: #185357) * Build-depend on libvorbis-dev (>= 1.0.0-3) -- Andrew Suffield Wed, 26 Mar 2003 10:36:59 +0000 timidity (2.11.2-1.3) unstable; urgency=low * NMU to fix breakage caused by libvorbis0 split. -- Christopher L Cheney Tue, 30 Jul 2002 00:00:00 -0500 timidity (2.11.2-1.2) unstable; urgency=low * Non-maintainer Upload * Fixed Emacs el (Closes: #150947) -- Aubin Paul Tue, 25 Jun 2002 10:28:35 -0400 timidity (2.11.2-1.1) unstable; urgency=low * Non-maintainer upload * Re-enabled Xaw interface (Closes: #150747) * Added dependency on timidity-patches (Closes: #150746) * Moved arch independent files from Xaw into /usr/share * Fixed broken 'make distclean' -- Aubin Paul Mon, 24 Jun 2002 09:43:46 -0400 timidity (2.11.2-1) unstable; urgency=low * Non-maintainer upload. * Updated to build against and for alsa9 (Closes: #97894) * Updated to use alsa/asoundllib (Closes: #106530, #143409) * Fixed config file (Closes: #103097) * Added menu item (Closes: #127375, #130238) * New upstream releases (Closes: #135493, #149320) * Removed Motif and Xaw interfaces (Closes: #98151) * Rebuilt all Makefile.in and configure scripts -- Aubin Paul Wed, 19 Jun 2002 15:02:49 -0400 timidity (2.10.4-2.2) unstable; urgency=high * Non-maintainer upload. * /etc/emacs/site-start.d/50timidity-el.el is now a conffile. (Closes: #132847) -- Daniel Burrows Sat, 2 Mar 2002 23:45:05 -0500 timidity (2.10.4-2.1) unstable; urgency=low * Non-maintainer upload. * Build-depend on libasound1-dev on m68k (closes: #106530) and hppa (closes: #126994). * Provide a real alternative for the slang-dev6 build-dependency. -- Colin Watson Sun, 30 Dec 2001 14:05:43 +0000 timidity (2.10.4-2) unstable; urgency=low * Update build deps for ia64. (closes: #105176) * Update to standards version 3.5.5. -- Martin Mitchell Sun, 22 Jul 2001 00:16:38 +1000 timidity (2.10.4-1) unstable; urgency=low * New upstream release. (closes: #74557) * Update to standards version 3.5.2. * Update build dependencies. (closes: #90720) * Change default patches path to /usr/share/timidty/patches. -- Martin Mitchell Sat, 7 Apr 2001 12:56:20 +1000 timidity (2.10.2-1) unstable; urgency=low * New upstream release. (closes: #77433) * Update copyright information. (closes: #77434) * Update to standards version 3.2.1. -- Martin Mitchell Mon, 29 Jan 2001 00:19:51 +1100 timidity (2.10.0-2) unstable; urgency=low * Add arch-dependent build deps for alsa. (closes: #72085) -- Martin Mitchell Sun, 8 Oct 2000 13:28:58 +1100 timidity (2.10.0-1) unstable; urgency=low * New upstream release. (closes: #66851) * Add Ogg Vorbis and alsa sequencer client options. * Remove automake depth-first bug workaround. * Add emacs support in separate package. (closes: #47157, #60759) -- Martin Mitchell Sun, 27 Aug 2000 20:49:46 +1100 timidity (2.9.3-1) unstable; urgency=low * New upstream release. (closes: #62564, #64091) -- Martin Mitchell Wed, 17 May 2000 01:51:53 +1000 timidity (2.9.2-1) unstable; urgency=low * New upstream release. (closes: #61851) * Include server support. (closes: #49444) -- Martin Mitchell Mon, 17 Apr 2000 00:29:29 +1000 timidity (2.9.1-1) frozen unstable; urgency=low * New upstream bugfix release. (closes: #61036, #56806, #60718, #51218) * Update to standards version 3.1.1. -- Martin Mitchell Sat, 25 Mar 2000 00:34:32 +1100 timidity (2.7.0-1) unstable; urgency=low * New upstream release. (closes: #48175, #47650) * Enable cspline interpolation support. (closes: #47372) * Documentation update in timidity.cfg manpage. (closes: #47371) -- Martin Mitchell Wed, 27 Oct 1999 19:19:16 +1000 timidity (2.6.1-1) unstable; urgency=low * New upstream release. (closes: #46559, #38836, #43678, #45039) -- Martin Mitchell Mon, 4 Oct 1999 19:52:40 +1000 timidity (2.4.1-1) unstable; urgency=low * New upstream release. (closes: #43252, #41370) -- Martin Mitchell Sun, 22 Aug 1999 13:27:13 +1000 timidity (2.0.2-1) unstable; urgency=low * New upstream release. -- Martin Mitchell Sun, 9 May 1999 05:10:23 +1000 timidity (0.2k-4) unstable; urgency=low * Fix segfault when called with no args. (#31435) * Apply patch from upstream for latest gtk. -- Martin Mitchell Wed, 13 Jan 1999 22:26:48 +1100 timidity (0.2k-3) unstable; urgency=low * Recompile with latest gtk/glib. -- Martin Mitchell Mon, 28 Dec 1998 15:24:51 +1100 timidity (0.2k-2) unstable; urgency=low * Fix problems with playing compressed files with characters which require escaping. (#30563) -- Martin Mitchell Fri, 11 Dec 1998 01:12:02 +1100 timidity (0.2k-1) unstable; urgency=low * New upstream release. (#25039) * Update to standards version 2.5.0. * Update copyright information. -- Martin Mitchell Thu, 10 Dec 1998 00:27:23 +1100 timidity (0.2i-9) frozen unstable; urgency=low * Recompile for libslang1. -- Martin Mitchell Tue, 20 Oct 1998 01:11:18 +1000 timidity (0.2i-8) unstable; urgency=low * Recompile for libncurses4. -- Martin Mitchell Mon, 12 Oct 1998 17:19:58 +1000 timidity (0.2i-7) unstable; urgency=low * Use update-mime to install mime types. (#26341) -- Martin Mitchell Thu, 10 Sep 1998 02:54:07 +1000 timidity (0.2i-6) unstable; urgency=low * Update to standards version 2.4.1. * Fix compile errors for powerpc. -- Martin Mitchell Mon, 31 Aug 1998 16:55:26 +1000 timidity (0.2i-5) frozen unstable; urgency=low * Updated to standards version 2.4.0.0. * Include extra comments in /etc/timidity.cfg to explain defaults. (#16626) * Add MIME entries in /etc/mailcap. (#17760) * Add patch from Thomas Sailer to standardize non-blocking call. (#20907) Patch at: http://www.ife.ee.ethz.ch/~sailer/linux/audiopci.html -- Martin Mitchell Mon, 13 Apr 1998 23:15:20 +1000 timidity (0.2i-4) unstable; urgency=low * New maintainer. * Updated to standards version 2.3.0.1. * Include patches for compilation on alpha. (#13023) -- Martin Mitchell Fri, 12 Dec 1997 19:39:54 +1100 timidity (0.2i-3.1) unstable; urgency=low * Non-maintainer release. * Libc6 compile. -- Martin Mitchell Fri, 7 Nov 1997 14:31:43 +1100 timidity (0.2i-3) contrib; urgency=low * Added motif (-im) and slang (-is) interface support. * Made dumb terminal mode the default interface. * Remove {depends,tclIndex,tkmidity.tcl} in clean rule. * Minor packaging changes. * Uses wish instead of wishx for tcl interface (fixes #6445). * No longer treats instrument 16 as percussion by default. * Minor directory re-organization. -- Klee Dienes Thu, 16 Jan 1997 12:51:17 -0500 timidity (0.2i-2) contrib; urgency=low * Minor packaging changes. -- Klee Dienes Sat, 2 Nov 1996 17:08:25 -0700 timidity (0.2i-1) contrib; urgency=low * Initial release. -- Klee Dienes Thu, 5 Sep 1996 04:36:32 -0700 debian/timidity.dirs0000644000000000000000000000002111112236154011672 0ustar usr/lib/timidity debian/timidity.manpages0000644000000000000000000000014011126114244012526 0ustar doc/C/timidity.1 doc/C/timidity.cfg.5 doc/ja_JP.eucJP/timidity.1 doc/ja_JP.eucJP/timidity.cfg.5 debian/timidity.preinst0000644000000000000000000000375311254150715012441 0ustar #! /bin/sh # preinst script for timidity # $Id: timidity.preinst,v 1.1 2004/08/07 14:50:26 hmh Exp $ # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * `install' # * `install' # * `upgrade' # * `abort-upgrade' # # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package # Remove a no-longer used conffile rm_conffile() { local PKGNAME="$1" local CONFFILE="$2" [ -e "$CONFFILE" ] || return 0 local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')" local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \ sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")" if [ "$md5sum" != "$old_md5sum" ]; then echo "Obsolete conffile $CONFFILE has been modified by you." echo "Saving as $CONFFILE.dpkg-bak ..." mv -f "$CONFFILE" "$CONFFILE".dpkg-bak else echo "Removing obsolete conffile $CONFFILE ..." rm -f "$CONFFILE" fi } LAST_VERSION=2.13.2-31 case "$1" in install|upgrade) # move conffile [ -r /etc/timidity.cfg ] && [ ! -e /etc/timidity/timidity.cfg ] && { echo "Moving /etc/timidity.cfg to /etc/timidity/timidity.cfg" >&2 umask 022 [ -d /etc/timidity ] || mkdir -p /etc/timidity mv -f /etc/timidity.cfg /etc/timidity/timidity.cfg } if [ -f /etc/init.d/timidity ]; then if dpkg --compare-versions "$2" le "$LASTVERSION"; then echo "Stopping old timidity because of location change.." if which invoke-rc.d >/dev/null 2>&1; then invoke-rc.d timidity stop else /etc/init.d/timidity stop fi fi fi ;; abort-upgrade) ;; *) echo "preinst called with unknown argument \`$1'" >&2 exit 1 ;; esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 debian/timidity-interfaces-extra.desktop0000644000000000000000000000073311161754633015671 0ustar [Desktop Entry] Comment=Software sound renderer (MIDI sequencer, MOD player) Comment[ja]=ソフトウェア・シンセサイザ（MIDI/MODプレイヤー） Name=TiMidity++ MIDI sequencer Name[ja]=TiMidity++ MIDIシーケンサ Terminal=false Type=Application Exec=/usr/bin/timidity -ia Categories=AudioVideo;Audio;Sequencer; X-AppInstall-Package=timidity-interfaces-extra X-AppInstall-Section=universe Icon=/usr/share/pixmaps/timidity.xpm MimeType=audio/midi;audio/x-mod; debian/timidity.menu0000644000000000000000000000024211112236154011702 0ustar ?package(timidity):needs="x11" section="Applications/Sound" \ title="TiMidity++" command="timidity -ia" hints="Player" \ icon="/usr/share/pixmaps/timidity.xpm" debian/patches/0000755000000000000000000000000012233430547010620 5ustar debian/patches/581914_close_fds.patch0000644000000000000000000000154311375451357014450 0ustar Index: timidity-2.13.2/debian/timidity-daemon.timidity.init =================================================================== --- timidity-2.13.2.orig/debian/timidity-daemon.timidity.init 2010-05-21 11:10:36.000000000 +0200 +++ timidity-2.13.2/debian/timidity-daemon.timidity.init 2010-05-21 11:31:21.000000000 +0200 @@ -72,7 +72,7 @@ log_begin_msg "Starting $DESC..." mkdir -p /var/run/timidity chown timidity /var/run/timidity - if start-stop-daemon ${START} >/dev/null; then + if start-stop-daemon ${START} < /dev/null >/dev/null 2>&1; then log_end_msg 0 else log_end_msg 1 @@ -81,7 +81,7 @@ ;; stop) log_begin_msg "Stopping $DESC..." - if start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE} \ + if start-stop-daemon --stop --oknodo --pidfile ${PIDFILE} \ --name ${NAME} --retry 10 ; then log_end_msg 0 else debian/patches/close_fs.patch0000644000000000000000000000112711375452423013442 0ustar Index: timidity-2.13.2/debian/timidity-daemon.timidity.init =================================================================== --- timidity-2.13.2.orig/debian/timidity-daemon.timidity.init 2010-05-21 11:39:31.000000000 +0200 +++ timidity-2.13.2/debian/timidity-daemon.timidity.init 2010-05-21 11:40:08.000000000 +0200 @@ -72,7 +72,7 @@ log_begin_msg "Starting $DESC..." mkdir -p /var/run/timidity chown timidity /var/run/timidity - if start-stop-daemon ${START} >/dev/null; then + if start-stop-daemon ${START} < /dev/null >/dev/null 2>&1; then log_end_msg 0 else log_end_msg 1 debian/patches/series0000644000000000000000000000003111375452505012033 0ustar debian-changes-2.13.2-36 debian/patches/debian-changes-2.13.2-360000644000000000000000000222641611313360323014347 0ustar Description: Upstream changes introduced in version 2.13.2-36 This patch has been created by dpkg-source during the package build. Here's the last changelog entry, hopefully it gives details on why those changes were made: . timidity (2.13.2-36) unstable; urgency=low . * Make sure stop is only invoked when init.d script actually exists (Closes: #546815) . The person named in the Author field signed this changelog entry. Author: Joost Yervante Damad Bug-Debian: http://bugs.debian.org/546815 --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: http://bugs.debian.org/ Forwarded: Reviewed-By: Last-Update: --- timidity-2.13.2.orig/configure +++ timidity-2.13.2/configure @@ -311,7 +311,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT EMACS lispdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP RANLIB ac_ct_RANLIB LN_S X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS NEEDGETOPT_TRUE NEEDGETOPT_FALSE ALSA_CFLAGS ALSA_LIBS ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS AO_CFLAGS AO_LIBS VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS LIBFLAC_CFLAGS LIBFLAC_LIBS LIBOGGFLAC_CFLAGS LIBOGGFLAC_LIBS NEEDDLOPEN_TRUE NEEDDLOPEN_FALSE ENABLE_NCURSES_TRUE ENABLE_NCURSES_FALSE n_so_libs ENABLE_SLANG_TRUE ENABLE_SLANG_FALSE s_so_libs ENABLE_MOTIF_TRUE ENABLE_MOTIF_FALSE m_so_libs ENABLE_TCLTK_TRUE ENABLE_TCLTK_FALSE k_so_libs ENABLE_DYNAMIC_TCLTK_TRUE ENABLE_DYNAMIC_TCLTK_FALSE ENABLE_EMACS_TRUE ENABLE_EMACS_FALSE e_so_libs ENABLE_VT100_TRUE ENABLE_VT100_FALSE T_so_libs ENABLE_XAW_TRUE ENABLE_XAW_FALSE a_so_libs ENABLE_DYNAMIC_XAW_TRUE ENABLE_DYNAMIC_XAW_FALSE ENABLE_XSKIN_TRUE ENABLE_XSKIN_FALSE i_so_libs ENABLE_GTK_TRUE ENABLE_GTK_FALSE PKG_CONFIG GTK_CONFIG GTK_CFLAGS GTK_LIBS g_so_libs ENABLE_SERVER_TRUE ENABLE_SERVER_FALSE r_so_libs ENABLE_ALSASEQ_TRUE ENABLE_ALSASEQ_FALSE A_so_libs ENABLE_WINSYN_TRUE ENABLE_WINSYN_FALSE W_so_libs ENABLE_PORTMIDISYN_TRUE ENABLE_PORTMIDISYN_FALSE P_so_libs ENABLE_W32G_SYN_TRUE ENABLE_W32G_SYN_FALSE ENABLE_W32GUI_TRUE ENABLE_W32GUI_FALSE w_so_libs ENABLE_PLUGIN_TRUE ENABLE_PLUGIN_FALSE p_so_libs ENABLE_NETWORK_TRUE ENABLE_NETWORK_FALSE ENABLE_SOUND_SPEC_TRUE ENABLE_SOUND_SPEC_FALSE ENABLE_WRD_TRUE ENABLE_WRD_FALSE CYGNUS_TRUE CYGNUS_FALSE MSYS_TRUE MSYS_FALSE VCPP_TRUE VCPP_FALSE BORLANDC_TRUE BORLANDC_FALSE WATCOM_C_TRUE WATCOM_C_FALSE W32READDIR_TRUE W32READDIR_FALSE BORLANDC_START BORLANDC_LDFLAGS timidity_LDFLAGS WATCOM_LDFLAGS VCPP_LDFLAGS SYSEXTRAS EXTRALIBS NETSRCS ELFILES SHLD SHCFLAGS dynamic_targets so WISH tcltk_dep INTERFACE_SRCS pkgdatadir pkglibdir LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT EMACS EMACSLOADPATH lispdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP RANLIB ac_ct_RANLIB LN_S X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS NEEDGETOPT_TRUE NEEDGETOPT_FALSE ALSA_CFLAGS ALSA_LIBS ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS AO_CFLAGS AO_LIBS VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS LIBFLAC_CFLAGS LIBFLAC_LIBS LIBOGGFLAC_CFLAGS LIBOGGFLAC_LIBS NEEDDLOPEN_TRUE NEEDDLOPEN_FALSE ENABLE_NCURSES_TRUE ENABLE_NCURSES_FALSE n_so_libs ENABLE_SLANG_TRUE ENABLE_SLANG_FALSE s_so_libs ENABLE_MOTIF_TRUE ENABLE_MOTIF_FALSE m_so_libs ENABLE_TCLTK_TRUE ENABLE_TCLTK_FALSE k_so_libs ENABLE_DYNAMIC_TCLTK_TRUE ENABLE_DYNAMIC_TCLTK_FALSE ENABLE_EMACS_TRUE ENABLE_EMACS_FALSE e_so_libs ENABLE_VT100_TRUE ENABLE_VT100_FALSE T_so_libs ENABLE_XAW_TRUE ENABLE_XAW_FALSE a_so_libs ENABLE_DYNAMIC_XAW_TRUE ENABLE_DYNAMIC_XAW_FALSE ENABLE_XSKIN_TRUE ENABLE_XSKIN_FALSE i_so_libs ENABLE_GTK_TRUE ENABLE_GTK_FALSE PKG_CONFIG GTK_CONFIG GTK_CFLAGS GTK_LIBS g_so_libs ENABLE_SERVER_TRUE ENABLE_SERVER_FALSE r_so_libs ENABLE_ALSASEQ_TRUE ENABLE_ALSASEQ_FALSE A_so_libs ENABLE_WINSYN_TRUE ENABLE_WINSYN_FALSE W_so_libs ENABLE_PORTMIDISYN_TRUE ENABLE_PORTMIDISYN_FALSE P_so_libs ENABLE_W32G_SYN_TRUE ENABLE_W32G_SYN_FALSE ENABLE_W32GUI_TRUE ENABLE_W32GUI_FALSE w_so_libs ENABLE_PLUGIN_TRUE ENABLE_PLUGIN_FALSE p_so_libs ENABLE_NETWORK_TRUE ENABLE_NETWORK_FALSE ENABLE_SOUND_SPEC_TRUE ENABLE_SOUND_SPEC_FALSE ENABLE_WRD_TRUE ENABLE_WRD_FALSE CYGNUS_TRUE CYGNUS_FALSE MSYS_TRUE MSYS_FALSE VCPP_TRUE VCPP_FALSE BORLANDC_TRUE BORLANDC_FALSE WATCOM_C_TRUE WATCOM_C_FALSE W32READDIR_TRUE W32READDIR_FALSE BORLANDC_START BORLANDC_LDFLAGS timidity_LDFLAGS WATCOM_LDFLAGS VCPP_LDFLAGS SYSEXTRAS EXTRALIBS NETSRCS ELFILES SHLD SHCFLAGS dynamic_targets so WISH tcltk_dep INTERFACE_SRCS pkgdatadir pkglibdir LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -752,6 +752,14 @@ ac_env_target_alias_set=${target_alias+s ac_env_target_alias_value=$target_alias ac_cv_env_target_alias_set=${target_alias+set} ac_cv_env_target_alias_value=$target_alias +ac_env_EMACS_set=${EMACS+set} +ac_env_EMACS_value=$EMACS +ac_cv_env_EMACS_set=${EMACS+set} +ac_cv_env_EMACS_value=$EMACS +ac_env_EMACSLOADPATH_set=${EMACSLOADPATH+set} +ac_env_EMACSLOADPATH_value=$EMACSLOADPATH +ac_cv_env_EMACSLOADPATH_set=${EMACSLOADPATH+set} +ac_cv_env_EMACSLOADPATH_value=$EMACSLOADPATH ac_env_CC_set=${CC+set} ac_env_CC_value=$CC ac_cv_env_CC_set=${CC+set} @@ -858,11 +866,11 @@ if test -n "$ac_init_help"; then Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer --enable-debug Build a debugging version. - --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors --enable-audio=mode_list Enable audio (Specify comma separated mode list): default: Automatically select audio device. oss: OSS /dev/dsp @@ -935,7 +943,7 @@ Optional Packages: --with-libraries=DIR Specify library directories (colon separated) --with-default-path=DIR Where timidity.cfg is (PREFIX/share/timidity) --with-module-dir=DIR Where to install interfaces (PREFIX/lib/timidity) - --with-lispdir Override the default lisp directory + --with-lispdir override the default lisp directory --with-elf create ELF shared object instead of AOUT --with-x use the X Window System --with-tcl-includes=DIR Tcl include file path @@ -974,6 +982,9 @@ Optional Packages: --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) Some influential environment variables: + EMACS the Emacs editor command + EMACSLOADPATH + the Emacs library search path CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a @@ -1074,7 +1085,7 @@ esac else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -1538,7 +1549,7 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- -am__api_version="1.7" +am__api_version="1.9" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -1676,7 +1687,6 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed - # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1690,6 +1700,39 @@ else echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi +fi + for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -1768,7 +1811,7 @@ else fi rmdir .tst 2>/dev/null - # test to see if srcdir already configured +# test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 @@ -1816,9 +1859,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -AMTAR=${AMTAR-"${am_missing_run}tar"} - install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user @@ -1911,6 +1951,13 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst # We need awk for the "check" target. The system "awk" is bad on # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + @@ -2097,17 +2144,6 @@ _ACEOF # Checks for programs. - -# Check whether --with-lispdir or --without-lispdir was given. -if test "${with_lispdir+set}" = set; then - withval="$with_lispdir" - lispdir="$withval" - echo "$as_me:$LINENO: checking where .elc files should go" >&5 -echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: $lispdir" >&5 -echo "${ECHO_T}$lispdir" >&6 -else - # If set to t, that means we are running in a shell under Emacs. # If you have an Emacs named "t", then use the full path. test x"$EMACS" = xt && EMACS= @@ -2152,13 +2188,27 @@ fi done test -n "$EMACS" || EMACS="no" - if test $EMACS != "no"; then - if test x${lispdir+set} != xset; then - echo "$as_me:$LINENO: checking where .elc files should go" >&5 + + + +# Check whether --with-lispdir or --without-lispdir was given. +if test "${with_lispdir+set}" = set; then + withval="$with_lispdir" + lispdir="$withval" + echo "$as_me:$LINENO: checking where .elc files should go" >&5 +echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $lispdir" >&5 +echo "${ECHO_T}$lispdir" >&6 +else + + echo "$as_me:$LINENO: checking where .elc files should go" >&5 echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6 if test "${am_cv_lispdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + if test $EMACS != "no"; then + if test x${lispdir+set} != xset; then # If $EMACS isn't GNU Emacs or XEmacs, this can blow up pretty badly # Some emacsen will start up in interactive mode, requiring C-x C-c to exit, # which is non-obvious for non-emacs users. @@ -2169,22 +2219,20 @@ else ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - am_cv_lispdir=`sed -n \ + am_cv_lispdir=`sed -n \ -e 's,/$,,' \ - -e '/.*\/lib\/x\?emacs\/site-lisp$/{s,.*/lib/\(x\?emacs/site-lisp\)$,${libdir}/\1,;p;q;}' \ - -e '/.*\/share\/x\?emacs\/site-lisp$/{s,.*/share/\(x\?emacs/site-lisp\),${datadir}/\1,;p;q;}' \ + -e '/.*\/lib\/x*emacs\/site-lisp$/{s,.*/lib/\(x*emacs/site-lisp\)$,${libdir}/\1,;p;q;}' \ + -e '/.*\/share\/x*emacs\/site-lisp$/{s,.*/share/\(x*emacs/site-lisp\),${datadir}/\1,;p;q;}' \ conftest.out` rm conftest.out - if test -z "$am_cv_lispdir"; then - am_cv_lispdir='${datadir}/emacs/site-lisp' - fi + fi + fi + test -z "$am_cv_lispdir" && am_cv_lispdir='${datadir}/emacs/site-lisp' fi echo "$as_me:$LINENO: result: $am_cv_lispdir" >&5 echo "${ECHO_T}$am_cv_lispdir" >&6 - lispdir="$am_cv_lispdir" - fi - fi + lispdir="$am_cv_lispdir" fi; @@ -2757,8 +2805,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2816,8 +2863,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2933,8 +2979,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2988,8 +3033,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3034,8 +3078,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3079,8 +3122,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3225,7 +3267,9 @@ else : > 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 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf @@ -3253,9 +3297,14 @@ else 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 + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi @@ -4034,8 +4083,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4108,8 +4156,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4181,8 +4228,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4249,8 +4295,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4319,8 +4364,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4424,8 +4468,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4494,8 +4537,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4532,9 +4574,12 @@ fi fi done -echo "$as_me:$LINENO: checking for X" >&5 + +if test "x$ac_path_x_has_been_run" != xyes; then + echo "$as_me:$LINENO: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 +ac_path_x_has_been_run=yes # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -4627,7 +4672,7 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for a specified header file. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4701,8 +4746,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4762,10 +4806,15 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + # It might be that x_includes is empty (headers are found in the + # standard search path. Then output the corresponding message + ac_out_x_includes=$x_includes + test "x$x_includes" = x && ac_out_x_includes="in standard search path" + echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 fi +fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. @@ -4813,8 +4862,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4865,8 +4913,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4942,8 +4989,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4998,8 +5044,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5067,8 +5112,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5176,8 +5220,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5241,8 +5284,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5310,8 +5352,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5415,8 +5456,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5480,8 +5520,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5578,8 +5617,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5643,8 +5681,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5741,8 +5778,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5806,8 +5842,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5886,8 +5921,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5985,8 +6019,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6053,8 +6086,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6124,8 +6156,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6195,8 +6226,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6268,8 +6298,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6338,8 +6367,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6408,8 +6436,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6507,8 +6534,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6578,8 +6604,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6645,8 +6670,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6717,8 +6741,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6818,8 +6841,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6888,8 +6910,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7021,236 +7042,7 @@ _ACEOF fi -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5 -echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6 -if test "${ac_cv_header_stdbool_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#ifndef bool -# error bool is not defined -#endif -#ifndef false -# error false is not defined -#endif -#if false -# error false is not 0 -#endif -#ifndef true -# error true is not defined -#endif -#if true != 1 -# error true is not 1 -#endif -#ifndef __bool_true_false_are_defined -# error __bool_true_false_are_defined is not defined -#endif - - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) -0.5 == true ? 1 : -1]; - bool e = &s; - char f[(_Bool) -0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - -int -main () -{ - return !a + !b + !c + !d + !e + !f + !g + !h + !i; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_stdbool_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_stdbool_h=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 -echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6 -echo "$as_me:$LINENO: checking for _Bool" >&5 -echo $ECHO_N "checking for _Bool... $ECHO_C" >&6 -if test "${ac_cv_type__Bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if ((_Bool *) 0) - return 0; -if (sizeof (_Bool)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type__Bool=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type__Bool=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5 -echo "${ECHO_T}$ac_cv_type__Bool" >&6 -if test $ac_cv_type__Bool = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE__BOOL 1 -_ACEOF - - -fi - -if test $ac_cv_header_stdbool_h = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_STDBOOL_H 1 -_ACEOF - -fi - +#AC_HEADER_STDBOOL echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 if test "${ac_cv_header_sys_wait_h+set}" = set; then @@ -7290,8 +7082,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7356,8 +7147,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7429,8 +7219,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7502,8 +7291,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7557,8 +7345,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7629,8 +7416,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7684,8 +7470,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7719,6 +7504,77 @@ fi fi +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + @@ -7828,8 +7684,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7978,8 +7833,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8041,8 +7895,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8197,8 +8050,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8240,8 +8092,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8298,8 +8149,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8425,8 +8275,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8531,8 +8380,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8592,8 +8440,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8665,8 +8512,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8782,8 +8628,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8846,8 +8691,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8912,8 +8756,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8978,8 +8821,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9042,8 +8884,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9107,8 +8948,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9211,8 +9051,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9274,8 +9113,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9345,8 +9183,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9531,8 +9368,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9911,8 +9747,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10096,8 +9931,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10337,8 +10171,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10377,8 +10210,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10505,8 +10337,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10605,8 +10436,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10700,8 +10530,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10876,8 +10705,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11052,8 +10880,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11168,8 +10995,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11275,8 +11101,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11337,8 +11162,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11610,8 +11434,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11959,8 +11782,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12036,8 +11858,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12113,8 +11934,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12251,8 +12071,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12380,8 +12199,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12658,8 +12476,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12992,8 +12809,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13222,8 +13038,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13292,8 +13107,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13436,8 +13250,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13785,8 +13598,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13872,8 +13684,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14094,8 +13905,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14300,8 +14110,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14517,8 +14326,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14723,8 +14531,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14807,8 +14614,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14980,8 +14786,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15081,8 +14886,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15177,8 +14981,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15276,8 +15079,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15372,8 +15174,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15441,8 +15242,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15683,8 +15483,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15852,8 +15651,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15919,8 +15717,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15993,8 +15790,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16069,8 +15865,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16222,8 +16017,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16292,8 +16086,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16471,8 +16264,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16644,8 +16436,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16716,8 +16507,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17335,8 +17125,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17636,8 +17425,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17812,8 +17600,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18107,8 +17894,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18184,8 +17970,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18261,8 +18046,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18603,8 +18387,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18757,8 +18540,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18879,8 +18661,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19082,8 +18863,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19144,8 +18924,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19296,8 +19075,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20523,18 +20301,22 @@ s,@AUTOCONF@,$AUTOCONF,;t t s,@AUTOMAKE@,$AUTOMAKE,;t t s,@AUTOHEADER@,$AUTOHEADER,;t t s,@MAKEINFO@,$MAKEINFO,;t t -s,@AMTAR@,$AMTAR,;t t s,@install_sh@,$install_sh,;t t s,@STRIP@,$STRIP,;t t s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t +s,@mkdir_p@,$mkdir_p,;t t s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@am__leading_dot@,$am__leading_dot,;t t +s,@AMTAR@,$AMTAR,;t t +s,@am__tar@,$am__tar,;t t +s,@am__untar@,$am__untar,;t t s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t s,@MAINT@,$MAINT,;t t s,@EMACS@,$EMACS,;t t +s,@EMACSLOADPATH@,$EMACSLOADPATH,;t t s,@lispdir@,$lispdir,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t @@ -20844,11 +20626,6 @@ esac *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -20887,6 +20664,12 @@ echo "$as_me: error: cannot find input f fi;; esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub @@ -21300,27 +21083,21 @@ echo X"$mf" | else continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue --- timidity-2.13.2.orig/ChangeLog +++ timidity-2.13.2/ChangeLog @@ -1,3 +1,29 @@ +2004-10-21 Henrique de Moraes Holschuh + + * timidity/mod2midi.c (Voice_Play,Voice_SetPeriod): + improve the code path when period2note returns -1 + +2004-10-21 Eric A. Welsh + + * timidity/mod2midi.c (period2note): + initialize *finetune when returning a bad period + * timidity/mod2midi.c (load_module_samples): + samples without names were causing NULL pointer reads + * timidity/mod2midi.c (period2note): + delete extra \n + +2004-10-18 Eric A. Welsh + + * libunimod/mlutil.c (getAmigaPeriod): Avoid division by zero + * timidity/mod2midi.c: Change all VERB_NORMAL and VERB_VERBOSE + messages to VERB_NOISY. + +2004-10-17 URABE Shyouhei + + * libunimod/mloader.c (SL_LoadSamples): too many arguments to + function `FreeSampleList' + * timidity/aq.c: fix wrong prototype (int -> void) + 2004-10-03 URABE Shyouhei * NEWS: Add new entry for 2.13.2 --- timidity-2.13.2.orig/config.h.in +++ timidity-2.13.2/config.h.in @@ -203,9 +203,6 @@ /* Define to 1 if you have the `sqrt' function. */ #undef HAVE_SQRT -/* Define to 1 if stdbool.h conforms to C99. */ -#undef HAVE_STDBOOL_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDDEF_H @@ -352,9 +349,6 @@ /* Define to 1 if you have the `XShmCreatePixmap' function. */ #undef HAVE_XSHMCREATEPIXMAP -/* Define to 1 if the system has the type `_Bool'. */ -#undef HAVE__BOOL - /* Define to 1 if you are NOT in debug mode */ #undef NDEBUG --- /dev/null +++ timidity-2.13.2/autogen.sh @@ -0,0 +1,71 @@ +#!/bin/sh +# +# autogen.sh glue for timidity 2.12.x +# $Id: autogen.sh,v 1.11 2004/10/01 14:37:07 hmh Exp $ +# +# Requires: automake, autoconf (newest versions), dpkg-dev +# +# Run with updateexec to update debian/executable.files +set -e + +# Refresh GNU autotools toolchain. +echo "Running autotools..." +rm -rf autom4te.cache +aclocal-1.9 -I autoconf +autoheader +automake-1.9 --foreign --add-missing + +# The automake package already links config.sub/guess to /usr/share/misc/ +for i in config.guess config.sub missing install-sh mkinstalldirs depcomp ; do + test -r /usr/share/automake-1.9/${i} && { + rm -f "autoconf/${i}" + cp -f "/usr/share/automake-1.9/${i}" autoconf/ + } + chmod 755 autoconf/${i} +done + +autoconf + +# For the Debian build +test -d debian && { + # link these in Debian builds + rm -f autoconf/config.sub autoconf/config.guess + ln -s /usr/share/misc/config.sub autoconf/config.sub + ln -s /usr/share/misc/config.guess autoconf/config.guess + + # refresh list of executable scripts, to avoid possible breakage if + # upstream tarball does not include the file or if it is mispackaged + # for whatever reason. + [ "$1" == "updateexec" ] && { + echo Generating list of executable files... + rm -f debian/executable.files + find -type f -perm +111 ! -name '.*' -fprint debian/executable.files + } + + # Remove any files in upstream tarball that we don't have in the Debian + # package (because diff cannot remove files) + version=`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | sed -e 's/-[^-]\+$//'` + source=`dpkg-parsechangelog | awk '/Source:/ { print $2 }' | tr -d ' '` + if test -r ../${source}_${version}.orig.tar.gz ; then + echo Generating list of files that should be removed... + rm -f debian/deletable.files + touch debian/deletable.files + mkdir debian/tmp + cd debian/tmp + tar -zxf ../../../${source}_${version}.orig.tar.gz + cd ../.. + for i in $(find debian/tmp/ -type f ! -name '.*' -print0 | awk -F '\000' '{ print "\"" $0 "\"" }') ; do + if test -r "${i}" ; then + filename=$(echo "${i}" | sed -e 's#.*debian/tmp/[^/]\+/##') + test -r "${filename}" || echo "${filename}" >>debian/deletable.files + fi + done + rm -fr debian/tmp + else + echo Emptying list of files that should be deleted... + rm -f debian/deletable.files + touch debian/deletable.files + fi +} + +exit 0 --- timidity-2.13.2.orig/Makefile.in +++ timidity-2.13.2/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -33,15 +33,11 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # This Makefile is known to work with GNU make. - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -55,7 +51,57 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +subdir = . +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/TiMidity-uj.ad.in \ + $(srcdir)/TiMidity.ad.in $(srcdir)/common.makefile.in \ + $(srcdir)/config.h.in $(srcdir)/interface.h.in \ + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ + TODO +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h interface.h +CONFIG_CLEAN_FILES = common.makefile TiMidity.ad TiMidity-uj.ad +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +pkgdatadir = @pkgdatadir@ +pkglibdir = @pkglibdir@ ACLOCAL = @ACLOCAL@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ @@ -92,6 +138,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -215,6 +262,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -242,6 +291,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -261,7 +311,6 @@ target_vendor = @target_vendor@ tcltk_dep = @tcltk_dep@ timidity_LDFLAGS = @timidity_LDFLAGS@ w_so_libs = @w_so_libs@ - ACLOCAL_AMFLAGS = -I autoconf M4DIR = autoconf SUBDIRS = \ @@ -275,7 +324,6 @@ SUBDIRS = \ script \ configs - EXTRA_DIST = \ ChangeLog.1 \ ChangeLog.2 \ @@ -284,45 +332,44 @@ EXTRA_DIST = \ TiMidity-uj.ad.in \ TiMidity.ad.in - TOOLSDIR = timidity-tools UMPDIR = ump -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = config.h interface.h -CONFIG_CLEAN_FILES = common.makefile TiMidity.ad TiMidity-uj.ad -DIST_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 = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ - Makefile.in NEWS TODO TiMidity-uj.ad.in TiMidity.ad.in \ - aclocal.m4 common.makefile.in config.h.in configure \ - configure.in interface.h.in -DIST_SUBDIRS = $(SUBDIRS) all: config.h interface.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: - -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +am--refresh: + @: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ + cd $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; -$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in autoconf/alsa.m4 autoconf/ao.m4 autoconf/arts.m4 autoconf/esd.m4 autoconf/gtk-2.0.m4 autoconf/gtk.m4 autoconf/libFLAC.m4 autoconf/libOggFLAC.m4 autoconf/ogg.m4 autoconf/utils.m4 autoconf/vorbis.m4 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 @@ -334,10 +381,10 @@ config.h: stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h - -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) - touch $(srcdir)/config.h.in + rm -f stamp-h1 + touch $@ interface.h: stamp-h2 @if test ! -f $@; then \ @@ -349,17 +396,13 @@ stamp-h2: $(srcdir)/interface.h.in $(top @rm -f stamp-h2 cd $(top_builddir) && $(SHELL) ./config.status interface.h -$(srcdir)/interface.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - touch $(srcdir)/interface.h.in - distclean-hdr: -rm -f config.h stamp-h1 interface.h stamp-h2 -common.makefile: $(top_builddir)/config.status common.makefile.in +common.makefile: $(top_builddir)/config.status $(srcdir)/common.makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ -TiMidity.ad: $(top_builddir)/config.status TiMidity.ad.in +TiMidity.ad: $(top_builddir)/config.status $(srcdir)/TiMidity.ad.in cd $(top_builddir) && $(SHELL) ./config.status $@ -TiMidity-uj.ad: $(top_builddir)/config.status TiMidity-uj.ad.in +TiMidity-uj.ad: $(top_builddir)/config.status $(srcdir)/TiMidity-uj.ad.in cd $(top_builddir) && $(SHELL) ./config.status $@ uninstall-info-am: @@ -370,7 +413,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -382,7 +431,7 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ @@ -390,7 +439,13 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -411,7 +466,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -422,14 +477,6 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -438,19 +485,22 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in interface.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -460,10 +510,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in interface.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -486,24 +537,11 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = . -distdir = $(PACKAGE)-$(VERSION) - -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/. + $(mkdir_p) $(distdir)/. $(distdir)/autoconf @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -515,7 +553,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -530,15 +568,17 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - list='$(SUBDIRS)'; for subdir in $$list; do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -549,24 +589,46 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) - dist-bzip2: distdir - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) $(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - $(am__remove_distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst @@ -586,19 +648,20 @@ distcheck: dist distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ - (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ + (cd ../.. && umask 077 && mkdir "$$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 \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) - @echo "$(distdir).tar.gz is ready for distribution" | \ - sed 'h;s/./=/g;p;x;p;x' + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -622,7 +685,6 @@ check: check-recursive all-am: Makefile config.h interface.h installdirs: installdirs-recursive installdirs-am: - install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -634,7 +696,7 @@ install-am: all-am installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -642,7 +704,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -653,12 +715,15 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-hdr distclean-tags dvi: dvi-recursive dvi-am: +html: html-recursive + info: info-recursive info-am: @@ -676,6 +741,7 @@ installcheck-am: 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 mostlyclean: mostlyclean-recursive @@ -694,22 +760,20 @@ uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-recursive ctags ctags-recursive dist \ - dist-all dist-bzip2 dist-gzip distcheck distclean \ - distclean-generic distclean-hdr 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 install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - 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-recursive +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ + check-am clean clean-generic clean-recursive ctags \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ + dist-tarZ dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-recursive distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-info-am dynamics: --- timidity-2.13.2.orig/configure.in +++ timidity-2.13.2/configure.in @@ -388,7 +388,7 @@ dnl End of X configure # Checks for header files. AC_HEADER_STDC -AC_HEADER_STDBOOL +#AC_HEADER_STDBOOL AC_HEADER_SYS_WAIT if test "x$WATCOM_C" != xyes ; then AC_HEADER_TIME --- timidity-2.13.2.orig/aclocal.m4 +++ timidity-2.13.2/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.7.6 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,332 +11,32 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Do all the work for Automake. -*- Autoconf -*- - -# This macro actually does too much some checks are only needed if -# 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. - -# 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 10 - -AC_PREREQ([2.54]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -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. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - 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],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -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. - -# 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 +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # 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"]) +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.7.6])]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright 2001, 2002 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 2 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + [AM_AUTOMAKE_VERSION([1.9.6])]) -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# AM_AUX_DIR_EXPAND -*- Autoconf -*- +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # -# Check to make sure that the build environment is sane. -# - -# Copyright 1996, 1997, 2000, 2001 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 3 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# -*- Autoconf -*- - - -# Copyright 1997, 1999, 2000, 2001 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 3 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# AM_AUX_DIR_EXPAND - -# Copyright 2001 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. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to @@ -376,131 +76,55 @@ fi # absolute PATH. The drawback is that using absolute paths prevent a # configured tree to be moved without reconfiguration. -# Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50]) - -AC_DEFUN([AM_AUX_DIR_EXPAND], [ +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. +# AM_CONDITIONAL -*- Autoconf -*- -# Copyright 2001 Free Software Foundation, Inc. +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# 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. +# serial 7 -# 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. +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +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])]) -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# AM_PROG_INSTALL_STRIP - -# Copyright 2001 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. - -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -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 -# 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. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# 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, @@ -509,7 +133,6 @@ AC_SUBST([am__leading_dot])]) # CC etc. in the Makefile, will ask for an AC_PROG_CC use... - # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. @@ -568,7 +191,9 @@ AC_CACHE_CHECK([dependency style of $dep : > 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 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf @@ -596,9 +221,14 @@ AC_CACHE_CHECK([dependency style of $dep 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 + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_$1_dependencies_compiler_type=$depmode break fi @@ -632,8 +262,8 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}d # ------------ AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors]) +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -642,26 +272,16 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_ AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright 1999, 2000, 2001, 2002 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. +# Generate code to set up dependency tracking. -*- Autoconf -*- -# 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. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -#serial 2 +#serial 3 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -680,27 +300,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS else continue fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue @@ -726,1946 +340,601 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS] [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Check to see how 'make' treats includes. -*- Autoconf -*- +# Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 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. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# 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 12 -# serial 2 +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[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. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# 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= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.58])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. +# 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]) -# 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. +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -# 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. +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -# serial 5 +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_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 +]) +]) -AC_PREREQ(2.52) -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -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])]) +# 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. -# Add --enable-maintainer-mode option to configure. -# From Jim Meyering +# 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 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# 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. +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"$am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) -# 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. +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # serial 2 -AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) +# 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])]) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - -dnl TiMidity++ -- MIDI to WAVE converter and player -dnl Copyright (C) 1999-2002 Masanao Izumo -dnl Copyright (C) 1995 Tuukka Toivonen -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -dnl MY_DEFINE(VARIABLE) -AC_DEFUN(MY_DEFINE, -[cat >> confdefs.h < dyna.c < fred.c < -#$i_dlfcn I_DLFCN -#ifdef I_DLFCN -#include /* the dynamic linker include file for Sunos/Solaris */ -#else -#include -#include -#include -#endif - -extern int fred() ; - -main() -{ - void * handle ; - void * symbol ; -#ifndef RTLD_LAZY - int mode = 1 ; -#else - int mode = RTLD_LAZY ; -#endif - handle = dlopen("./dyna.$so", mode) ; - if (handle == NULL) { - printf ("1\n") ; - fflush (stdout) ; - exit(0); - } - symbol = dlsym(handle, "fred") ; - if (symbol == NULL) { - /* try putting a leading underscore */ - symbol = dlsym(handle, "_fred") ; - if (symbol == NULL) { - printf ("2\n") ; - fflush (stdout) ; - exit(0); - } - printf ("3\n") ; - } - else - printf ("4\n") ; - fflush (stdout) ; - exit(0); -} -EOM -: Call the object file tmp-dyna.o in case dlext=o. -if ${CC-cc} $CFLAGS $SHCFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 && - mv dyna.o tmp-dyna.o > /dev/null 2>&1 && - $SHLD $SHLDFLAGS -o dyna.$so tmp-dyna.o > /dev/null 2>&1 && - ${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.c $LIBS $lib_dl_opt > /dev/null 2>&1; then - xxx=`./fred` - case $xxx in - 1) AC_MSG_WARN(Test program failed using dlopen. Perhaps you should not use dynamic loading.) - ;; - 2) AC_MSG_WARN(Test program failed using dlsym. Perhaps you should not use dynamic loading.) - ;; - 3) timidity_cv_func_dlsym_underscore=yes - ;; - 4) timidity_cv_func_dlsym_underscore=no - ;; - esac -else - AC_MSG_WARN(I can't compile and run the test program.) -fi -rm -f dyna.c dyna.o dyna.$so tmp-dyna.o fred.c fred.o fred -]) -case "x$timidity_cv_func_dlsym_underscore" in -xyes) [$1] - AC_MSG_RESULT(yes) - ;; -xno) [$2] - AC_MSG_RESULT(no) - ;; -esac -]) - - -dnl contains program from perl5 -dnl CONTAINS_INIT() -AC_DEFUN(CONTAINS_INIT, -[dnl Some greps do not return status, grrr. -AC_MSG_CHECKING(whether grep returns status) -echo "grimblepritz" >grimble -if grep blurfldyick grimble >/dev/null 2>&1 ; then - contains="./contains" -elif grep grimblepritz grimble >/dev/null 2>&1 ; then - contains=grep -else - contains="./contains" -fi -rm -f grimble -dnl the following should work in any shell -case "$contains" in -grep) AC_MSG_RESULT(yes) - ;; -./contains) - AC_MSG_RESULT(AGH! Grep doesn't return a status. Attempting remedial action.) - cat >./contains <<'EOSS' -grep "[$]1" "[$]2" >.greptmp && cat .greptmp && test -s .greptmp -EOSS - chmod +x "./contains" - ;; -esac -]) - -dnl CONTAINS(word,filename,action-if-found,action-if-not-found) -AC_DEFUN(CONTAINS, -[if $contains "^[$1]"'[$]' $2 >/dev/null 2>&1; then - [$3] -else - [$4] -fi -]) - -dnl SET_UNIQ_WORDS(shell-variable,words...) -AC_DEFUN(SET_UNIQ_WORDS, -[rm -f wordtmp >/dev/null 2>&1 -val='' -for f in $2; do - CONTAINS([$f],wordtmp,:,[echo $f >>wordtmp; val="$val $f"]) -done -$1="$val" -rm -f wordtmp >/dev/null 2>&1 -]) - - -dnl WAPI_CHECK_FUNC(FUNCTION, INCLUDES, TEST-BODY, - [ACTION-FI-FOUND [, ACTION-IF-NOT-FOUND]]) -AC_DEFUN(WAPI_CHECK_FUNC, -[AC_MSG_CHECKING(for $1) -AC_CACHE_VAL(wapi_cv_func_$1, -[AC_TRY_LINK([#include -$2 -], [$3], -wapi_cv_func_$1=yes, wapi_cv_func_$1=no)]) -if eval "test \"`echo '$wapi_cv_func_'$1`\" = yes"; then - AC_MSG_RESULT(yes) - ifelse([$4], , :, [$4]) -else - AC_MSG_RESULT(no) -ifelse([$5], , , [$5 -])dnl -fi -]) - -dnl WAPI_CHECK_LIB(LIBRARY, FUNCTION, -dnl INCLUDES, TEST-BODY -dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND -dnl [, OTHER-LIBRARIES]]]) -AC_DEFUN(WAPI_CHECK_LIB, -[AC_MSG_CHECKING([for $2 in -l$1]) -ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` -AC_CACHE_VAL(wapi_cv_lib_$ac_lib_var, -[ac_save_LIBS="$LIBS" -LIBS="-l$1 $7 $LIBS" -AC_TRY_LINK([#include -$3 -], [$4], -eval "wapi_cv_lib_$ac_lib_var=yes", -eval "wapi_cv_lib_$ac_lib_var=no") -LIBS="$ac_save_LIBS" -])dnl -if eval "test \"`echo '$wapi_cv_lib_'$ac_lib_var`\" = yes"; then - AC_MSG_RESULT(yes) - ifelse([$5], ,LIBS="-l$1 $LIBS", [$5]) -else - AC_MSG_RESULT(no) -ifelse([$6], , , [$6 -])dnl -fi -]) - -dnl EXTRACT_CPPFLAGS(CPPFLAGS-to-append,others-to-append,FLAGS) -AC_DEFUN(EXTRACT_CPPFLAGS, -[for f in $3; do - case ".$f" in - .-I?*|.-D?*) $1="[$]$1 $f" ;; - *) $2="[$]$1 $f" ;; - esac -done -]) - - -dnl CHECK_COMPILER_OPTION(OPTIONS [, ACTION-IF-SUCCEED [, ACTION-IF-FAILED]]) -AC_DEFUN(CHECK_COMPILER_OPTION, -[AC_MSG_CHECKING([whether -$1 option is recognized]) -ac_ccoption=`echo $1 | sed 'y%./+-%__p_%'` -AC_CACHE_VAL(timidity_cv_ccoption_$ac_ccoption, -[cat > conftest.$ac_ext < conftest.out 2>&1; then - if test -s conftest.out; then - eval "timidity_cv_ccoption_$ac_ccoption=no" - else - eval "timidity_cv_ccoption_$ac_ccoption=yes" - fi -else - eval "timidity_cv_ccoption_$ac_ccoption=no" -fi -]) -if eval "test \"`echo '$timidity_cv_ccoption_'$ac_ccoption`\" = yes"; then - AC_MSG_RESULT(yes) - ifelse([$2], , , [$2 -]) -else - AC_MSG_RESULT(no) -ifelse([$3], , , [$3 -]) -fi -]) - - -dnl MY_SEARCH_LIBS(FUNCTION, LIBRARIES [, ACTION-IF-FOUND -dnl [, ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]]) -dnl Search for a library defining FUNC, if it's not already available. - -AC_DEFUN(MY_SEARCH_LIBS, -[AC_CACHE_CHECK([for library containing $1], [timidity_cv_search_$1], -[ac_func_search_save_LIBS="$LIBS" -timidity_cv_search_$1="no" -for i in $2; do - LIBS="$i $5 $ac_func_search_save_LIBS" - AC_TRY_LINK_FUNC([$1], [timidity_cv_search_$1="$i"; break]) -done -LIBS="$ac_func_search_save_LIBS"]) -if test "$timidity_cv_search_$1" != "no"; then - $3 -else : - $4 -fi]) - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 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. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 9 # AM_PATH_LISPDIR # --------------- AC_DEFUN([AM_PATH_LISPDIR], -[AC_ARG_WITH(lispdir, - [ --with-lispdir Override the default lisp directory ], +[ # If set to t, that means we are running in a shell under Emacs. + # If you have an Emacs named "t", then use the full path. + test x"$EMACS" = xt && EMACS= + AC_CHECK_PROGS([EMACS], [emacs xemacs], [no]) + AC_ARG_VAR([EMACS], [the Emacs editor command]) + AC_ARG_VAR([EMACSLOADPATH], [the Emacs library search path]) + AC_ARG_WITH([lispdir], + [ --with-lispdir override the default lisp directory], [ lispdir="$withval" AC_MSG_CHECKING([where .elc files should go]) AC_MSG_RESULT([$lispdir])], [ - # If set to t, that means we are running in a shell under Emacs. - # If you have an Emacs named "t", then use the full path. - test x"$EMACS" = xt && EMACS= - AC_CHECK_PROGS(EMACS, emacs xemacs, no) - if test $EMACS != "no"; then - if test x${lispdir+set} != xset; then - AC_CACHE_CHECK([where .elc files should go], [am_cv_lispdir], - [# If $EMACS isn't GNU Emacs or XEmacs, this can blow up pretty badly + AC_CACHE_CHECK([where .elc files should go], [am_cv_lispdir], [ + if test $EMACS != "no"; then + if test x${lispdir+set} != xset; then + # If $EMACS isn't GNU Emacs or XEmacs, this can blow up pretty badly # Some emacsen will start up in interactive mode, requiring C-x C-c to exit, # which is non-obvious for non-emacs users. # Redirecting /dev/null should help a bit; pity we can't detect "broken" # emacsen earlier and avoid running this altogether. AC_RUN_LOG([$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' conftest.out]) - am_cv_lispdir=`sed -n \ + am_cv_lispdir=`sed -n \ -e 's,/$,,' \ - -e '/.*\/lib\/x\?emacs\/site-lisp$/{s,.*/lib/\(x\?emacs/site-lisp\)$,${libdir}/\1,;p;q;}' \ - -e '/.*\/share\/x\?emacs\/site-lisp$/{s,.*/share/\(x\?emacs/site-lisp\),${datadir}/\1,;p;q;}' \ + -e '/.*\/lib\/x*emacs\/site-lisp$/{s,.*/lib/\(x*emacs/site-lisp\)$,${libdir}/\1,;p;q;}' \ + -e '/.*\/share\/x*emacs\/site-lisp$/{s,.*/share/\(x*emacs/site-lisp\),${datadir}/\1,;p;q;}' \ conftest.out` rm conftest.out - if test -z "$am_cv_lispdir"; then - am_cv_lispdir='${datadir}/emacs/site-lisp' - fi - ]) - lispdir="$am_cv_lispdir" + fi fi - fi + test -z "$am_cv_lispdir" && am_cv_lispdir='${datadir}/emacs/site-lisp' + ]) + lispdir="$am_cv_lispdir" ]) -AC_SUBST(lispdir) +AC_SUBST([lispdir]) ])# AM_PATH_LISPDIR AU_DEFUN([ud_PATH_LISPDIR], [AM_PATH_LISPDIR]) -dnl Configure Paths for Alsa -dnl Some modifications by Richard Boulton -dnl Christopher Lansdown -dnl Jaroslav Kysela -dnl Modified for TiMidity++ by URABE, Shyouhei -dnl Original : alsa.m4,v 1.22 2002/05/27 11:14:20 tiwai Exp -dnl This version: alsa.m4, 2002/10/08 22:30:18 JST -dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate. -dnl enables arguments --with-alsa-prefix= -dnl --with-alsa-enc-prefix= -dnl --disable-alsatest (this has no effect, as yet) -dnl -dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified, -dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result. -dnl -AC_DEFUN(AM_PATH_ALSA, -[dnl Save the original CFLAGS, LDFLAGS, and LIBS -alsa_save_CFLAGS="$CFLAGS" -alsa_save_LDFLAGS="$LDFLAGS" -alsa_save_LIBS="$LIBS" -alsa_found=yes - -dnl -dnl Get the cflags and libraries for alsa -dnl -AC_ARG_WITH(alsa-prefix, -[ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)], -[alsa_prefix="$withval"], [alsa_prefix=""]) - -AC_ARG_WITH(alsa-inc-prefix, -[ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)], -[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""]) - -dnl FIXME: this is not yet implemented -AC_ARG_ENABLE(alsatest, -[ --disable-alsatest Do not try to compile and run a test Alsa program], -[enable_alsatest=no], -[enable_alsatest=yes]) - -dnl Add any special include directories -AC_MSG_CHECKING(for ALSA CFLAGS) -if test "$alsa_inc_prefix" != "" ; then - ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" - CFLAGS="$CFLAGS -I$alsa_inc_prefix" -fi -AC_MSG_RESULT($ALSA_CFLAGS) - -dnl add any special lib dirs -AC_MSG_CHECKING(for ALSA LDFLAGS) -if test "$alsa_prefix" != "" ; then - ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" - LDFLAGS="$LDFLAGS $ALSA_LIBS" -fi - -dnl add the alsa library -ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" -LIBS=`echo $LIBS | sed 's/-lm//'` -LIBS=`echo $LIBS | sed 's/-ldl//'` -LIBS=`echo $LIBS | sed 's/-lpthread//'` -LIBS=`echo $LIBS | sed 's/ //'` -LIBS="$ALSA_LIBS $LIBS" -AC_MSG_RESULT($ALSA_LIBS) - -dnl Check for a working version of libasound that is of the right version. -min_alsa_version=ifelse([$1], ,0.1.1,$1) -AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version) -no_alsa="" - alsa_min_major_version=`echo $min_alsa_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - alsa_min_minor_version=`echo $min_alsa_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - alsa_min_micro_version=`echo $min_alsa_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - -dnl This is the test program. -AC_DEFUN([MPUT_ALSA_TRY],[ -/* ensure backward compatibility */ -#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR) -#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR -#endif -#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR) -#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR -#endif -#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR) -#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR -#endif - -# if(SND_LIB_MAJOR > $alsa_min_major_version) - exit(0); -# else -# if(SND_LIB_MAJOR < $alsa_min_major_version) -# error not present -# endif - -# if(SND_LIB_MINOR > $alsa_min_minor_version) - exit(0); -# else -# if(SND_LIB_MINOR < $alsa_min_minor_version) -# error not present -# endif - -# if(SND_LIB_SUBMINOR < $alsa_min_micro_version) -# error not present -# endif -# endif -# endif -exit(0); -])dnl macro MPUT_ALSA_TRY - -AC_LANG_SAVE -AC_LANG_C -AC_TRY_COMPILE([ -#include -], - MPUT_ALSA_TRY(), - [AC_MSG_RESULT(found.)], - [AC_TRY_COMPILE([ -#include -], - MPUT_ALSA_TRY(), - [AC_MSG_RESULT(found.)], - [AC_MSG_RESULT(not present.) - ifelse([$3], ,[AC_MSG_RESULT(libasound was not found anywhere.)]) - alsa_found=no]) - ifelse([$3], ,[AC_MSG_RESULT(Sufficiently new version of libasound not found.)]) -]) -AC_LANG_RESTORE - -dnl Now that we know we have the right version, why not see if we -dnl have the library and not just the headers. -AC_CHECK_LIB([asound],[snd_ctl_open], , - [ifelse([$3], ,[AC_MSG_RESULT(No linkable libasound was found.)]) - alsa_found=no -]) - -if test "x$alsa_found" = "xyes" ; then - ifelse([$2], , :, [$2]) - LIBS=`echo $LIBS | sed 's/-lasound//g'` - LIBS=`echo $LIBS | sed 's/ //'` - LIBS="-lasound $LIBS" -else - ifelse([$3], , :, [$3]) - CFLAGS="$alsa_save_CFLAGS" - LDFLAGS="$alsa_save_LDFLAGS" - LIBS="$alsa_save_LIBS" - ALSA_CFLAGS="" - ALSA_LIBS="" -fi - -dnl That should be it. Now just export out symbols: -AC_SUBST(ALSA_CFLAGS) -AC_SUBST(ALSA_LIBS) -]) -dnl This should be pulled in from arts.m4 -dnl -dnl Oh my word, I've never hacked automake before - let me know if this is a -dnl complete rubbish! -dnl Peter L Jones 2002-05-12 -dnl Snarfed from the ESD code below - but the faults are all mine! - - -dnl AM_PATH_ARTS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for aRts, and define ARTS_CFLAGS and ARTS_LIBS -dnl -AC_DEFUN(AM_PATH_ARTS, - [dnl -dnl Get the cflags and libraries from the arts-config script -dnl -AC_ARG_WITH(arts-prefix,[ --with-arts-prefix=PFX Prefix where ARTS is installed (optional)], - arts_prefix="$withval", arts_prefix="") -AC_ARG_ENABLE(artstest, [ --disable-artstest Do not try to compile and run a test ARTS program], - , enable_artstest=yes) - - if test x$arts_prefix != x ; then - arts_args="$arts_args --prefix=$arts_prefix" - if test x${ARTS_CONFIG+set} != xset ; then - ARTS_CONFIG=$arts_prefix/bin/artsc-config - fi - fi - - AC_PATH_PROG(ARTS_CONFIG, artsc-config, no) - min_arts_version=ifelse([$1], ,0.9.5,$1) - AC_MSG_CHECKING(for ARTS - version >= $min_arts_version) - no_arts="" - if test "$ARTS_CONFIG" = "no" ; then - no_arts=yes - else - ARTS_CFLAGS=`$ARTS_CONFIG $artsconf_args --cflags` - ARTS_LIBS=`$ARTS_CONFIG $artsconf_args --libs` - - arts_major_version=`$ARTS_CONFIG $arts_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - arts_minor_version=`$ARTS_CONFIG $arts_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - arts_micro_version=`$ARTS_CONFIG $arts_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_artstest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $ARTS_CFLAGS" - LIBS="$LIBS $ARTS_LIBS" -dnl -dnl Now check if the installed ARTS is sufficiently new. (Also sanity -dnl checks the results of arts-config to some extent -dnl - rm -f conf.artstest - AC_TRY_RUN([ -#include -#include -#include -#include - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.artstest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_arts_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_arts_version"); - exit(1); - } - - if (($arts_major_version > major) || - (($arts_major_version == major) && ($arts_minor_version > minor)) || - (($arts_major_version == major) && ($arts_minor_version == minor) && ($arts_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'artsc-config --version' returned %d.%d.%d, but the minimum version\n", $arts_major_version, $arts_minor_version, $arts_micro_version); - printf("*** of ARTS required is %d.%d.%d. If artsc-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If artsc-config was wrong, set the environment variable ARTS_CONFIG\n"); - printf("*** to point to the correct copy of artsc-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_arts=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_arts" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$ARTS_CONFIG" = "no" ; then - echo "*** The artsc-config script installed by ARTS could not be found" - echo "*** If ARTS was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the ARTS_CONFIG environment variable to the" - echo "*** full path to artsc-config." - else - if test -f conf.artstest ; then - : - else - echo "*** Could not run ARTS test program, checking why..." - CFLAGS="$CFLAGS $ARTS_CFLAGS" - LIBS="$LIBS $ARTS_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding ARTS or finding the wrong" - echo "*** version of ARTS. If it is not finding ARTS, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means ARTS was incorrectly installed" - echo "*** or that you have moved ARTS since it was installed. In the latter case, you" - echo "*** may want to edit the arts-config script: $ARTS_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - ARTS_CFLAGS="" - ARTS_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(ARTS_CFLAGS) - AC_SUBST(ARTS_LIBS) - rm -f conf.artstest -]) -dnl End of aRts -# Configure paths for ESD -# Manish Singh 98-9-30 -# stolen back from Frank Belew -# stolen from Manish Singh -# Shamelessly stolen from Owen Taylor - -dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS -dnl -AC_DEFUN(AM_PATH_ESD, -[dnl -dnl Get the cflags and libraries from the esd-config script -dnl -AC_ARG_WITH(esd-prefix,[ --with-esd-prefix=PFX Prefix where ESD is installed (optional)], - esd_prefix="$withval", esd_prefix="") -AC_ARG_WITH(esd-exec-prefix,[ --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)], - esd_exec_prefix="$withval", esd_exec_prefix="") -AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run a test ESD program], - , enable_esdtest=yes) - - if test x$esd_exec_prefix != x ; then - esd_args="$esd_args --exec-prefix=$esd_exec_prefix" - if test x${ESD_CONFIG+set} != xset ; then - ESD_CONFIG=$esd_exec_prefix/bin/esd-config - fi - fi - if test x$esd_prefix != x ; then - esd_args="$esd_args --prefix=$esd_prefix" - if test x${ESD_CONFIG+set} != xset ; then - ESD_CONFIG=$esd_prefix/bin/esd-config - fi - fi - - AC_PATH_PROG(ESD_CONFIG, esd-config, no) - min_esd_version=ifelse([$1], ,0.2.7,$1) - AC_MSG_CHECKING(for ESD - version >= $min_esd_version) - no_esd="" - if test "$ESD_CONFIG" = "no" ; then - no_esd=yes - else - AC_LANG_SAVE - AC_LANG_C - ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags` - ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs` - - esd_major_version=`$ESD_CONFIG $esd_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - esd_minor_version=`$ESD_CONFIG $esd_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_esdtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $ESD_CFLAGS" - LIBS="$LIBS $ESD_LIBS" -dnl -dnl Now check if the installed ESD is sufficiently new. (Also sanity -dnl checks the results of esd-config to some extent -dnl - rm -f conf.esdtest - AC_TRY_RUN([ -#include -#include -#include -#include - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.esdtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_esd_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_esd_version"); - exit(1); - } - - if (($esd_major_version > major) || - (($esd_major_version == major) && ($esd_minor_version > minor)) || - (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version); - printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n"); - printf("*** to point to the correct copy of esd-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - AC_LANG_RESTORE - fi - fi - if test "x$no_esd" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$ESD_CONFIG" = "no" ; then - echo "*** The esd-config script installed by ESD could not be found" - echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the ESD_CONFIG environment variable to the" - echo "*** full path to esd-config." - else - if test -f conf.esdtest ; then - : - else - echo "*** Could not run ESD test program, checking why..." - CFLAGS="$CFLAGS $ESD_CFLAGS" - LIBS="$LIBS $ESD_LIBS" - AC_LANG_SAVE - AC_LANG_C - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding ESD or finding the wrong" - echo "*** version of ESD. If it is not finding ESD, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means ESD was incorrectly installed" - echo "*** or that you have moved ESD since it was installed. In the latter case, you" - echo "*** may want to edit the esd-config script: $ESD_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - AC_LANG_RESTORE - fi - fi - ESD_CFLAGS="" - ESD_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(ESD_CFLAGS) - AC_SUBST(ESD_LIBS) - rm -f conf.esdtest -]) - -dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]]) -dnl Test, whether esd supports multiple recording clients (version >=0.2.21) -dnl -AC_DEFUN(AM_ESD_SUPPORTS_MULTIPLE_RECORD, -[dnl - AC_MSG_NOTICE([whether installed esd version supports multiple recording clients]) - ac_save_ESD_CFLAGS="$ESD_CFLAGS" - ac_save_ESD_LIBS="$ESD_LIBS" - AM_PATH_ESD(0.2.21, - ifelse([$1], , [ - AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, true) - AC_DEFINE(ESD_SUPPORTS_MULTIPLE_RECORD, 1, - [Define if you have esound with support of multiple recording clients.])], - [$1]), - ifelse([$2], , [AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, false)], [$2]) - if test "x$ac_save_ESD_CFLAGS" != x ; then - ESD_CFLAGS="$ac_save_ESD_CFLAGS" - fi - if test "x$ac_save_ESD_LIBS" != x ; then - ESD_LIBS="$ac_save_ESD_LIBS" - fi - ) -]) - -# ao.m4 -# Configure paths for libao -# Jack Moffitt 10-21-2000 -# Shamelessly stolen from Owen Taylor and Manish Singh - -dnl XIPH_PATH_AO([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libao, and define AO_CFLAGS and AO_LIBS -dnl -AC_DEFUN(XIPH_PATH_AO, -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(ao,[ --with-ao=PFX Prefix where libao is installed (optional)], ao_prefix="$withval", ao_prefix="") -AC_ARG_WITH(ao-libraries,[ --with-ao-libraries=DIR Directory where libao library is installed (optional)], ao_libraries="$withval", ao_libraries="") -AC_ARG_WITH(ao-includes,[ --with-ao-includes=DIR Directory where libao header files are installed (optional)], ao_includes="$withval", ao_includes="") -AC_ARG_ENABLE(aotest, [ --disable-aotest Do not try to compile and run a test ao program],, enable_aotest=yes) - - - if test "x$ao_libraries" != "x" ; then - AO_LIBS="-L$ao_libraries" - elif test "x$ao_prefix" != "x"; then - AO_LIBS="-L$ao_prefix/lib" - elif test "x$prefix" != "xNONE"; then - AO_LIBS="-L$prefix/lib" - fi - - if test "x$ao_includes" != "x" ; then - AO_CFLAGS="-I$ao_includes" - elif test "x$ao_prefix" != "x"; then - AO_CFLAGS="-I$ao_prefix/include" - elif test "x$prefix" != "xNONE"; then - AO_CFLAGS="-I$prefix/include" - fi - - # see where dl* and friends live - AC_CHECK_FUNCS(dlopen, [AO_DL_LIBS=""], [ - AC_CHECK_LIB(dl, dlopen, [AO_DL_LIBS="-ldl"], [ - AC_MSG_WARN([could not find dlopen() needed by libao sound drivers - your system may not be supported.]) - ]) - ]) - - AO_LIBS="$AO_LIBS -lao $AO_DL_LIBS" - - AC_MSG_CHECKING(for ao) - no_ao="" - - - if test "x$enable_aotest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $AO_CFLAGS" - LIBS="$LIBS $AO_LIBS" -dnl -dnl Now check if the installed ao is sufficiently new. -dnl - rm -f conf.aotest - AC_TRY_RUN([ -#include -#include -#include -#include - -int main () -{ - system("touch conf.aotest"); - return 0; -} - -],, no_ao=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering - if test "x$no_ao" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT(no) - if test -f conf.aotest ; then - : - else - echo "*** Could not run ao test program, checking why..." - CFLAGS="$CFLAGS $AO_CFLAGS" - LIBS="$LIBS $AO_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding ao or finding the wrong" - echo "*** version of ao. If it is not finding ao, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means ao was incorrectly installed" - echo "*** or that you have moved ao since it was installed." ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - AO_CFLAGS="" - AO_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(AO_CFLAGS) - AC_SUBST(AO_LIBS) - rm -f conf.aotest -]) +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Configure paths for libogg -# Jack Moffitt 10-21-2000 -# Shamelessly stolen from Owen Taylor and Manish Singh - -dnl AM_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS -dnl -AC_DEFUN(AM_PATH_OGG, -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(ogg,[ --with-ogg=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="") -AC_ARG_WITH(ogg-libraries,[ --with-ogg-libraries=DIR Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="") -AC_ARG_WITH(ogg-includes,[ --with-ogg-includes=DIR Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="") -AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes) - - if test "x$ogg_libraries" != "x" ; then - OGG_LIBS="-L$ogg_libraries" - elif test "x$ogg_prefix" != "x" ; then - OGG_LIBS="-L$ogg_prefix/lib" - elif test "x$prefix" != "xNONE" ; then - OGG_LIBS="-L$prefix/lib" - fi +# serial 4 - OGG_LIBS="$OGG_LIBS -logg" +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) - if test "x$ogg_includes" != "x" ; then - OGG_CFLAGS="-I$ogg_includes" - elif test "x$ogg_prefix" != "x" ; then - OGG_CFLAGS="-I$ogg_prefix/include" - elif test "x$prefix" != "xNONE"; then - OGG_CFLAGS="-I$prefix/include" - fi +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - AC_MSG_CHECKING(for Ogg) - no_ogg="" +# Check to see how 'make' treats includes. -*- Autoconf -*- +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - if test "x$enable_oggtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" -dnl -dnl Now check if the installed Ogg is sufficiently new. -dnl - rm -f conf.oggtest - AC_TRY_RUN([ -#include -#include -#include -#include - -int main () -{ - system("touch conf.oggtest"); - return 0; -} - -],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi +# serial 3 - if test "x$no_ogg" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT(no) - if test -f conf.oggtest ; then - : - else - echo "*** Could not run Ogg test program, checking why..." - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding Ogg or finding the wrong" - echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means Ogg was incorrectly installed" - echo "*** or that you have moved Ogg since it was installed. In the latter case, you" - echo "*** may want to edit the ogg-config script: $OGG_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - OGG_CFLAGS="" - OGG_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(OGG_CFLAGS) - AC_SUBST(OGG_LIBS) - rm -f conf.oggtest +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[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. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# 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= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf ]) -# Configure paths for libvorbis -# Jack Moffitt 10-21-2000 -# Shamelessly stolen from Owen Taylor and Manish Singh - -dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS -dnl -AC_DEFUN(AM_PATH_VORBIS, -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(vorbis,[ --with-vorbis=PFX Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="") -AC_ARG_WITH(vorbis-libraries,[ --with-vorbis-libraries=DIR Directory where libvorbis library is installed (optional)], vorbis_libraries="$withval", vorbis_libraries="") -AC_ARG_WITH(vorbis-includes,[ --with-vorbis-includes=DIR Directory where libvorbis header files are installed (optional)], vorbis_includes="$withval", vorbis_includes="") -AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes) - - if test "x$vorbis_libraries" != "x" ; then - VORBIS_LIBS="-L$vorbis_libraries" - elif test "x$vorbis_prefix" != "x" ; then - VORBIS_LIBS="-L$vorbis_prefix/lib" - elif test "x$prefix" != "xNONE"; then - VORBIS_LIBS="-L$prefix/lib" - fi - - VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm" - VORBISFILE_LIBS="-lvorbisfile" - VORBISENC_LIBS="-lvorbisenc" - - if test "x$vorbis_includes" != "x" ; then - VORBIS_CFLAGS="-I$vorbis_includes" - elif test "x$vorbis_prefix" != "x" ; then - VORBIS_CFLAGS="-I$vorbis_prefix/include" - elif test "x$prefix" != "xNONE"; then - VORBIS_CFLAGS="-I$prefix/include" - fi +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - AC_MSG_CHECKING(for Vorbis) - no_vorbis="" +# serial 4 +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) - if test "x$enable_vorbistest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" -dnl -dnl Now check if the installed Vorbis is sufficiently new. -dnl - rm -f conf.vorbistest - AC_TRY_RUN([ -#include -#include -#include -#include - -int main () -{ - system("touch conf.vorbistest"); - return 0; -} - -],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - if test "x$no_vorbis" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT(no) - if test -f conf.vorbistest ; then - : - else - echo "*** Could not run Vorbis test program, checking why..." - CFLAGS="$CFLAGS $VORBIS_CFLAGS" - LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding Vorbis or finding the wrong" - echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means Vorbis was incorrectly installed" - echo "*** or that you have moved Vorbis since it was installed." ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - VORBIS_CFLAGS="" - VORBIS_LIBS="" - VORBISFILE_LIBS="" - VORBISENC_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(VORBIS_CFLAGS) - AC_SUBST(VORBIS_LIBS) - AC_SUBST(VORBISFILE_LIBS) - AC_SUBST(VORBISENC_LIBS) - rm -f conf.vorbistest +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi ]) -# Configure paths for libFLAC -# "Inspired" by ogg.m4 - -dnl AM_PATH_LIBFLAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libFLAC, and define LIBFLAC_CFLAGS and LIBFLAC_LIBS -dnl -AC_DEFUN(AM_PATH_LIBFLAC, -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(libFLAC,[ --with-libFLAC=PFX Prefix where libFLAC is installed (optional)], libFLAC_prefix="$withval", libFLAC_prefix="") -AC_ARG_WITH(libFLAC-libraries,[ --with-libFLAC-libraries=DIR Directory where libFLAC library is installed (optional)], libFLAC_libraries="$withval", libFLAC_libraries="") -AC_ARG_WITH(libFLAC-includes,[ --with-libFLAC-includes=DIR Directory where libFLAC header files are installed (optional)], libFLAC_includes="$withval", libFLAC_includes="") -AC_ARG_ENABLE(libFLACtest, [ --disable-libFLACtest Do not try to compile and run a test libFLAC program],, enable_libFLACtest=yes) - - if test "x$libFLAC_libraries" != "x" ; then - LIBFLAC_LIBS="-L$libFLAC_libraries" - elif test "x$libFLAC_prefix" != "x" ; then - LIBFLAC_LIBS="-L$libFLAC_prefix/lib" - elif test "x$prefix" != "xNONE" ; then - LIBFLAC_LIBS="-L$prefix/lib" - fi - - LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm" - - if test "x$libFLAC_includes" != "x" ; then - LIBFLAC_CFLAGS="-I$libFLAC_includes" - elif test "x$libFLAC_prefix" != "x" ; then - LIBFLAC_CFLAGS="-I$libFLAC_prefix/include" - elif test "$prefix" != "xNONE"; then - LIBFLAC_CFLAGS="-I$prefix/include" - fi - - AC_MSG_CHECKING(for libFLAC) - no_libFLAC="" - - - if test "x$enable_libFLACtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_CXXFLAGS="$CXXFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $LIBFLAC_CFLAGS" - CXXFLAGS="$CXXFLAGS $LIBFLAC_CFLAGS" - LIBS="$LIBS $LIBFLAC_LIBS" -dnl -dnl Now check if the installed libFLAC is sufficiently new. -dnl - rm -f conf.libFLACtest - AC_TRY_RUN([ -#include -#include -#include -#include - -int main () -{ - system("touch conf.libFLACtest"); - return 0; -} - -],, no_libFLAC=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - if test "x$no_libFLAC" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) +# AM_PROG_MKDIR_P +# --------------- +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +# +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +# created by `make install' are always world readable, even if the +# installer happens to have an overly restrictive umask (e.g. 077). +# This was a mistake. There are at least two reasons why we must not +# use `-m 0755': +# - it causes special bits like SGID to be ignored, +# - it may be too restrictive (some setups expect 775 directories). +# +# Do not use -m 0755 and let people choose whatever they expect by +# setting umask. +# +# We cannot accept any implementation of `mkdir' that recognizes `-p'. +# Some implementations (such as Solaris 8's) are not thread-safe: if a +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +# concurrently, both version can detect that a/ is missing, but only +# one can create it and the other will error out. Consequently we +# restrict ourselves to GNU make (using the --version option ensures +# this.) +AC_DEFUN([AM_PROG_MKDIR_P], +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' else - AC_MSG_RESULT(no) - if test -f conf.libFLACtest ; then - : - else - echo "*** Could not run libFLAC test program, checking why..." - CFLAGS="$CFLAGS $LIBFLAC_CFLAGS" - LIBS="$LIBS $LIBFLAC_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding libFLAC or finding the wrong" - echo "*** version of libFLAC. If it is not finding libFLAC, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means libFLAC was incorrectly installed" - echo "*** or that you have moved libFLAC since it was installed. In the latter case, you" - echo "*** may want to edit the libFLAC-config script: $LIBFLAC_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - LIBFLAC_CFLAGS="" - LIBFLAC_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(LIBFLAC_CFLAGS) - AC_SUBST(LIBFLAC_LIBS) - rm -f conf.libFLACtest -]) - -# Configure paths for libOggFLAC -# "Inspired" by ogg.m4 - -dnl AM_PATH_LIBOGGFLAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libOggFLAC, and define LIBOGGFLAC_CFLAGS and LIBOGGFLAC_LIBS -dnl -AC_DEFUN(AM_PATH_LIBOGGFLAC, -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(libOggFLAC,[ --with-libOggFLAC=PFX Prefix where libOggFLAC is installed (optional)], libOggFLAC_prefix="$withval", libOggFLAC_prefix="") -AC_ARG_WITH(libOggFLAC-libraries,[ --with-libOggFLAC-libraries=DIR Directory where libOggFLAC library is installed (optional)], libOggFLAC_libraries="$withval", libOggFLAC_libraries="") -AC_ARG_WITH(libOggFLAC-includes,[ --with-libOggFLAC-includes=DIR Directory where libOggFLAC header files are installed (optional)], libOggFLAC_includes="$withval", libOggFLAC_includes="") -AC_ARG_ENABLE(libOggFLACtest, [ --disable-libOggFLACtest Do not try to compile and run a test libOggFLAC program],, enable_libOggFLACtest=yes) - - if test "x$libOggFLAC_libraries" != "x" ; then - LIBOGGFLAC_LIBS="-L$libOggFLAC_libraries" - elif test "x$libOggFLAC_prefix" != "x" ; then - LIBOGGFLAC_LIBS="-L$libOggFLAC_prefix/lib" - elif test "x$prefix" != "xNONE" ; then - LIBOGGFLAC_LIBS="-L$prefix/lib" + mkdir_p='$(install_sh) -d' fi +fi +AC_SUBST([mkdir_p])]) - LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -lm" +# Helper functions for option handling. -*- Autoconf -*- - if test "x$libOggFLAC_includes" != "x" ; then - LIBOGGFLAC_CFLAGS="-I$libOggFLAC_includes" - elif test "x$libOggFLAC_prefix" != "x" ; then - LIBOGGFLAC_CFLAGS="-I$libOggFLAC_prefix/include" - elif test "$prefix" != "xNONE"; then - LIBOGGFLAC_CFLAGS="-I$prefix/include" - fi +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - AC_MSG_CHECKING(for libOggFLAC) - no_libOggFLAC="" +# serial 3 +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - if test "x$enable_libOggFLACtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_CXXFLAGS="$CXXFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $LIBOGGFLAC_CFLAGS" - CXXFLAGS="$CXXFLAGS $LIBOGGFLAC_CFLAGS" - LIBS="$LIBS $LIBOGGFLAC_LIBS" -dnl -dnl Now check if the installed libOggFLAC is sufficiently new. -dnl - rm -f conf.libOggFLACtest - AC_TRY_RUN([ -#include -#include -#include -#include - -int main () -{ - system("touch conf.libOggFLACtest"); - return 0; -} - -],, no_libOggFLAC=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - if test "x$no_libOggFLAC" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT(no) - if test -f conf.libOggFLACtest ; then - : - else - echo "*** Could not run libOggFLAC test program, checking why..." - CFLAGS="$CFLAGS $LIBOGGFLAC_CFLAGS" - LIBS="$LIBS $LIBOGGFLAC_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding libOggFLAC or finding the wrong" - echo "*** version of libOggFLAC. If it is not finding libOggFLAC, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means libOggFLAC was incorrectly installed" - echo "*** or that you have moved libOggFLAC since it was installed. In the latter case, you" - echo "*** may want to edit the libOggFLAC-config script: $LIBOGGFLAC_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - LIBOGGFLAC_CFLAGS="" - LIBOGGFLAC_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(LIBOGGFLAC_CFLAGS) - AC_SUBST(LIBOGGFLAC_LIBS) - rm -f conf.libOggFLACtest -]) +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -# Configure paths for GTK+ -# Owen Taylor 1997-2001 +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, -dnl pass to pkg-config -dnl -AC_DEFUN(AM_PATH_GTK_2_0, -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], - , enable_gtktest=yes) +# Check to make sure that the build environment is sane. -*- Autoconf -*- - pkg_config_args=gtk+-2.0 - for module in . $4 - do - case "$module" in - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - esac - done +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - no_gtk="" +# serial 4 - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then - if test x$PKG_CONFIG != xno ; then - if pkg-config --atleast-pkgconfig-version 0.7 ; then - : - else - echo *** pkg-config too old; version 0.7 or better required. - no_gtk=yes - PKG_CONFIG=no - fi - else - no_gtk=yes - fi + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi - min_gtk_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" - enable_gtktest=no - fi +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then - : - else - no_gtk=yes - fi - fi +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) - if test x"$no_gtk" = x ; then - GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` - GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK+ is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK+ test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) +# Check how to create a tarball. -*- Autoconf -*- -# Configure paths for GTK+ -# Owen Taylor 97-11-3 +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -dnl -AC_DEFUN(AM_PATH_GTK, -[dnl -dnl Get the cflags and libraries from the gtk-config script -dnl -AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], - gtk_config_prefix="$withval", gtk_config_prefix="") -AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], - gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") -AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], - , enable_gtktest=yes) +# serial 2 - for module in . $4 - do - case "$module" in - gthread) - gtk_config_args="$gtk_config_args gthread" - ;; - esac - done +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) - min_gtk_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes - else - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } -#endif /* defined (GTK_MAJOR_VERSION) ... */ - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK test program, checking why..." - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) +done +rm -rf conftest.dir +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +m4_include([autoconf/alsa.m4]) +m4_include([autoconf/ao.m4]) +m4_include([autoconf/arts.m4]) +m4_include([autoconf/esd.m4]) +m4_include([autoconf/gtk-2.0.m4]) +m4_include([autoconf/gtk.m4]) +m4_include([autoconf/libFLAC.m4]) +m4_include([autoconf/libOggFLAC.m4]) +m4_include([autoconf/ogg.m4]) +m4_include([autoconf/utils.m4]) +m4_include([autoconf/vorbis.m4]) --- timidity-2.13.2.orig/utils/nkflib.c +++ timidity-2.13.2/utils/nkflib.c @@ -306,7 +306,9 @@ extern POINT _BufferSize; /* function prototype */ +#if 0 static int noconvert(SFILE *f); +#endif static int kanji_convert(SFILE *f); static int h_conv(SFILE *f,int c2,int c1); static int push_hold_buf(int c2,int c1); @@ -319,16 +321,22 @@ static int pre_convert(int c1,int c static int mime_begin(SFILE *f); static int mime_getc(SFILE *f); static int mime_ungetc(unsigned int c); +#ifdef STRICT_MIME static int mime_integrity(SFILE *f,unsigned char *p); +#endif static int base64decode(int c); +#if 0 static int usage(void); static void arguments(char *c); +#endif static void reinit(); /* buffers */ +#if 0 static char stdibuf[IOBUF_SIZE]; static char stdobuf[IOBUF_SIZE]; +#endif static unsigned char hold_buf[HOLD_SIZE*2]; static int hold_count; @@ -340,7 +348,9 @@ static int hold_count; static unsigned char mime_buf[MIME_BUF_SIZE]; static unsigned int mime_top = 0; static unsigned int mime_last = 0; /* decoded */ +#ifdef STRICT_MIME static unsigned int mime_input = 0; /* undecoded */ +#endif /* flags */ static int unbuf_f = FALSE; @@ -853,7 +863,7 @@ static void fix_euc_code(unsigned char * static int file_out = FALSE; static int add_cr = FALSE; static int del_cr = FALSE; -static int end_check; +//static int end_check; #if 0 #ifndef PERL_XS @@ -962,6 +972,7 @@ main(argc, argv) } #endif +#if 0 void arguments(char *cp) { @@ -1008,7 +1019,7 @@ arguments(char *cp) #endif #ifndef PERL_XS case 'v': - usage(); + // usage(); exit(1); break; #endif @@ -1095,7 +1106,9 @@ arguments(char *cp) } } #endif +#endif +#if 0 int noconvert(f) SFILE *f; @@ -1106,9 +1119,7 @@ noconvert(f) sputchar(c); return 1; } - - - +#endif int kanji_convert(SFILE *f) --- timidity-2.13.2.orig/utils/Makefile.in +++ timidity-2.13.2/utils/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -41,7 +41,6 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -55,7 +54,54 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/common.makefile.in +subdir = utils +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) +AR = ar +ARFLAGS = cru +libutils_a_AR = $(AR) $(ARFLAGS) +@ENABLE_NETWORK_TRUE@am__DEPENDENCIES_1 = net.$(OBJEXT) +@W32READDIR_TRUE@am__DEPENDENCIES_2 = readdir_win.$(OBJEXT) +@ENABLE_SOUND_SPEC_TRUE@am__DEPENDENCIES_3 = fft.$(OBJEXT) +@NEEDGETOPT_TRUE@am__DEPENDENCIES_4 = getopt.$(OBJEXT) +am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) +libutils_a_DEPENDENCIES = $(am__DEPENDENCIES_5) +am_libutils_a_OBJECTS = bitset.$(OBJEXT) fft4g.$(OBJEXT) \ + mblock.$(OBJEXT) memb.$(OBJEXT) nkflib.$(OBJEXT) \ + strtab.$(OBJEXT) support.$(OBJEXT) timer.$(OBJEXT) +libutils_a_OBJECTS = $(am_libutils_a_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libutils_a_SOURCES) $(EXTRA_libutils_a_SOURCES) +DIST_SOURCES = $(libutils_a_SOURCES) $(EXTRA_libutils_a_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ #CC= @CC@ @@ -114,6 +160,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -204,7 +251,6 @@ P_so_libs = @P_so_libs@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHCFLAGS = @SHCFLAGS@ - SHELL = @SHELL@ SHLD = @SHLD@ STRIP = @STRIP@ @@ -238,6 +284,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -265,6 +313,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -312,14 +361,11 @@ DEF_PKGDATADIR = -DPKGDATADIR=\"$(PKGDAT DEF_PKGLIBDIR = -DPKGLIBDIR=\"$(PKGLIBDIR)\" DEF_SHLIB_DIR = -DSHLIB_DIR=\"$(SHLIB_DIR)\" BITMAP_DIR = $(TCL_DIR)/bitmaps - INCLUDES = \ -I$(top_srcdir)/libarc \ -I$(top_srcdir)/timidity - noinst_LIBRARIES = libutils.a - libutils_a_SOURCES = \ bitset.c \ bitset.h \ @@ -339,7 +385,6 @@ libutils_a_SOURCES = \ timer.c \ timer.h - EXTRA_libutils_a_SOURCES = \ fft.c \ fft.h \ @@ -354,119 +399,56 @@ EXTRA_libutils_a_SOURCES = \ readdir.h \ readdir_win.c - @NEEDGETOPT_TRUE@GETOPT_OBJS = getopt.$(OBJEXT) - @ENABLE_NETWORK_TRUE@NET_OBJS = net.$(OBJEXT) - @ENABLE_SOUND_SPEC_TRUE@SOUND_SPEC_OBJS = fft.$(OBJEXT) - @W32READDIR_TRUE@W32READDIR_OBJS = readdir_win.$(OBJEXT) - libutils_LIBADD = \ $(NET_OBJS) \ $(W32READDIR_OBJS) \ $(SOUND_SPEC_OBJS) \ $(GETOPT_OBJS) - libutils_a_LIBADD = $(libutils_LIBADD) -subdir = utils -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) - -libutils_a_AR = $(AR) cru -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_FALSE@@W32READDIR_TRUE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_FALSE@@W32READDIR_TRUE@ readdir_win.$(OBJEXT) -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_FALSE@@W32READDIR_FALSE@libutils_a_DEPENDENCIES = -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@ readdir_win.$(OBJEXT) \ -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@ getopt.$(OBJEXT) -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_TRUE@@W32READDIR_FALSE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_TRUE@@W32READDIR_FALSE@ getopt.$(OBJEXT) -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_FALSE@@W32READDIR_TRUE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_FALSE@@W32READDIR_TRUE@ readdir_win.$(OBJEXT) \ -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_FALSE@@W32READDIR_TRUE@ fft.$(OBJEXT) -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_FALSE@@W32READDIR_FALSE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_FALSE@@W32READDIR_FALSE@ fft.$(OBJEXT) -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@ readdir_win.$(OBJEXT) \ -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@ fft.$(OBJEXT) \ -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@ getopt.$(OBJEXT) -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_FALSE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_FALSE@ fft.$(OBJEXT) \ -@ENABLE_NETWORK_FALSE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_FALSE@ getopt.$(OBJEXT) -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_FALSE@@W32READDIR_TRUE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_FALSE@@W32READDIR_TRUE@ net.$(OBJEXT) \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_FALSE@@W32READDIR_TRUE@ readdir_win.$(OBJEXT) -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_FALSE@@W32READDIR_FALSE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_FALSE@@W32READDIR_FALSE@ net.$(OBJEXT) -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@ net.$(OBJEXT) \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@ readdir_win.$(OBJEXT) \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@ getopt.$(OBJEXT) -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_TRUE@@W32READDIR_FALSE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_TRUE@@W32READDIR_FALSE@ net.$(OBJEXT) \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_FALSE@@NEEDGETOPT_TRUE@@W32READDIR_FALSE@ getopt.$(OBJEXT) -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_FALSE@@W32READDIR_TRUE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_FALSE@@W32READDIR_TRUE@ net.$(OBJEXT) \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_FALSE@@W32READDIR_TRUE@ readdir_win.$(OBJEXT) \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_FALSE@@W32READDIR_TRUE@ fft.$(OBJEXT) -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_FALSE@@W32READDIR_FALSE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_FALSE@@W32READDIR_FALSE@ net.$(OBJEXT) \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_FALSE@@W32READDIR_FALSE@ fft.$(OBJEXT) -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@ net.$(OBJEXT) \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@ readdir_win.$(OBJEXT) \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@ fft.$(OBJEXT) \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_TRUE@ getopt.$(OBJEXT) -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_FALSE@libutils_a_DEPENDENCIES = \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_FALSE@ net.$(OBJEXT) \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_FALSE@ fft.$(OBJEXT) \ -@ENABLE_NETWORK_TRUE@@ENABLE_SOUND_SPEC_TRUE@@NEEDGETOPT_TRUE@@W32READDIR_FALSE@ getopt.$(OBJEXT) -am_libutils_a_OBJECTS = bitset.$(OBJEXT) fft4g.$(OBJEXT) \ - mblock.$(OBJEXT) memb.$(OBJEXT) nkflib.$(OBJEXT) \ - strtab.$(OBJEXT) support.$(OBJEXT) timer.$(OBJEXT) -libutils_a_OBJECTS = $(am_libutils_a_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bitset.Po ./$(DEPDIR)/fft.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/fft4g.Po ./$(DEPDIR)/getopt.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mac_readdir.Po ./$(DEPDIR)/mac_util.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mblock.Po ./$(DEPDIR)/memb.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/net.Po ./$(DEPDIR)/nkflib.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/readdir_win.Po ./$(DEPDIR)/strtab.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/support.Po ./$(DEPDIR)/timer.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libutils_a_SOURCES) $(EXTRA_libutils_a_SOURCES) -DIST_COMMON = $(top_srcdir)/common.makefile.in Makefile.am Makefile.in -SOURCES = $(libutils_a_SOURCES) $(EXTRA_libutils_a_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/common.makefile.in $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common.makefile.in $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu utils/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu utils/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - -AR = ar +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -486,40 +468,21 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/support.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Po@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .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 +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; 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)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .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 +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; 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` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -528,6 +491,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -539,10 +503,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -565,13 +530,9 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/.. + $(mkdir_p) $(distdir)/.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -583,7 +544,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -601,7 +562,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) - installdirs: install: install-am install-exec: install-exec-am @@ -614,7 +574,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -622,24 +582,25 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -655,7 +616,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -674,8 +636,8 @@ uninstall-am: uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-noinstLIBRARIES ctags distclean distclean-compile \ - distclean-depend distclean-generic distclean-tags distdir dvi \ - dvi-am info info-am install install-am install-data \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ --- timidity-2.13.2.orig/autoconf/gtk.m4 +++ timidity-2.13.2/autoconf/gtk.m4 @@ -4,7 +4,7 @@ dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS dnl -AC_DEFUN(AM_PATH_GTK, +AC_DEFUN([AM_PATH_GTK], [dnl dnl Get the cflags and libraries from the gtk-config script dnl --- timidity-2.13.2.orig/autoconf/install-sh +++ timidity-2.13.2/autoconf/install-sh @@ -1,19 +1,38 @@ #!/bin/sh -# # install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). + +scriptversion=2005-05-14.22 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. # -# Copyright 1991 by the Massachusetts Institute of Technology +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it @@ -23,13 +42,11 @@ # from scratch. It can only install one file at a time, a restriction # shared with many OS's install programs. - # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" - # put in absolute paths if you don't have them in your path; or use env. vars. mvprog="${MVPROG-mv}" @@ -41,211 +58,266 @@ stripprog="${STRIPPROG-strip}" rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -transformbasename="" -transform_arg="" -instcmd="$mvprog" chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" +chowncmd= +chgrpcmd= +stripcmd= rmcmd="$rmprog -f" mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - : -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - : - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - : - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - : - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' - ' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' + -t) dstarg=$2 + shift + shift + continue;; -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" + -T) no_target_directory=true shift + continue;; - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - : - fi + --version) echo "$0 $scriptversion"; exit $?;; - pathcomp="${pathcomp}/" + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - : - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi -fi && +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done -exit 0 +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: --- timidity-2.13.2.orig/autoconf/arts.m4 +++ timidity-2.13.2/autoconf/arts.m4 @@ -9,7 +9,7 @@ dnl Snarfed from the ESD code below - bu dnl AM_PATH_ARTS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for aRts, and define ARTS_CFLAGS and ARTS_LIBS dnl -AC_DEFUN(AM_PATH_ARTS, +AC_DEFUN([AM_PATH_ARTS], [dnl dnl Get the cflags and libraries from the arts-config script dnl @@ -156,4 +156,4 @@ int main () AC_SUBST(ARTS_LIBS) rm -f conf.artstest ]) -dnl End of aRts \ No newline at end of file +dnl End of aRts --- timidity-2.13.2.orig/autoconf/depcomp +++ timidity-2.13.2/autoconf/depcomp @@ -1,7 +1,9 @@ #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000 Free Software Foundation, Inc. + +scriptversion=2005-07-09.11 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005 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 @@ -15,8 +17,8 @@ # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -25,22 +27,45 @@ # Originally written by Alexandre Oliva . +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit $? + ;; +esac + 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 +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" @@ -172,19 +197,25 @@ sgi) aix) # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. 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. - stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` + # 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" - outname="$stripped.o" 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" @@ -192,6 +223,7 @@ aix) 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:'. @@ -206,38 +238,96 @@ aix) 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 + # 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$//'` - base=`echo "$object" | sed -e 's/\.o$//' -e 's/\.lo$//'` - tmpdepfile1="$base.o.d" - tmpdepfile2="$base.d" if test "$libtool" = yes; then + # With Tru64 cc, shared objects can also be used to make a + # static library. This mecanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two + # compilations output dependencies in in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 + tmpdepfile2=$dir$base.o.d # libtool 1.5 + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 "$@" -Wc,-MD else + tmpdepfile1=$dir$base.o.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + tmpdepfile4=$dir$base.d "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" exit $stat fi - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - else - tmpdepfile="$tmpdepfile2" - fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a space and a tab in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$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 @@ -250,34 +340,42 @@ tru64) dashmstdout) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - test -z "$dashmflag" && dashmflag=-M - ( IFS=" " - case " $* " in - *" --mode=compile "*) # this is libtool, let us make it quiet - for arg - do # cycle over the arguments - case "$arg" in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done + # 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 - "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi + 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 ' ' ' @@ -295,33 +393,37 @@ dashXmstdout) ;; makedepend) - # 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;; - -*) - ;; - *) - set fnord "$@" "$arg"; shift;; - esac + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi + 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 ' ' ' @@ -334,35 +436,40 @@ makedepend) cpp) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - ( IFS=" " - case " $* " in - *" --mode=compile "*) - for arg - do # cycle over the arguments - case $arg in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done + # 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 - "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + done + + "$@" -E | + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -372,49 +479,27 @@ cpp) msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, + # always write the preprocessed file to stdout, regardless of -o, # because we must use -o when running libtool. - ( IFS=" " - case " $* " in - *" --mode=compile "*) - for arg - do # cycle over the arguments - case $arg in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; - esac - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + "$@" || 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" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi + 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" @@ -434,3 +519,12 @@ none) esac exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: --- timidity-2.13.2.orig/autoconf/mkinstalldirs +++ timidity-2.13.2/autoconf/mkinstalldirs @@ -1,31 +1,56 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain -# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $ +scriptversion=2005-06-29.22 + +# Original author: Noah Friedman +# Created: 1993-05-16 +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to or send patches to +# . errstatus=0 -dirmode="" +dirmode= usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to ." # process command line arguments while test $# -gt 0 ; do - case "${1}" in - -h | --help | --h* ) # -h for help - echo "${usage}" 1>&2; exit 0 ;; - -m ) # -m PERM arg - shift - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } - dirmode="${1}" - shift ;; - -- ) shift; break ;; # stop option processing - -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option - * ) break ;; # first non-opt arg - esac + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" + exit $? + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac done for file @@ -38,64 +63,96 @@ do done case $# in -0) exit 0 ;; + 0) exit 0 ;; esac +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. case $dirmode in -'') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi ;; -*) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi ;; + '') + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version + fi + ;; + *) + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done + fi + ;; esac for file do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift + case $file in + /*) pathcomp=/ ;; + *) pathcomp= ;; + esac + oIFS=$IFS + IFS=/ + set fnord $file + shift + IFS=$oIFS + + for d + do + test "x$d" = x && continue + + pathcomp=$pathcomp$d + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr= + chmod "$dirmode" "$pathcomp" || lasterr=$? - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi + if test ! -z "$lasterr"; then + errstatus=$lasterr fi fi - fi + fi + fi - pathcomp="$pathcomp/" - done + pathcomp=$pathcomp/ + done done exit $errstatus # Local Variables: # mode: shell-script -# sh-indentation: 3 +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" # End: -# mkinstalldirs ends here --- timidity-2.13.2.orig/autoconf/ogg.m4 +++ timidity-2.13.2/autoconf/ogg.m4 @@ -5,7 +5,7 @@ dnl AM_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS dnl -AC_DEFUN(AM_PATH_OGG, +AC_DEFUN([AM_PATH_OGG], [dnl dnl Get the cflags and libraries dnl --- timidity-2.13.2.orig/autoconf/missing +++ timidity-2.13.2/autoconf/missing @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. + +scriptversion=2005-06-08.21 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -15,8 +19,8 @@ # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -38,18 +42,24 @@ else configure_ac=configure.in fi +msg="missing on your system" + case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -74,11 +84,15 @@ Supported PROGRAM values: lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,14 +101,44 @@ Supported PROGRAM values: exit 1 ;; - aclocal*) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -102,13 +146,8 @@ WARNING: \`$1' is missing on your system ;; autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -116,13 +155,8 @@ WARNING: \`$1' is missing on your system ;; autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -140,13 +174,8 @@ WARNING: \`$1' is missing on your system ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -156,16 +185,11 @@ WARNING: \`$1' is missing on your system ;; autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. - You can get \`$1Help2man' as part of \`Autoconf' from any GNU + You can get \`$1' as part of \`Autoconf' from any GNU archive site." file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` @@ -185,7 +209,7 @@ WARNING: \`$1' is needed, and you do not bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -215,7 +239,7 @@ WARNING: \`$1' is missing on your system lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -237,13 +261,8 @@ WARNING: \`$1' is missing on your system ;; help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." @@ -262,54 +281,52 @@ WARNING: \`$1' is missing on your system ;; makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error # messages. if (gnutar --version > /dev/null 2>&1); then - gnutar ${1+"$@"} && exit 0 + gnutar "$@" && exit 0 fi if (gtar --version > /dev/null 2>&1); then - gtar ${1+"$@"} && exit 0 + gtar "$@" && exit 0 fi firstarg="$1" if shift; then case "$firstarg" in *o*) firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" ${1+"$@"} && exit 0 + tar "$firstarg" "$@" && exit 0 ;; esac case "$firstarg" in *h*) firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" ${1+"$@"} && exit 0 + tar "$firstarg" "$@" && exit 0 ;; esac fi @@ -323,10 +340,10 @@ WARNING: I can't seem to be able to run *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing + it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 @@ -334,3 +351,10 @@ WARNING: \`$1' is needed, and you do not esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: --- timidity-2.13.2.orig/autoconf/Makefile.in +++ timidity-2.13.2/autoconf/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -32,15 +32,11 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -54,7 +50,32 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +subdir = autoconf +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in config.guess \ + config.sub depcomp install-sh missing +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkglibdir = @pkglibdir@ ACLOCAL = @ACLOCAL@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ @@ -91,6 +112,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -214,6 +236,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -241,6 +265,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -260,7 +285,6 @@ target_vendor = @target_vendor@ tcltk_dep = @tcltk_dep@ timidity_LDFLAGS = @timidity_LDFLAGS@ w_so_libs = @w_so_libs@ - EXTRA_DIST = \ alsa.m4 \ ao.m4 \ @@ -274,22 +298,38 @@ EXTRA_DIST = \ utils.m4 \ vorbis.m4 -subdir = autoconf -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in config.guess config.sub depcomp \ - install-sh missing mkinstalldirs all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu autoconf/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu autoconf/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: tags: TAGS TAGS: @@ -297,10 +337,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -314,7 +350,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -332,7 +368,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am @@ -345,7 +380,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -353,7 +388,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -363,13 +398,15 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -385,7 +422,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -403,8 +440,8 @@ ps-am: uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ --- timidity-2.13.2.orig/autoconf/libOggFLAC.m4 +++ timidity-2.13.2/autoconf/libOggFLAC.m4 @@ -4,7 +4,7 @@ dnl AM_PATH_LIBOGGFLAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl Test for libOggFLAC, and define LIBOGGFLAC_CFLAGS and LIBOGGFLAC_LIBS dnl -AC_DEFUN(AM_PATH_LIBOGGFLAC, +AC_DEFUN([AM_PATH_LIBOGGFLAC], [dnl dnl Get the cflags and libraries dnl --- timidity-2.13.2.orig/autoconf/alsa.m4 +++ timidity-2.13.2/autoconf/alsa.m4 @@ -14,7 +14,7 @@ dnl dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified, dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result. dnl -AC_DEFUN(AM_PATH_ALSA, +AC_DEFUN([AM_PATH_ALSA], [dnl Save the original CFLAGS, LDFLAGS, and LIBS alsa_save_CFLAGS="$CFLAGS" alsa_save_LDFLAGS="$LDFLAGS" @@ -151,4 +151,4 @@ fi dnl That should be it. Now just export out symbols: AC_SUBST(ALSA_CFLAGS) AC_SUBST(ALSA_LIBS) -]) \ No newline at end of file +]) --- timidity-2.13.2.orig/autoconf/gtk-2.0.m4 +++ timidity-2.13.2/autoconf/gtk-2.0.m4 @@ -5,7 +5,7 @@ dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [A dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, dnl pass to pkg-config dnl -AC_DEFUN(AM_PATH_GTK_2_0, +AC_DEFUN([AM_PATH_GTK_2_0], [dnl dnl Get the cflags and libraries from pkg-config dnl --- timidity-2.13.2.orig/autoconf/utils.m4 +++ timidity-2.13.2/autoconf/utils.m4 @@ -17,7 +17,7 @@ dnl along with this program; if not, wri dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl MY_DEFINE(VARIABLE) -AC_DEFUN(MY_DEFINE, +AC_DEFUN([MY_DEFINE], [cat >> confdefs.h <grimble @@ -171,7 +171,7 @@ esac ]) dnl CONTAINS(word,filename,action-if-found,action-if-not-found) -AC_DEFUN(CONTAINS, +AC_DEFUN([CONTAINS], [if $contains "^[$1]"'[$]' $2 >/dev/null 2>&1; then [$3] else @@ -180,7 +180,7 @@ fi ]) dnl SET_UNIQ_WORDS(shell-variable,words...) -AC_DEFUN(SET_UNIQ_WORDS, +AC_DEFUN([SET_UNIQ_WORDS], [rm -f wordtmp >/dev/null 2>&1 val='' for f in $2; do @@ -193,7 +193,7 @@ rm -f wordtmp >/dev/null 2>&1 dnl WAPI_CHECK_FUNC(FUNCTION, INCLUDES, TEST-BODY, [ACTION-FI-FOUND [, ACTION-IF-NOT-FOUND]]) -AC_DEFUN(WAPI_CHECK_FUNC, +AC_DEFUN([WAPI_CHECK_FUNC], [AC_MSG_CHECKING(for $1) AC_CACHE_VAL(wapi_cv_func_$1, [AC_TRY_LINK([#include @@ -214,7 +214,7 @@ dnl WAPI_CHECK_LIB(LIBRARY, FUNCTION, dnl INCLUDES, TEST-BODY dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND dnl [, OTHER-LIBRARIES]]]) -AC_DEFUN(WAPI_CHECK_LIB, +AC_DEFUN([WAPI_CHECK_LIB], [AC_MSG_CHECKING([for $2 in -l$1]) ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` AC_CACHE_VAL(wapi_cv_lib_$ac_lib_var, @@ -238,18 +238,18 @@ fi ]) dnl EXTRACT_CPPFLAGS(CPPFLAGS-to-append,others-to-append,FLAGS) -AC_DEFUN(EXTRACT_CPPFLAGS, +AC_DEFUN([EXTRACT_CPPFLAGS], [for f in $3; do case ".$f" in .-I?*|.-D?*) $1="[$]$1 $f" ;; - *) $2="[$]$1 $f" ;; + *) $2="[$]$2 $f" ;; esac done ]) dnl CHECK_COMPILER_OPTION(OPTIONS [, ACTION-IF-SUCCEED [, ACTION-IF-FAILED]]) -AC_DEFUN(CHECK_COMPILER_OPTION, +AC_DEFUN([CHECK_COMPILER_OPTION], [AC_MSG_CHECKING([whether -$1 option is recognized]) ac_ccoption=`echo $1 | sed 'y%./+-%__p_%'` AC_CACHE_VAL(timidity_cv_ccoption_$ac_ccoption, @@ -282,7 +282,7 @@ dnl MY_SEARCH_LIBS(FUNCTION, LIBRARIES [ dnl [, ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]]) dnl Search for a library defining FUNC, if it's not already available. -AC_DEFUN(MY_SEARCH_LIBS, +AC_DEFUN([MY_SEARCH_LIBS], [AC_CACHE_CHECK([for library containing $1], [timidity_cv_search_$1], [ac_func_search_save_LIBS="$LIBS" timidity_cv_search_$1="no" @@ -295,4 +295,4 @@ if test "$timidity_cv_search_$1" != "no" $3 else : $4 -fi]) \ No newline at end of file +fi]) --- timidity-2.13.2.orig/autoconf/esd.m4 +++ timidity-2.13.2/autoconf/esd.m4 @@ -7,7 +7,7 @@ dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS dnl -AC_DEFUN(AM_PATH_ESD, +AC_DEFUN([AM_PATH_ESD], [dnl dnl Get the cflags and libraries from the esd-config script dnl @@ -172,7 +172,7 @@ int main () dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]]) dnl Test, whether esd supports multiple recording clients (version >=0.2.21) dnl -AC_DEFUN(AM_ESD_SUPPORTS_MULTIPLE_RECORD, +AC_DEFUN([AM_ESD_SUPPORTS_MULTIPLE_RECORD], [dnl AC_MSG_NOTICE([whether installed esd version supports multiple recording clients]) ac_save_ESD_CFLAGS="$ESD_CFLAGS" --- timidity-2.13.2.orig/autoconf/vorbis.m4 +++ timidity-2.13.2/autoconf/vorbis.m4 @@ -5,7 +5,7 @@ dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS dnl -AC_DEFUN(AM_PATH_VORBIS, +AC_DEFUN([AM_PATH_VORBIS], [dnl dnl Get the cflags and libraries dnl --- timidity-2.13.2.orig/autoconf/ao.m4 +++ timidity-2.13.2/autoconf/ao.m4 @@ -6,7 +6,7 @@ dnl XIPH_PATH_AO([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl Test for libao, and define AO_CFLAGS and AO_LIBS dnl -AC_DEFUN(XIPH_PATH_AO, +AC_DEFUN([XIPH_PATH_AO], [dnl dnl Get the cflags and libraries dnl --- timidity-2.13.2.orig/autoconf/libFLAC.m4 +++ timidity-2.13.2/autoconf/libFLAC.m4 @@ -4,7 +4,7 @@ dnl AM_PATH_LIBFLAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl Test for libFLAC, and define LIBFLAC_CFLAGS and LIBFLAC_LIBS dnl -AC_DEFUN(AM_PATH_LIBFLAC, +AC_DEFUN([AM_PATH_LIBFLAC], [dnl dnl Get the cflags and libraries dnl --- timidity-2.13.2.orig/script/Makefile.in +++ timidity-2.13.2/script/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -31,15 +31,11 @@ # 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 - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -53,7 +49,31 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +subdir = script +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkglibdir = @pkglibdir@ ACLOCAL = @ACLOCAL@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ @@ -90,6 +110,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -213,6 +234,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -240,6 +263,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -259,28 +283,44 @@ target_vendor = @target_vendor@ tcltk_dep = @tcltk_dep@ timidity_LDFLAGS = @timidity_LDFLAGS@ w_so_libs = @w_so_libs@ - EXTRA_DIST = \ dllutl.rb \ lspatch.pl \ readme.txt \ wcc386_w.sh -subdir = script -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu script/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu script/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: tags: TAGS TAGS: @@ -288,10 +328,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -305,7 +341,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -323,7 +359,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am @@ -336,7 +371,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -344,7 +379,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -354,13 +389,15 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -376,7 +413,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -394,8 +431,8 @@ ps-am: uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ --- timidity-2.13.2.orig/timidity/tables.c +++ timidity-2.13.2/timidity/tables.c @@ -1682,4 +1682,4 @@ float lofi_sampling_freq_table_xg[] = 420.0, 416.0, 412.0, 408.0, 405.0, 401.0, 397.0, 394.0, 390.0, 387.0, 383.0, 380.0, 377.0, 374.0, 371.0, 368.0, 364.0, 361.0, 359.0, 356.0, 353.0, 350.0, 347.0, 345.0, -}; \ No newline at end of file +}; --- timidity-2.13.2.orig/timidity/common.c +++ timidity-2.13.2/timidity/common.c @@ -27,10 +27,16 @@ #include #include #include -#include -#ifdef HAVE_SYS_TIME_H -#include -#endif /* HAVE_SYS_TIME_H */ +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif /* TIME_WITH_SYS_TIME */ #ifdef HAVE_SYS_TYPES_H #include #endif /* HAVE_SYS_TYPES_H */ @@ -204,8 +210,9 @@ url_dumpfile(URL url, const char *ext) return NULL; } - while((n = url_read(url, buff, sizeof(buff))) > 0) - fwrite(buff, 1, n, fp); + while((n = url_read(url, buff, sizeof(buff))) > 0) { + size_t dummy = fwrite(buff, 1, n, fp); ++dummy; + } fclose(fp); return safe_strdup(filename); } @@ -405,7 +412,8 @@ struct timidity_file *open_file(char *na } /* First try the given name */ - strncpy(current_filename, url_unexpand_home_dir(name), 1023); + /* strncpy(current_filename, url_unexpand_home_dir(name), 1023); */ + strncpy(current_filename, name, 1023); current_filename[1023]='\0'; if(noise_mode) @@ -587,6 +595,7 @@ void *safe_malloc(size_t count) #endif /* ABORT_AT_FATAL */ safe_exit(10); /*NOTREACHED*/ + return 0; } void *safe_large_malloc(size_t count) @@ -613,6 +622,7 @@ void *safe_large_malloc(size_t count) #endif /* ABORT_AT_FATAL */ safe_exit(10); /*NOTREACHED*/ + return 0; } void *safe_realloc(void *ptr, size_t count) @@ -649,6 +659,7 @@ void *safe_realloc(void *ptr, size_t cou #endif /* ABORT_AT_FATAL */ safe_exit(10); /*NOTREACHED*/ + return 0; } /* This'll allocate memory or die. */ @@ -673,6 +684,7 @@ char *safe_strdup(const char *s) #endif /* ABORT_AT_FATAL */ safe_exit(10); /*NOTREACHED*/ + return 0; } /* free ((void **)ptr_list)[0..count-1] and ptr_list itself */ --- timidity-2.13.2.orig/timidity/aRts_a.c +++ timidity-2.13.2/timidity/aRts_a.c @@ -38,6 +38,7 @@ #include #include #include +#include #ifndef NO_STRING_H #include @@ -56,6 +57,8 @@ #include "playmidi.h" #include "miditrace.h" +static int arts_init_state = 0; /* 0=no init, 1=arts_init, 2=arts_free */ +static int arts_atexit = 0; /* 1=atexit handler has been installed */ static arts_stream_t stream = 0; static int server_buffer = 0; static int output_count = 0; @@ -64,9 +67,11 @@ static int open_output(void); /* 0=succe static void close_output(void); static int output_data(char *buf, int32 nbytes); static int acntl(int request, void *arg); -static int detect(void); -/* export the playback mode */ +/* export the playback mode. aRts cannot support auto-detection properly + * see TiMidity bug report #35 on Kagemai. Do not add any functionality + * that would require TiMidity to call arts_init() again after an + * arts_free(), it will blow up */ #define dpm arts_play_mode @@ -83,16 +88,15 @@ PlayMode dpm = { close_output, output_data, acntl, - detect }; -static int detect(void) +static void arts_shutdown(void) { - if (arts_init() == 0) { - arts_free(); - return 1; /* ok, found */ + if(arts_init_state == 1) { + close_output(); + arts_free(); + arts_init_state = 2; /* paranoia */ } - return 0; } /*************************************************************************/ @@ -114,10 +118,23 @@ static int open_output(void) channels = (dpm.encoding & PE_MONO) ? 1 : 2; /* Open the audio device */ - if((i = arts_init()) != 0) - { - ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s", - dpm.name, arts_error_text(i)); + switch (arts_init_state) { + case 0: + if((i = arts_init()) != 0) + { + ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s", + dpm.name, arts_error_text(i)); + return -1; + } + arts_init_state = 1; + if (!arts_atexit) { + atexit(arts_shutdown); + arts_atexit = 1; + } + break; + case 2: + ctl->cmsg(CMSG_ERROR, VERB_NORMAL, + "TiMidity aRts bug: open_output() after close_output() not supported"); return -1; } stream = arts_play_stream(dpm.rate, @@ -186,7 +203,6 @@ static void close_output(void) if(stream == 0) return; arts_close_stream(stream); - arts_free(); stream = 0; } @@ -197,7 +213,6 @@ static int acntl(int request, void *arg) { case PM_REQ_DISCARD: /* Discard stream */ arts_close_stream(stream); - arts_free(); stream=NULL; return 0; case PM_REQ_RATE: /* Change sample rate */ --- timidity-2.13.2.orig/timidity/loadtab.c +++ timidity-2.13.2/timidity/loadtab.c @@ -60,7 +60,7 @@ int load_table(char *file) fclose(fp); return 0; } - } while (value = strtok(NULL, ", \n")); + } while ((value = strtok(NULL, ", \n"))); } fclose(fp); return 0; --- timidity-2.13.2.orig/timidity/m2m.c +++ timidity-2.13.2/timidity/m2m.c @@ -169,25 +169,25 @@ static char chord_letters[4] = { 'M', 'm * lookup_table[mod_vol][expression, volume] */ static char vol_nonlin_to_lin[128][2] = { - 0, 127, 7, 125, 11, 120, 14, 121, 16, 126, 19, 121, 21, 122, - 23, 122, 25, 122, 26, 126, 28, 125, 30, 123, 31, 126, 33, 124, - 34, 126, 36, 124, 37, 125, 38, 126, 40, 124, 41, 125, 42, 126, - 43, 127, 45, 125, 46, 125, 47, 126, 48, 126, 49, 127, 50, 127, - 52, 125, 53, 125, 54, 125, 55, 125, 56, 126, 57, 126, 58, 126, - 59, 126, 60, 126, 61, 126, 62, 126, 63, 126, 64, 126, 65, 126, - 66, 126, 67, 125, 68, 125, 69, 125, 69, 127, 70, 127, 71, 126, - 72, 126, 73, 126, 74, 126, 75, 126, 76, 125, 76, 127, 77, 127, - 78, 126, 79, 126, 80, 126, 81, 126, 81, 127, 82, 126, 83, 126, - 84, 126, 85, 126, 85, 127, 86, 126, 87, 126, 88, 126, 88, 127, - 89, 127, 90, 126, 91, 126, 91, 127, 92, 127, 93, 126, 94, 126, - 94, 127, 95, 127, 96, 126, 97, 126, 97, 127, 98, 126, 99, 126, - 100, 126, 100, 127, 101, 126, 102, 126, 102, 127, 103, 126, 104, 126, - 104, 127, 105, 127, 106, 126, 106, 127, 107, 127, 108, 126, 108, 127, - 109, 127, 110, 126, 110, 127, 111, 127, 112, 126, 112, 127, 113, 127, - 114, 126, 114, 127, 115, 127, 116, 126, 116, 127, 117, 126, 118, 126, - 118, 127, 119, 126, 120, 126, 120, 127, 121, 126, 121, 127, 122, 126, - 123, 126, 123, 127, 124, 126, 124, 127, 125, 127, 126, 126, 126, 127, - 127, 126, 127, 127 }; + { 0, 127, },{ 7, 125, },{11, 120, },{ 14, 121, },{ 16, 126, },{ 19, 121, },{ 21, 122,}, + { 23, 122, },{ 25, 122, },{ 26, 126, },{28, 125, },{ 30, 123, },{ 31, 126, },{ 33, 124,}, + { 34, 126, },{ 36, 124, },{ 37, 125, },{ 38, 126, },{ 40, 124, },{ 41, 125, },{ 42, 126, }, + { 43, 127, },{ 45, 125, },{ 46, 125, },{ 47, 126, },{ 48, 126, },{ 49, 127, },{ 50, 127, }, + { 52, 125, },{ 53, 125, },{ 54, 125, },{ 55, 125, },{ 56, 126, },{ 57, 126, },{ 58, 126, }, + { 59, 126, },{ 60, 126, },{ 61, 126, },{ 62, 126, },{ 63, 126, },{64, 126, },{ 65, 126, }, + { 66, 126, },{ 67, 125, },{ 68, 125, },{ 69, 125, },{ 69, 127, },{ 70, 127, },{ 71, 126, }, + { 72, 126, },{ 73, 126, },{ 74, 126, },{ 75, 126, },{ 76, 125, },{ 76, 127, },{ 77, 127, }, + { 78, 126, },{ 79, 126, },{ 80, 126, },{ 81, 126, },{ 81, 127, },{ 82, 126, },{ 83, 126, }, + { 84, 126, },{ 85, 126, },{ 85, 127, },{ 86, 126, },{ 87, 126, },{ 88, 126, },{ 88, 127, }, + { 89, 127, },{ 90, 126, },{ 91, 126, },{ 91, 127, },{ 92, 127, },{ 93, 126, },{ 94, 126, }, + { 94, 127, },{ 95, 127, },{ 96, 126, },{ 97, 126, },{ 97, 127, },{ 98, 126, },{ 99, 126, }, + { 100, 126, },{100, 127, },{101, 126, },{102, 126, },{102, 127, },{103, 126, },{104, 126, }, + { 104, 127, },{105, 127, },{106, 126, },{106, 127, },{107, 127, },{108, 126, },{108, 127, }, + { 109, 127, },{110, 126, },{110, 127, },{111, 127, },{112, 126, },{112, 127, },{113, 127, }, + { 114, 126, },{114, 127, },{115, 127, },{116, 126, },{116, 127, },{117, 126, },{118, 126, }, + { 118, 127, },{119, 126, },{120, 126, },{120, 127, },{121, 126, },{121, 127, },{122, 126, }, + { 123, 126, },{123, 127, },{124, 126, },{124, 127, },{125, 127, },{126, 126, },{126, 127, }, + { 127, 126, }, { 127, 127 }, }; /* * Uses the volume curve specified by the -V or --volume-curve option. @@ -964,7 +964,7 @@ void m2m_process_events(MidiEvent * ev) uint32 oldtime = 0, deltatime; double time = 0; int chord, chord_type, chord_subtype; - int ch, n, old_ch, newnote, mod_sample, expression; + int ch, n, old_ch, newnote, mod_sample=0, expression=0; int extra; /* go through the list for real this time */ --- timidity-2.13.2.orig/timidity/smplfile.c +++ timidity-2.13.2/timidity/smplfile.c @@ -318,11 +318,11 @@ static int import_wave_load(char *sample struct timidity_file *tf; char buf[12]; int state; /* initial > fmt_read > data_read */ - int i, chunk_size, type_index, type_size, samples; + int i, chunk_size, type_index, type_size, samples = 0; int32 chunk_flags; Sample *sample; - WAVFormatChunk format; - WAVSamplerChunk samplerc; + WAVFormatChunk format = {0,}; + WAVSamplerChunk samplerc = {0,}; GeneralInstrumentInfo instc; if ((tf = open_file(sample_file, 1, OF_NORMAL)) == NULL) @@ -400,7 +400,7 @@ static int import_wave_load(char *sample { uint8 modes; int32 sample_rate, root_freq; - uint32 loopStart, loopEnd; + uint32 loopStart = 0, loopEnd = 0; sample_rate = 1000000000 / samplerc.dwSamplePeriod; root_freq = freq_table[samplerc.dwMIDIUnityNote]; @@ -604,7 +604,7 @@ static int import_aiff_load(char *sample AIFFCommonChunk common; AIFFSoundDataChunk sound; GeneralInstrumentInfo inst_info; - AIFFLoopInfo loop_info; + AIFFLoopInfo loop_info = {0,0,0}; AIFFMarkerData *marker_data; if ((tf = open_file(sample_file, 1, OF_NORMAL)) == NULL) --- timidity-2.13.2.orig/timidity/flac_a.c +++ timidity-2.13.2/timidity/flac_a.c @@ -45,9 +45,6 @@ #endif #include -#ifdef AU_OGGFLAC -#include -#endif #ifdef AU_FLAC_DLL #include "w32_libFLAC_dll_g.h" @@ -56,7 +53,10 @@ #include "w32_libOGGFLAC_dll_g.h" #endif +#include + #include "timidity.h" +#include "common.h" #include "output.h" #include "controls.h" #include "timer.h" @@ -78,11 +78,7 @@ PlayMode dpm = { DEFAULT_RATE, PE_SIGNED|PE_16BIT, PF_PCM_STREAM, -1, {0}, /* default: get all the buffer fragments you can */ -#ifndef AU_OGGFLAC - "FLAC", 'F', -#else "FLAC / OggFLAC", 'F', -#endif /* AU_OGGFLAC */ NULL, open_output, close_output, @@ -100,28 +96,22 @@ typedef struct { unsigned long out_bytes; union { FLAC__StreamEncoderState flac; - FLAC__SeekableStreamEncoderState s_flac; -#ifdef AU_OGGFLAC - OggFLAC__StreamEncoderState ogg; -#endif + FLAC__StreamEncoderState s_flac; + FLAC__StreamEncoderState ogg; } state; union { union { FLAC__StreamEncoder *stream; - FLAC__SeekableStreamEncoder *s_stream; + FLAC__StreamEncoder *s_stream; } flac; -#ifdef AU_OGGFLAC union { - OggFLAC__StreamEncoder *stream; + FLAC__StreamEncoder *stream; } ogg; -#endif } encoder; } FLAC_ctx; typedef struct { -#ifdef AU_OGGFLAC int isogg; -#endif int verify; int padding; int blocksize; @@ -138,9 +128,7 @@ typedef struct { /* default compress level is 5 */ FLAC_options flac_options = { -#ifdef AU_OGGFLAC 0, /* isogg */ -#endif 0, /* verify */ 4096, /* padding */ 4608, /* blocksize */ @@ -158,29 +146,24 @@ FLAC_options flac_options = { static long serial_number = 0; FLAC_ctx *flac_ctx = NULL; -#ifdef AU_OGGFLAC static FLAC__StreamEncoderWriteStatus -ogg_stream_encoder_write_callback(const OggFLAC__StreamEncoder *encoder, +ogg_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], - unsigned bytes, unsigned samples, + size_t bytes, unsigned samples, unsigned current_frame, void *client_data); -#endif static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], - unsigned bytes, unsigned samples, + size_t bytes, unsigned samples, unsigned current_frame, void *client_data); static void flac_stream_encoder_metadata_callback(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data); static FLAC__StreamEncoderWriteStatus -flac_seekable_stream_encoder_write_callback(const FLAC__SeekableStreamEncoder *encoder, +flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], - unsigned bytes, unsigned samples, + size_t bytes, unsigned samples, unsigned current_frame, void *client_data); -static void flac_seekable_stream_encoder_metadata_callback(const FLAC__SeekableStreamEncoder *encoder, - const FLAC__StreamMetadata *metadata, - void *client_data); /* preset */ void flac_set_compression_level(int compression_level) @@ -278,12 +261,10 @@ void flac_set_option_verify(int verify) { flac_options.verify = verify; } -#ifdef AU_OGGFLAC void flac_set_option_oggflac(int isogg) { flac_options.isogg = isogg; } -#endif static int flac_session_close() { @@ -295,19 +276,17 @@ static int flac_session_close() dpm.fd = -1; if (ctx != NULL) { -#ifdef AU_OGGFLAC if (flac_options.isogg) { if (ctx->encoder.ogg.stream) { - OggFLAC__stream_encoder_finish(ctx->encoder.ogg.stream); - OggFLAC__stream_encoder_delete(ctx->encoder.ogg.stream); + FLAC__stream_encoder_finish(ctx->encoder.ogg.stream); + FLAC__stream_encoder_delete(ctx->encoder.ogg.stream); } } else -#endif /* AU_OGGFLAC */ if (flac_options.seekable) { if (ctx->encoder.flac.s_stream) { - FLAC__seekable_stream_encoder_finish(ctx->encoder.flac.s_stream); - FLAC__seekable_stream_encoder_delete(ctx->encoder.flac.s_stream); + FLAC__stream_encoder_finish(ctx->encoder.flac.s_stream); + FLAC__stream_encoder_delete(ctx->encoder.flac.s_stream); } } else @@ -320,6 +299,7 @@ static int flac_session_close() free(ctx); flac_ctx = NULL; } + return 0; } static int flac_output_open(const char *fname, const char *comment) @@ -371,17 +351,16 @@ static int flac_output_open(const char * metadata[num_metadata++] = &padding; } -#ifdef AU_OGGFLAC if (flac_options.isogg) { - if ((ctx->encoder.ogg.stream = OggFLAC__stream_encoder_new()) == NULL) { + if ((ctx->encoder.ogg.stream = FLAC__stream_encoder_new()) == NULL) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create OggFLAC stream"); flac_session_close(); return -1; } - OggFLAC__stream_encoder_set_channels(ctx->encoder.ogg.stream, nch); + FLAC__stream_encoder_set_channels(ctx->encoder.ogg.stream, nch); /* 16bps only */ - OggFLAC__stream_encoder_set_bits_per_sample(ctx->encoder.ogg.stream, 16); + FLAC__stream_encoder_set_bits_per_sample(ctx->encoder.ogg.stream, 16); /* set sequential number for serial */ serial_number++; @@ -389,9 +368,9 @@ static int flac_output_open(const char * srand(time(NULL)); serial_number = rand(); } - OggFLAC__stream_encoder_set_serial_number(ctx->encoder.ogg.stream, serial_number); + FLAC__stream_encoder_set_ogg_serial_number(ctx->encoder.ogg.stream, serial_number); - OggFLAC__stream_encoder_set_verify(ctx->encoder.ogg.stream, flac_options.verify); + FLAC__stream_encoder_set_verify(ctx->encoder.ogg.stream, flac_options.verify); if (!FLAC__format_sample_rate_is_valid(dpm.rate)) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "invalid sampling rate %d", @@ -399,53 +378,52 @@ static int flac_output_open(const char * flac_session_close(); return -1; } - OggFLAC__stream_encoder_set_sample_rate(ctx->encoder.ogg.stream, dpm.rate); + FLAC__stream_encoder_set_sample_rate(ctx->encoder.ogg.stream, dpm.rate); - OggFLAC__stream_encoder_set_qlp_coeff_precision(ctx->encoder.ogg.stream, flac_options.qlp_coeff_precision); + FLAC__stream_encoder_set_qlp_coeff_precision(ctx->encoder.ogg.stream, flac_options.qlp_coeff_precision); /* expensive! */ - OggFLAC__stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.ogg.stream, flac_options.qlp_coeff_precision_search); + FLAC__stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.ogg.stream, flac_options.qlp_coeff_precision_search); if (nch == 2) { - OggFLAC__stream_encoder_set_do_mid_side_stereo(ctx->encoder.ogg.stream, flac_options.mid_side); - OggFLAC__stream_encoder_set_loose_mid_side_stereo(ctx->encoder.ogg.stream, flac_options.adaptive_mid_side); + FLAC__stream_encoder_set_do_mid_side_stereo(ctx->encoder.ogg.stream, flac_options.mid_side); + FLAC__stream_encoder_set_loose_mid_side_stereo(ctx->encoder.ogg.stream, flac_options.adaptive_mid_side); } - OggFLAC__stream_encoder_set_max_lpc_order(ctx->encoder.ogg.stream, flac_options.max_lpc_order); - OggFLAC__stream_encoder_set_min_residual_partition_order(ctx->encoder.ogg.stream, flac_options.min_residual_partition_order); - OggFLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.ogg.stream, flac_options.max_residual_partition_order); + FLAC__stream_encoder_set_max_lpc_order(ctx->encoder.ogg.stream, flac_options.max_lpc_order); + FLAC__stream_encoder_set_min_residual_partition_order(ctx->encoder.ogg.stream, flac_options.min_residual_partition_order); + FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.ogg.stream, flac_options.max_residual_partition_order); - OggFLAC__stream_encoder_set_blocksize(ctx->encoder.ogg.stream, flac_options.blocksize); - - OggFLAC__stream_encoder_set_client_data(ctx->encoder.ogg.stream, ctx); + FLAC__stream_encoder_set_blocksize(ctx->encoder.ogg.stream, flac_options.blocksize); if (0 < num_metadata) - OggFLAC__stream_encoder_set_metadata(ctx->encoder.ogg.stream, metadata, num_metadata); - - /* set callback */ - OggFLAC__stream_encoder_set_write_callback(ctx->encoder.ogg.stream, ogg_stream_encoder_write_callback); + FLAC__stream_encoder_set_metadata(ctx->encoder.ogg.stream, metadata, num_metadata); - ctx->state.ogg = OggFLAC__stream_encoder_init(ctx->encoder.ogg.stream); - if (ctx->state.ogg != OggFLAC__STREAM_ENCODER_OK) { + ctx->state.ogg = FLAC__stream_encoder_init_ogg_stream(ctx->encoder.ogg.stream, + 0, + ogg_stream_encoder_write_callback, + 0, 0, 0, + ctx); + if (ctx->state.ogg != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create OggFLAC state (%s)", - OggFLAC__StreamEncoderStateString[ctx->state.ogg]); + FLAC__StreamEncoderStateString[ctx->state.ogg]); flac_session_close(); return -1; } } else -#endif /* AU_OGGFLAC */ if (flac_options.seekable) { - if ((ctx->encoder.flac.s_stream = FLAC__seekable_stream_encoder_new()) == NULL) { + /* FLAC SEEKABLE STREAM */ + if ((ctx->encoder.flac.s_stream = FLAC__stream_encoder_new()) == NULL) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC stream"); flac_session_close(); return -1; } - FLAC__seekable_stream_encoder_set_channels(ctx->encoder.flac.s_stream, nch); + FLAC__stream_encoder_set_channels(ctx->encoder.flac.s_stream, nch); /* 16bps only */ - FLAC__seekable_stream_encoder_set_bits_per_sample(ctx->encoder.flac.s_stream, 16); + FLAC__stream_encoder_set_bits_per_sample(ctx->encoder.flac.s_stream, 16); - FLAC__seekable_stream_encoder_set_verify(ctx->encoder.flac.s_stream, flac_options.verify); + FLAC__stream_encoder_set_verify(ctx->encoder.flac.s_stream, flac_options.verify); if (!FLAC__format_sample_rate_is_valid(dpm.rate)) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "invalid sampling rate %d", @@ -453,44 +431,40 @@ static int flac_output_open(const char * flac_session_close(); return -1; } - FLAC__seekable_stream_encoder_set_sample_rate(ctx->encoder.flac.s_stream, dpm.rate); + FLAC__stream_encoder_set_sample_rate(ctx->encoder.flac.s_stream, dpm.rate); - FLAC__seekable_stream_encoder_set_qlp_coeff_precision(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision); + FLAC__stream_encoder_set_qlp_coeff_precision(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision); /* expensive! */ - FLAC__seekable_stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision_search); + FLAC__stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision_search); if (nch == 2) { - FLAC__seekable_stream_encoder_set_do_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.mid_side); - FLAC__seekable_stream_encoder_set_loose_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.adaptive_mid_side); + FLAC__stream_encoder_set_do_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.mid_side); + FLAC__stream_encoder_set_loose_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.adaptive_mid_side); } - FLAC__seekable_stream_encoder_set_max_lpc_order(ctx->encoder.flac.s_stream, flac_options.max_lpc_order); - FLAC__seekable_stream_encoder_set_min_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.min_residual_partition_order); - FLAC__seekable_stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.max_residual_partition_order); + FLAC__stream_encoder_set_max_lpc_order(ctx->encoder.flac.s_stream, flac_options.max_lpc_order); + FLAC__stream_encoder_set_min_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.min_residual_partition_order); + FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.max_residual_partition_order); - FLAC__seekable_stream_encoder_set_blocksize(ctx->encoder.flac.s_stream, flac_options.blocksize); - FLAC__seekable_stream_encoder_set_client_data(ctx->encoder.flac.s_stream, ctx); + FLAC__stream_encoder_set_blocksize(ctx->encoder.flac.s_stream, flac_options.blocksize); if (0 < num_metadata) - FLAC__seekable_stream_encoder_set_metadata(ctx->encoder.flac.s_stream, metadata, num_metadata); + FLAC__stream_encoder_set_metadata(ctx->encoder.flac.s_stream, metadata, num_metadata); - /* set callback */ -/* FLAC__seekable_stream_encoder_set_metadata_callback(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_metadata_callback); /* */ -#ifndef __BORLANDC__ - FLAC__stream_encoder_set_metadata_callback(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_metadata_callback); /* */ -#endif - FLAC__seekable_stream_encoder_set_write_callback(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_write_callback); + ctx->state.s_flac = FLAC__stream_encoder_init_stream( + ctx->encoder.flac.s_stream, + flac_stream_encoder_write_callback, + 0, 0, 0, + ctx); - ctx->state.s_flac = FLAC__seekable_stream_encoder_init(ctx->encoder.flac.s_stream); - if (ctx->state.s_flac != FLAC__SEEKABLE_STREAM_ENCODER_OK) { + if (ctx->state.s_flac != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC state (%s)", - FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]); + FLAC__StreamEncoderStateString[ctx->state.s_flac]); flac_session_close(); return -1; } - } - else - { + } else { + /* NON SEEKABLE STREAM */ if ((ctx->encoder.flac.stream = FLAC__stream_encoder_new()) == NULL) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC stream"); flac_session_close(); @@ -525,16 +499,16 @@ static int flac_output_open(const char * FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.stream, flac_options.max_residual_partition_order); FLAC__stream_encoder_set_blocksize(ctx->encoder.flac.stream, flac_options.blocksize); - FLAC__stream_encoder_set_client_data(ctx->encoder.flac.stream, ctx); if (0 < num_metadata) FLAC__stream_encoder_set_metadata(ctx->encoder.flac.stream, metadata, num_metadata); - /* set callback */ - FLAC__stream_encoder_set_metadata_callback(ctx->encoder.flac.stream, flac_stream_encoder_metadata_callback); - FLAC__stream_encoder_set_write_callback(ctx->encoder.flac.stream, flac_stream_encoder_write_callback); - - ctx->state.flac = FLAC__stream_encoder_init(ctx->encoder.flac.stream); + ctx->state.flac = FLAC__stream_encoder_init_stream(ctx->encoder.flac.stream, + flac_stream_encoder_write_callback, + 0, + 0, + flac_stream_encoder_metadata_callback, + ctx); if (ctx->state.flac != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC state (%s)", FLAC__StreamEncoderStateString[ctx->state.flac]); @@ -550,7 +524,6 @@ static int auto_flac_output_open(const c { char *output_filename; -#ifdef AU_OGGFLAC if (flac_options.isogg) { #ifndef __W32G__ output_filename = create_auto_output_name(input_filename, "ogg", NULL, 0); @@ -559,7 +532,6 @@ static int auto_flac_output_open(const c #endif } else -#endif /* AU_OGGFLAC */ { #ifndef __W32G__ output_filename = create_auto_output_name(input_filename, "flac", NULL, 0); @@ -608,12 +580,10 @@ static int open_output(void) exclude_enc |= PE_BYTESWAP | PE_24BIT; dpm.encoding = validate_encoding(dpm.encoding, include_enc, exclude_enc); -#ifdef AU_OGGFLAC if (flac_options.isogg) { ctl->cmsg(CMSG_WARNING, VERB_NORMAL, "*** cannot write back seekpoints when encoding to Ogg yet ***"); ctl->cmsg(CMSG_WARNING, VERB_NORMAL, "*** and stream end will not be written. ***"); } -#endif #ifndef __W32G__ if(dpm.name == NULL) { @@ -638,11 +608,10 @@ static int open_output(void) return 0; } -#ifdef AU_OGGFLAC static FLAC__StreamEncoderWriteStatus -ogg_stream_encoder_write_callback(const OggFLAC__StreamEncoder *encoder, +ogg_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], - unsigned bytes, unsigned samples, + size_t bytes, unsigned samples, unsigned current_frame, void *client_data) { FLAC_ctx *ctx = (FLAC_ctx *)client_data; @@ -654,11 +623,10 @@ ogg_stream_encoder_write_callback(const else return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR; } -#endif static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], - unsigned bytes, unsigned samples, + size_t bytes, unsigned samples, unsigned current_frame, void *client_data) { FLAC_ctx *ctx = (FLAC_ctx *)client_data; @@ -675,26 +643,6 @@ static void flac_stream_encoder_metadata void *client_data) { } -static FLAC__StreamEncoderWriteStatus -flac_seekable_stream_encoder_write_callback(const FLAC__SeekableStreamEncoder *encoder, - const FLAC__byte buffer[], - unsigned bytes, unsigned samples, - unsigned current_frame, void *client_data) -{ - FLAC_ctx *ctx = (FLAC_ctx *)client_data; - - ctx->out_bytes += bytes; - - if (write(dpm.fd, buffer, bytes) == bytes) - return FLAC__STREAM_ENCODER_WRITE_STATUS_OK; - else - return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR; -} -static void flac_seekable_stream_encoder_metadata_callback(const FLAC__SeekableStreamEncoder *encoder, - const FLAC__StreamMetadata *metadata, - void *client_data) -{ -} static int output_data(char *buf, int32 nbytes) { @@ -723,21 +671,18 @@ static int output_data(char *buf, int32 oggbuf[i] = *s++; } -#ifdef AU_OGGFLAC if (flac_options.isogg) { - ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream); - if (ctx->state.ogg != OggFLAC__STREAM_ENCODER_OK) { - if (ctx->state.ogg == OggFLAC__STREAM_ENCODER_FLAC_STREAM_ENCODER_ERROR) { + ctx->state.ogg = FLAC__stream_encoder_get_state(ctx->encoder.ogg.stream); + if (ctx->state.ogg != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream verify error (%s)", - FLAC__StreamDecoderStateString[OggFLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.ogg.stream)]); - } + FLAC__StreamEncoderStateString[FLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.ogg.stream)]); ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode OggFLAC stream (%s)", - OggFLAC__StreamEncoderStateString[ctx->state.ogg]); + FLAC__StreamEncoderStateString[ctx->state.ogg]); flac_session_close(); return -1; } - if (!OggFLAC__stream_encoder_process_interleaved(ctx->encoder.ogg.stream, oggbuf, + if (!FLAC__stream_encoder_process_interleaved(ctx->encoder.ogg.stream, oggbuf, nbytes / nch / 2)) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode OggFLAC stream"); flac_session_close(); @@ -745,24 +690,23 @@ static int output_data(char *buf, int32 } } else -#endif /* AU_OGGFLAC */ if (flac_options.seekable) { - ctx->state.s_flac = FLAC__seekable_stream_encoder_get_state(ctx->encoder.flac.s_stream); + ctx->state.s_flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.s_stream); if (ctx->state.s_flac != FLAC__STREAM_ENCODER_OK) { - if (ctx->state.s_flac == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR | + if ((ctx->state.s_flac == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR) | FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream verify error (%s)", - FLAC__SeekableStreamDecoderStateString[FLAC__seekable_stream_encoder_get_verify_decoder_state(ctx->encoder.flac.s_stream)]); + FLAC__StreamDecoderStateString[FLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.flac.s_stream)]); } else { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream (%s)", - FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]); + FLAC__StreamEncoderStateString[ctx->state.s_flac]); } flac_session_close(); return -1; } - if (!FLAC__seekable_stream_encoder_process_interleaved(ctx->encoder.flac.s_stream, oggbuf, + if (!FLAC__stream_encoder_process_interleaved(ctx->encoder.flac.s_stream, oggbuf, nbytes / nch / 2 )) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream"); flac_session_close(); @@ -773,7 +717,7 @@ static int output_data(char *buf, int32 { ctx->state.flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.stream); if (ctx->state.flac != FLAC__STREAM_ENCODER_OK) { - if (ctx->state.flac == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR | + if ((ctx->state.flac == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR) | FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream verify error (%s)", FLAC__StreamDecoderStateString[FLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.flac.stream)]); @@ -814,19 +758,17 @@ static void close_output(void) } if (flac_options.isogg) { -#ifdef AU_OGGFLAC - if ((ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream)) != OggFLAC__STREAM_ENCODER_OK) { + if ((ctx->state.ogg = FLAC__stream_encoder_get_state(ctx->encoder.ogg.stream)) != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "OggFLAC stream encoder is invalid (%s)", - OggFLAC__StreamEncoderStateString[ctx->state.ogg]); + FLAC__StreamEncoderStateString[ctx->state.ogg]); /* fall through */ } } else -#endif /* AU_OGGFLAC */ if (flac_options.seekable) { - if ((ctx->state.s_flac = FLAC__seekable_stream_encoder_get_state(ctx->encoder.flac.s_stream)) != FLAC__SEEKABLE_STREAM_ENCODER_OK) { + if ((ctx->state.s_flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.s_stream)) != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream encoder is invalid (%s)", - FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]); + FLAC__StreamEncoderStateString[ctx->state.s_flac]); /* fall through */ } } --- timidity-2.13.2.orig/timidity/freq.c +++ timidity-2.13.2/timidity/freq.c @@ -144,10 +144,10 @@ float pitch_freq_lb_table[129] = { (f)ifth, rotate back 1, rotate back 2 */ int chord_table[4][3][3] = { - 0, 4, 7, -5, 0, 4, -8, -5, 0, - 0, 3, 7, -5, 0, 3, -9, -5, 0, - 0, 3, 6, -6, 0, 3, -9, -6, 0, - 0, 5, 7, -5, 0, 5, -7, -5, 0 + { { 0, 4, 7, }, { -5, 0, 4, }, { -8, -5, 0, }, }, + { { 0, 3, 7, }, { -5, 0, 3, }, { -9, -5, 0, }, }, + { { 0, 3, 6, }, { -6, 0, 3, }, { -9, -6, 0, }, }, + { { 0, 5, 7, }, { -5, 0, 5, }, { -7, -5, 0, }, }, }; /* write the chord type to *chord, returns the root note of the chord */ @@ -160,7 +160,7 @@ int assign_chord(double *pitchbins, int int prune_pitches[10] = {0}; int i, j, k, n, n2; double val, cutoff, max; - int start = 0; + //int start = 0; int root_flag; *chord = -1; @@ -330,18 +330,19 @@ float freq_fourier(Sample *sp, int *chor uint32 length, length0; int32 maxoffset, minoffset, minoffset1, minoffset2; int32 minbin, maxbin; - int32 bin, bestbin, largest_peak; + //int32 bestbin; + int32 bin, largest_peak; int32 i, j, n, total; unsigned int rate; int pitch, bestpitch, minpitch, maxpitch, maxpitch2; sample_t *origdata; float f0, mag, maxmag; int16 amp, oldamp, maxamp; - int32 maxpos; + int32 maxpos = 0; double sum, weightsum, maxsum; - double sum_bestfreq; + //double sum_bestfreq; double f0_inv; - int num_maxsum; + //int num_maxsum; float freq, newfreq, bestfreq, freq_inc; float minfreq, maxfreq, minfreq2, maxfreq2; float min_guessfreq, max_guessfreq; @@ -624,7 +625,7 @@ float freq_fourier(Sample *sp, int *chor /* look for harmonics */ for (freq = minfreq2; freq <= maxfreq2; freq += freq_inc) { - double ratio; + //double ratio; n = total = 0; sum = weightsum = 0; --- timidity-2.13.2.orig/timidity/reverb.c +++ timidity-2.13.2/timidity/reverb.c @@ -267,6 +267,7 @@ static inline int32 do_lfo(lfo *lfo) return val; } +#if 0 /*! modulated delay with allpass interpolation (for Chorus Effect,...) */ static void free_mod_delay(mod_delay *delay) { @@ -275,7 +276,9 @@ static void free_mod_delay(mod_delay *de delay->buf = NULL; } } +#endif +#if 0 static void set_mod_delay(mod_delay *delay, int32 ndelay, int32 depth) { int32 size = ndelay + depth + 1; @@ -290,6 +293,7 @@ static void set_mod_delay(mod_delay *del delay->size = size; memset(delay->buf, 0, sizeof(int32) * delay->size); } +#endif static inline void do_mod_delay(int32 *stream, int32 *buf, int32 size, int32 *rindex, int32 *windex, int32 ndelay, int32 depth, int32 lfoval, int32 *hist) @@ -672,6 +676,7 @@ static inline void do_filter_biquad(int3 *stream = t1; } +#if 0 static void do_biquad_filter_stereo(int32* buf, int32 count, filter_biquad *p) { int32 i; @@ -687,6 +692,7 @@ static void do_biquad_filter_stereo(int3 p->x1l = x1l, p->x2l = x2l, p->y1l = y1l, p->y2l = y2l, p->x1r = x1r, p->x2r = x2r, p->y1r = y1r, p->y2r = y2r; } +#endif void init_filter_shelving(filter_shelving *p) { @@ -1624,8 +1630,8 @@ static void do_ch_reverb_panning_delay(i buf[i] += r; buf[++i] += l; - if (++index0 == buf_size) {index0 = 0;} - if (++buf_index == buf_size) {buf_index = 0;} + if (index0++ == buf_size) {index0 = 0;} + if (buf_index++ == buf_size) {buf_index = 0;} } memset(reverb_effect_buffer, 0, sizeof(int32) * count); info->index[0] = index0; @@ -2745,7 +2751,7 @@ void do_dual_od(int32 *buf, int32 count, filter_moog *svfl = &(info->svfl), *svfr = &(info->svfr); filter_biquad *lpf1 = &(info->lpf1); void (*do_amp_siml)(int32 *, int32) = info->amp_siml, - (*do_amp_simr)(int32 *, int32) = info->amp_simr, +// (*do_amp_simr)(int32 *, int32) = info->amp_simr, (*do_odl)(int32 *, int32) = info->odl, (*do_odr)(int32 *, int32) = info->odr; int32 i, inputl, inputr, high, levelli = info->levelli, levelri = info->levelri, @@ -4057,6 +4063,7 @@ enum { /* width * length * height */ ER_EOF, }; +#if 0 struct early_reflection_param_t { int8 character; int16 time_left[20]; /* in ms */ @@ -4066,154 +4073,200 @@ struct early_reflection_param_t { }; static struct early_reflection_param_t early_reflection_param[] = { - ER_SMALL_ROOM, 461, 487, 505, 530, 802, 818, 927, 941, 1047, 1058, 1068, 1070, 1076, 1096, 1192, 1203, 1236, 1261, 1321, 1344, - 0.1594, 0.1328, 0.1197, 0.1025, 0.0285, 0.0267, 0.0182, 0.0173, 0.0098, 0.0121, 0.0092, 0.0116, 0.0090, 0.0085, 0.0084, 0.0081, 0.0059, 0.0055, 0.0048, 0.0045, - 381, 524, 621, 636, 718, 803, 890, 906, 975, 1016, 1026, 1040, 1137, 1166, 1212, 1220, 1272, 1304, 1315, 1320, - 0.1896, 0.0706, 0.0467, 0.0388, 0.0298, 0.0211, 0.0137, 0.0181, 0.0144, 0.0101, 0.0088, 0.0118, 0.0072, 0.0081, 0.0073, 0.0071, 0.0062, 0.0042, 0.0057, 0.0024, - ER_MEDIUM_ROOM, 461, 802, 927, 1047, 1236, 1321, 1345, 1468, 1497, 1568, 1609, 1642, 1713, 1744, 1768, 1828, 1835, 1864, 1893, 1923, - 0.3273, 0.0586, 0.0374, 0.0201, 0.0120, 0.0098, 0.0152, 0.0090, 0.0109, 0.0095, 0.0068, 0.0034, 0.0073, 0.0041, 0.0027, 0.0024, 0.0059, 0.0034, 0.0054, 0.0035, - 381, 636, 906, 1026, 1040, 1315, 1320, 1415, 1445, 1556, 1588, 1628, 1637, 1663, 1693, 1768, 1788, 1824, 1882, 1920, - 0.1896, 0.0706, 0.0467, 0.0388, 0.0298, 0.0211, 0.0137, 0.0181, 0.0144, 0.0101, 0.0088, 0.0118, 0.0072, 0.0081, 0.0073, 0.0071, 0.0062, 0.0042, 0.0057, 0.0024, - ER_LARGE_ROOM, 577, 875, 1665, 1713, 1784, 1790, 1835, 1913, 1954, 2023, 2062, 2318, 2349, 2371, 2405, 2409, 2469, 2492, 2534, 2552, - 0.2727, 0.0752, 0.0070, 0.0110, 0.0083, 0.0056, 0.0089, 0.0079, 0.0051, 0.0066, 0.0043, 0.0019, 0.0035, 0.0023, 0.0038, 0.0017, 0.0015, 0.0029, 0.0027, 0.0032, - 381, 636, 1485, 1570, 1693, 1768, 1875, 1895, 1963, 2066, 2128, 2220, 2277, 2309, 2361, 2378, 2432, 2454, 2497, 2639, - 0.5843, 0.1197, 0.0117, 0.0098, 0.0032, 0.0028, 0.0042, 0.0022, 0.0020, 0.0038, 0.0035, 0.0043, 0.0040, 0.0022, 0.0028, 0.0035, 0.0033, 0.0018, 0.0010, 0.0008, - ER_MEDIUM_HALL, 1713, 1835, 2534, 2618, 2780, 2849, 2857, 3000, 3071, 3159, 3226, 3338, 3349, 3407, 3413, 3465, 3594, 3669, 3714, 3728, - 0.0146, 0.0118, 0.0036, 0.0033, 0.0033, 0.0030, 0.0031, 0.0013, 0.0012, 0.0023, 0.0021, 0.0018, 0.0016, 0.0015, 0.0016, 0.0016, 0.0015, 0.0013, 0.0006, 0.0012, - 381, 636, 1693, 1768, 2066, 2128, 2362, 2416, 2454, 2644, 2693, 2881, 2890, 2926, 2957, 3036, 3185, 3328, 3385, 3456, - 0.7744, 0.1586, 0.0042, 0.0037, 0.0051, 0.0046, 0.0036, 0.0034, 0.0024, 0.0018, 0.0017, 0.0024, 0.0015, 0.0023, 0.0008, 0.0012, 0.0013, 0.0005, 0.0012, 0.0005, - ER_LARGE_HALL, 1713, 1835, 2534, 2618, 3159, 3226, 3669, 3728, 4301, 4351, 4936, 5054, 5097, 5278, 5492, 5604, 5631, 5714, 5751, 5800, - 0.0150, 0.0121, 0.0037, 0.0034, 0.0023, 0.0022, 0.0013, 0.0012, 0.0005, 0.0005, 0.0006, 0.0002, 0.0002, 0.0004, 0.0004, 0.0004, 0.0004, 0.0002, 0.0002, 0.0003, - 381, 636, 1693, 1768, 2066, 2128, 2644, 2693, 3828, 3862, 4169, 4200, 4792, 5068, 5204, 5231, 5378, 5460, 5485, 5561, - 0.7936, 0.1625, 0.0043, 0.0038, 0.0052, 0.0047, 0.0018, 0.0017, 0.0008, 0.0008, 0.0007, 0.0007, 0.0003, 0.0001, 0.0003, 0.0002, 0.0002, 0.0002, 0.0001, 0.0003, - ER_EOF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + { ER_SMALL_ROOM, + { 461, 487, 505, 530, 802, 818, 927, 941, 1047, 1058, 1068, 1070, 1076, 1096, 1192, 1203, 1236, 1261, 1321, 1344, }, + { 0.1594, 0.1328, 0.1197, 0.1025, 0.0285, 0.0267, 0.0182, 0.0173, 0.0098, 0.0121, 0.0092, 0.0116, 0.0090, 0.0085, 0.0084, 0.0081, 0.0059, 0.0055, 0.0048, 0.0045, }, + { 381, 524, 621, 636, 718, 803, 890, 906, 975, 1016, 1026, 1040, 1137, 1166, 1212, 1220, 1272, 1304, 1315, 1320,}, + { 0.1896, 0.0706, 0.0467, 0.0388, 0.0298, 0.0211, 0.0137, 0.0181, 0.0144, 0.0101, 0.0088, 0.0118, 0.0072, 0.0081, 0.0073, 0.0071, 0.0062, 0.0042, 0.0057, 0.0024, }, + }, + { ER_MEDIUM_ROOM, + { 461, 802, 927, 1047, 1236, 1321, 1345, 1468, 1497, 1568, 1609, 1642, 1713, 1744, 1768, 1828, 1835, 1864, 1893, 1923,}, + { 0.3273, 0.0586, 0.0374, 0.0201, 0.0120, 0.0098, 0.0152, 0.0090, 0.0109, 0.0095, 0.0068, 0.0034, 0.0073, 0.0041, 0.0027, 0.0024, 0.0059, 0.0034, 0.0054, 0.0035,}, + { 381, 636, 906, 1026, 1040, 1315, 1320, 1415, 1445, 1556, 1588, 1628, 1637, 1663, 1693, 1768, 1788, 1824, 1882, 1920,}, + { 0.1896, 0.0706, 0.0467, 0.0388, 0.0298, 0.0211, 0.0137, 0.0181, 0.0144, 0.0101, 0.0088, 0.0118, 0.0072, 0.0081, 0.0073, 0.0071, 0.0062, 0.0042, 0.0057, 0.0024, }, + }, + { ER_LARGE_ROOM, + { 577, 875, 1665, 1713, 1784, 1790, 1835, 1913, 1954, 2023, 2062, 2318, 2349, 2371, 2405, 2409, 2469, 2492, 2534, 2552, }, + { 0.2727, 0.0752, 0.0070, 0.0110, 0.0083, 0.0056, 0.0089, 0.0079, 0.0051, 0.0066, 0.0043, 0.0019, 0.0035, 0.0023, 0.0038, 0.0017, 0.0015, 0.0029, 0.0027, 0.0032,}, + { 381, 636, 1485, 1570, 1693, 1768, 1875, 1895, 1963, 2066, 2128, 2220, 2277, 2309, 2361, 2378, 2432, 2454, 2497, 2639,}, + { 0.5843, 0.1197, 0.0117, 0.0098, 0.0032, 0.0028, 0.0042, 0.0022, 0.0020, 0.0038, 0.0035, 0.0043, 0.0040, 0.0022, 0.0028, 0.0035, 0.0033, 0.0018, 0.0010, 0.0008, }, + }, + { ER_MEDIUM_HALL, + { 1713, 1835, 2534, 2618, 2780, 2849, 2857, 3000, 3071, 3159, 3226, 3338, 3349, 3407, 3413, 3465, 3594, 3669, 3714, 3728,}, + { 0.0146, 0.0118, 0.0036, 0.0033, 0.0033, 0.0030, 0.0031, 0.0013, 0.0012, 0.0023, 0.0021, 0.0018, 0.0016, 0.0015, 0.0016, 0.0016, 0.0015, 0.0013, 0.0006, 0.0012,}, + { 381, 636, 1693, 1768, 2066, 2128, 2362, 2416, 2454, 2644, 2693, 2881, 2890, 2926, 2957, 3036, 3185, 3328, 3385, 3456,}, + { 0.7744, 0.1586, 0.0042, 0.0037, 0.0051, 0.0046, 0.0036, 0.0034, 0.0024, 0.0018, 0.0017, 0.0024, 0.0015, 0.0023, 0.0008, 0.0012, 0.0013, 0.0005, 0.0012, 0.0005, }, + }, + { ER_LARGE_HALL, + { 1713, 1835, 2534, 2618, 3159, 3226, 3669, 3728, 4301, 4351, 4936, 5054, 5097, 5278, 5492, 5604, 5631, 5714, 5751, 5800,}, + { 0.0150, 0.0121, 0.0037, 0.0034, 0.0023, 0.0022, 0.0013, 0.0012, 0.0005, 0.0005, 0.0006, 0.0002, 0.0002, 0.0004, 0.0004, 0.0004, 0.0004, 0.0002, 0.0002, 0.0003,}, + { 381, 636, 1693, 1768, 2066, 2128, 2644, 2693, 3828, 3862, 4169, 4200, 4792, 5068, 5204, 5231, 5378, 5460, 5485, 5561,}, + { 0.7936, 0.1625, 0.0043, 0.0038, 0.0052, 0.0047, 0.0018, 0.0017, 0.0008, 0.0008, 0.0007, 0.0007, 0.0003, 0.0001, 0.0003, 0.0002, 0.0002, 0.0002, 0.0001, 0.0003, }, + }, + { ER_EOF, { 0, }, { 0, }, { 0, }, { 0, }, }, }; +#endif struct _EffectEngine effect_engine[] = { - EFFECT_NONE, "None", NULL, NULL, NULL, 0, - EFFECT_STEREO_EQ, "Stereo-EQ", do_stereo_eq, conv_gs_stereo_eq, NULL, sizeof(InfoStereoEQ), - EFFECT_EQ2, "2-Band EQ", do_eq2, conv_gs_eq2, conv_xg_eq2, sizeof(InfoEQ2), - EFFECT_EQ3, "3-Band EQ", do_eq3, NULL, conv_xg_eq3, sizeof(InfoEQ3), - EFFECT_OVERDRIVE1, "Overdrive", do_overdrive1, conv_gs_overdrive1, NULL, sizeof(InfoOverdrive1), - EFFECT_DISTORTION1, "Distortion", do_distortion1, conv_gs_overdrive1, NULL, sizeof(InfoOverdrive1), - EFFECT_OD1OD2, "OD1/OD2", do_dual_od, conv_gs_dual_od, NULL, sizeof(InfoOD1OD2), - EFFECT_HEXA_CHORUS, "Hexa-Chorus", do_hexa_chorus, conv_gs_hexa_chorus, NULL, sizeof(InfoHexaChorus), - EFFECT_CHORUS, "Chorus", do_chorus, NULL, conv_xg_chorus, sizeof(InfoChorus), - EFFECT_FLANGER, "Flanger", do_chorus, NULL, conv_xg_flanger, sizeof(InfoChorus), - EFFECT_SYMPHONIC, "Symphonic", do_chorus, NULL, conv_xg_symphonic, sizeof(InfoChorus), - EFFECT_CHORUS_EQ3, "3-Band EQ (XG Chorus built-in)", do_eq3, NULL, conv_xg_chorus_eq3, sizeof(InfoEQ3), - EFFECT_STEREO_OVERDRIVE, "Stereo Overdrive", do_stereo_od, NULL, conv_xg_overdrive, sizeof(InfoStereoOD), - EFFECT_STEREO_DISTORTION, "Stereo Distortion", do_stereo_od, NULL, conv_xg_distortion, sizeof(InfoStereoOD), - EFFECT_STEREO_AMP_SIMULATOR, "Amp Simulator", do_stereo_od, NULL, conv_xg_amp_simulator, sizeof(InfoStereoOD), - EFFECT_OD_EQ3, "2-Band EQ (XG OD built-in)", do_eq3, NULL, conv_xg_od_eq3, sizeof(InfoEQ3), - EFFECT_DELAY_LCR, "Delay L,C,R", do_delay_lcr, NULL, conv_xg_delay_lcr, sizeof(InfoDelayLCR), - EFFECT_DELAY_LR, "Delay L,R", do_delay_lr, NULL, conv_xg_delay_lr, sizeof(InfoDelayLR), - EFFECT_ECHO, "Echo", do_echo, NULL, conv_xg_echo, sizeof(InfoEcho), - EFFECT_CROSS_DELAY, "Cross Delay", do_cross_delay, NULL, conv_xg_cross_delay, sizeof(InfoCrossDelay), - EFFECT_DELAY_EQ2, "2-Band EQ (XG Delay built-in)", do_eq2, NULL, conv_xg_delay_eq2, sizeof(InfoEQ2), - EFFECT_LOFI, "Lo-Fi", do_lofi, NULL, conv_xg_lofi, sizeof(InfoLoFi), - EFFECT_LOFI1, "Lo-Fi 1", do_lofi1, conv_gs_lofi1, NULL, sizeof(InfoLoFi1), - EFFECT_LOFI2, "Lo-Fi 2", do_lofi2, conv_gs_lofi2, NULL, sizeof(InfoLoFi2), - EFFECT_XG_AUTO_WAH, "Auto Wah", do_xg_auto_wah, NULL, conv_xg_auto_wah, sizeof(InfoXGAutoWah), - EFFECT_XG_AUTO_WAH_EQ2, "2-Band EQ (Auto Wah built-in)", do_eq2, NULL, conv_xg_auto_wah_eq2, sizeof(InfoEQ2), - EFFECT_XG_AUTO_WAH_OD, "OD (Auto Wah built-in)", do_xg_auto_wah_od, NULL, conv_xg_auto_wah_od, sizeof(InfoXGAutoWahOD), - EFFECT_XG_AUTO_WAH_OD_EQ3, "2-Band EQ (Auto Wah OD built-in)", do_eq3, NULL, conv_xg_auto_wah_od_eq3, sizeof(InfoEQ3), - -1, "EOF", NULL, NULL, NULL, 0, +{ EFFECT_NONE, "None", NULL, NULL, NULL, 0,}, +{ EFFECT_STEREO_EQ, "Stereo-EQ", do_stereo_eq, conv_gs_stereo_eq, NULL, sizeof(InfoStereoEQ),}, +{ EFFECT_EQ2, "2-Band EQ", do_eq2, conv_gs_eq2, conv_xg_eq2, sizeof(InfoEQ2),}, +{ EFFECT_EQ3, "3-Band EQ", do_eq3, NULL, conv_xg_eq3, sizeof(InfoEQ3),}, +{ EFFECT_OVERDRIVE1, "Overdrive", do_overdrive1, conv_gs_overdrive1, NULL, sizeof(InfoOverdrive1),}, +{ EFFECT_DISTORTION1, "Distortion", do_distortion1, conv_gs_overdrive1, NULL, sizeof(InfoOverdrive1),}, +{ EFFECT_OD1OD2, "OD1/OD2", do_dual_od, conv_gs_dual_od, NULL, sizeof(InfoOD1OD2),}, +{ EFFECT_HEXA_CHORUS, "Hexa-Chorus", do_hexa_chorus, conv_gs_hexa_chorus, NULL, sizeof(InfoHexaChorus),}, +{ EFFECT_CHORUS, "Chorus", do_chorus, NULL, conv_xg_chorus, sizeof(InfoChorus),}, +{ EFFECT_FLANGER, "Flanger", do_chorus, NULL, conv_xg_flanger, sizeof(InfoChorus),}, +{ EFFECT_SYMPHONIC, "Symphonic", do_chorus, NULL, conv_xg_symphonic, sizeof(InfoChorus),}, +{ EFFECT_CHORUS_EQ3, "3-Band EQ (XG Chorus built-in)", do_eq3, NULL, conv_xg_chorus_eq3, sizeof(InfoEQ3),}, +{ EFFECT_STEREO_OVERDRIVE, "Stereo Overdrive", do_stereo_od, NULL, conv_xg_overdrive, sizeof(InfoStereoOD),}, +{ EFFECT_STEREO_DISTORTION, "Stereo Distortion", do_stereo_od, NULL, conv_xg_distortion, sizeof(InfoStereoOD),}, +{ EFFECT_STEREO_AMP_SIMULATOR, "Amp Simulator", do_stereo_od, NULL, conv_xg_amp_simulator, sizeof(InfoStereoOD),}, +{ EFFECT_OD_EQ3, "2-Band EQ (XG OD built-in)", do_eq3, NULL, conv_xg_od_eq3, sizeof(InfoEQ3),}, +{ EFFECT_DELAY_LCR, "Delay L,C,R", do_delay_lcr, NULL, conv_xg_delay_lcr, sizeof(InfoDelayLCR),}, +{ EFFECT_DELAY_LR, "Delay L,R", do_delay_lr, NULL, conv_xg_delay_lr, sizeof(InfoDelayLR),}, +{ EFFECT_ECHO, "Echo", do_echo, NULL, conv_xg_echo, sizeof(InfoEcho),}, +{ EFFECT_CROSS_DELAY, "Cross Delay", do_cross_delay, NULL, conv_xg_cross_delay, sizeof(InfoCrossDelay),}, +{ EFFECT_DELAY_EQ2, "2-Band EQ (XG Delay built-in)", do_eq2, NULL, conv_xg_delay_eq2, sizeof(InfoEQ2),}, +{ EFFECT_LOFI, "Lo-Fi", do_lofi, NULL, conv_xg_lofi, sizeof(InfoLoFi),}, +{ EFFECT_LOFI1, "Lo-Fi 1", do_lofi1, conv_gs_lofi1, NULL, sizeof(InfoLoFi1),}, +{ EFFECT_LOFI2, "Lo-Fi 2", do_lofi2, conv_gs_lofi2, NULL, sizeof(InfoLoFi2),}, +{ EFFECT_XG_AUTO_WAH, "Auto Wah", do_xg_auto_wah, NULL, conv_xg_auto_wah, sizeof(InfoXGAutoWah),}, +{ EFFECT_XG_AUTO_WAH_EQ2, "2-Band EQ (Auto Wah built-in)", do_eq2, NULL, conv_xg_auto_wah_eq2, sizeof(InfoEQ2),}, +{ EFFECT_XG_AUTO_WAH_OD, "OD (Auto Wah built-in)", do_xg_auto_wah_od, NULL, conv_xg_auto_wah_od, sizeof(InfoXGAutoWahOD),}, +{ EFFECT_XG_AUTO_WAH_OD_EQ3, "2-Band EQ (Auto Wah OD built-in)", do_eq3, NULL, conv_xg_auto_wah_od_eq3, sizeof(InfoEQ3),}, +{ -1, "EOF", NULL, NULL, NULL, 0, }, }; struct effect_parameter_xg_t effect_parameter_xg[] = { - 0, 0, "NO EFFECT", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0x05, 0, "DELAY L,C,R", 0x1A, 0x0D, 0x27, 0x27, 0, 0, 0, 0, 0, 0, - 0x05, 0x03, 0x08, 0x08, 74, 100, 10, 0, 0, 32, 0, 0, 28, 64, 46, 64, 9, - 0x06, 0, "DELAY L,R", 0x13, 0x1D, 0x1D, 0x1D, 0, 0, 0, 0, 0, 0, - 0x44, 0x26, 0x28, 0x26, 87, 10, 0, 0, 0, 32, 0, 0, 28, 64, 46, 64, 9, - 0x07, 0, "ECHO", 0x0D, 0, 0x0D, 0, 0, 0x0D, 0x0D, 0, 0, 0, - 0x24, 80, 0x74, 80, 10, 0x24, 0x74, 0, 0, 40, 0, 0, 28, 64, 46, 64, 9, - 0x08, 0, "CROSS DELAY", 0x0D, 0x0D, 0, 0, 0, 0, 0, 0, 0, 0, - 0x24, 0x56, 111, 1, 10, 0, 0, 0, 0, 32, 0, 0, 28, 64, 46, 64, 9, - 0x41, 0, "CHORUS 1", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 6, 54, 77, 106, 0, 28, 64, 46, 64, 64, 46, 64, 10, 0, 0, 0, 9, - 0x41, 0x01, "CHORUS 2", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 63, 64, 30, 0, 28, 62, 42, 58, 64, 46, 64, 10, 0, 0, 0, 9, - 0x41, 0x02, "CHORUS 3", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 4, 44, 64, 110, 0, 28, 64, 46, 66, 64, 46, 64, 10, 0, 0, 0, 9, - 0x41, 0x03, "GM CHORUS 1", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 10, 64, 109, 0, 28, 64, 46, 64, 64, 46, 64, 10, 0, 0, 0, 9, - 0x41, 0x04, "GM CHORUS 2", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 28, 34, 67, 105, 0, 28, 64, 46, 64, 64, 46, 64, 10, 0, 0, 0, 9, - 0x41, 0x05, "GM CHORUS 3", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 34, 69, 105, 0, 28, 64, 46, 64, 64, 46, 64, 10, 0, 0, 0, 9, - 0x41, 0x06, "GM CHORUS 4", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 26, 29, 75, 102, 0, 28, 64, 46, 64, 64, 46, 64, 10, 0, 0, 0, 9, - 0x41, 0x07, "FB CHORUS", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 6, 43, 107, 111, 0, 28, 64, 46, 64, 64, 46, 64, 10, 0, 0, 0, 9, - 0x41, 0x08, "CHORUS 4", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 32, 69, 104, 0, 28, 64, 46, 64, 64, 46, 64, 10, 0, 1, 0, 9, - 0x42, 0, "CELESTE 1", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 12, 32, 64, 0, 0, 28, 64, 46, 64, 127, 40, 68, 10, 0, 0, 0, 9, - 0x42, 0x01, "CELESTE 2", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 28, 18, 90, 2, 0, 28, 62, 42, 60, 84, 40, 68, 10, 0, 0, 0, 9, - 0x42, 0x02, "CELESTE 3", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 4, 63, 44, 2, 0, 28, 64, 46, 68, 127, 40, 68, 10, 0, 0, 0, 9, - 0x42, 0x08, "CELESTE 4", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 29, 64, 0, 0, 28, 64, 51, 66, 127, 40, 68, 10, 0, 1, 0, 9, - 0x43, 0, "FLANGER 1", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 14, 14, 104, 2, 0, 28, 64, 46, 64, 96, 40, 64, 10, 4, 0, 0, 9, - 0x43, 0x01, "FLANGER 2", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 32, 17, 26, 2, 0, 28, 64, 46, 60, 96, 40, 64, 10, 4, 0, 0, 9, - 0x43, 0x07, "GM FLANGER", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 21, 120, 1, 0, 28, 64, 46, 64, 96, 40, 64, 10, 4, 0, 0, 9, - 0x43, 0x08, "FLANGER 3", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 4, 109, 109, 2, 0, 28, 64, 46, 64, 127, 40, 64, 10, 4, 0, 0, 9, - 0x44, 0, "SYMPHONIC", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 12, 25, 16, 0, 0, 28, 64, 46, 64, 127, 46, 64, 10, 0, 0, 0, 9, - 0x49, 0, "DISTORTION", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 40, 20, 72, 53, 48, 0, 43, 74, 10, 127, 120, 0, 0, 0, 0, 0, 0, - 0x49, 0x08, "STEREO DISTORTION", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 18, 27, 71, 48, 84, 0, 32, 66, 10, 127, 105, 0, 0, 0, 0, 0, 0, - 0x4A, 0, "OVERDRIVE", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 29, 24, 68, 45, 55, 0, 41, 72, 10, 127, 104, 0, 0, 0, 0, 0, 0, - 0x4A, 0x08, "STEREO OVERDRIVE", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 10, 24, 69, 46, 105, 0, 41, 66, 10, 127, 104, 0, 0, 0, 0, 0, 0, - 0x4B, 0, "AMP SIMULATOR", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 39, 1, 48, 55, 0, 0, 0, 0, 0, 127, 112, 0, 0, 0, 0, 0, 0, - 0x4B, 0x08, "STEREO AMP SIMULATOR", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 16, 2, 46, 119, 0, 0, 0, 0, 0, 127, 106, 0, 0, 0, 0, 0, 0, - 0x4C, 0, "3-BAND EQ", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 70, 34, 60, 10, 70, 28, 46, 0, 0, 127, 0, 0, 0, 0, 0, 0, -1, - 0x4D, 0, "2-BAND EQ", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 28, 70, 46, 70, 0, 0, 0, 0, 0, 127, 0, 0, 0, 0, 0, 0, -1, - 0x4E, 0, "AUTO WAH", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 70, 56, 39, 25, 0, 28, 66, 46, 64, 127, 0, 0, 0, 0, 0, 0, 2, - 0x4E, 0x01, "AUTO WAH+DISTORTION", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 40, 73, 26, 29, 0, 28, 66, 46, 64, 127, 30, 72, 74, 53, 48, 0, 2, - 0x4E, 0x02, "AUTO WAH+OVERDRIVE", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 64, 32, 23, 0, 28, 66, 46, 64, 127, 29, 68, 72, 45, 55, 0, 2, - 0x5E, 0, "LO-FI", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 60, 6, 54, 5, 10, 1, 1, 0, 127, 0, 0, 0, 0, 1, 0, 9, - -1, -1, "EOF", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +{ 0, 0, "NO EFFECT", + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,}, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,}, 0, }, + +{ 0x05, 0, "DELAY L,C,R", { 0x1A, 0x0D, 0x27, 0x27, 0, 0, 0, 0, 0, 0,},{ + 0x05, 0x03, 0x08, 0x08, 74, 100, 10, 0, 0, 32, 0, 0, 28, 64, 46, 64,}, 9,}, + +{ 0x06, 0, "DELAY L,R", { 0x13, 0x1D, 0x1D, 0x1D, 0, 0, 0, 0, 0, 0,},{ + 0x44, 0x26, 0x28, 0x26, 87, 10, 0, 0, 0, 32, 0, 0, 28, 64, 46, 64, },9,}, + +{ 0x07, 0, "ECHO", { 0x0D, 0, 0x0D, 0, 0, 0x0D, 0x0D, 0, 0, 0,},{ + 0x24, 80, 0x74, 80, 10, 0x24, 0x74, 0, 0, 40, 0, 0, 28, 64, 46, 64,}, 9,}, + +{ 0x08, 0, "CROSS DELAY", { 0x0D, 0x0D, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 0x24, 0x56, 111, 1, 10, 0, 0, 0, 0, 32, 0, 0, 28, 64, 46, 64,}, 9,}, + +{ 0x41, 0, "CHORUS 1", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 6, 54, 77, 106, 0, 28, 64, 46, 64, 64, 46, 64, 10, 0, 0, 0,}, 9,}, + +{ 0x41, 0x01, "CHORUS 2",{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 8, 63, 64, 30, 0, 28, 62, 42, 58, 64, 46, 64, 10, 0, 0, 0,}, 9,}, + +{ 0x41, 0x02, "CHORUS 3",{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 4, 44, 64, 110, 0, 28, 64, 46, 66, 64, 46, 64, 10, 0, 0, 0,}, 9,}, + +{ 0x41, 0x03, "GM CHORUS 1",{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 9, 10, 64, 109, 0, 28, 64, 46, 64, 64, 46, 64, 10, 0, 0, 0,}, 9,}, + +{ 0x41, 0x04, "GM CHORUS 2", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 28, 34, 67, 105, 0, 28, 64, 46, 64, 64, 46, 64, 10, 0, 0, 0,}, 9,}, + +{ 0x41, 0x05, "GM CHORUS 3", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 9, 34, 69, 105, 0, 28, 64, 46, 64, 64, 46, 64, 10, 0, 0, 0,}, 9,}, + +{ 0x41, 0x06, "GM CHORUS 4", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 26, 29, 75, 102, 0, 28, 64, 46, 64, 64, 46, 64, 10, 0, 0, 0,}, 9,}, + +{ 0x41, 0x07, "FB CHORUS", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 6, 43, 107, 111, 0, 28, 64, 46, 64, 64, 46, 64, 10, 0, 0, 0,}, 9,}, + +{ 0x41, 0x08, "CHORUS 4", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 9, 32, 69, 104, 0, 28, 64, 46, 64, 64, 46, 64, 10, 0, 1, 0,}, 9,}, + +{ 0x42, 0, "CELESTE 1", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 12, 32, 64, 0, 0, 28, 64, 46, 64, 127, 40, 68, 10, 0, 0, 0,}, 9,}, + +{ 0x42, 0x01, "CELESTE 2", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 28, 18, 90, 2, 0, 28, 62, 42, 60, 84, 40, 68, 10, 0, 0, 0,}, 9,}, + +{ 0x42, 0x02, "CELESTE 3", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 4, 63, 44, 2, 0, 28, 64, 46, 68, 127, 40, 68, 10, 0, 0,0,}, 9,}, + +{ 0x42, 0x08, "CELESTE 4", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 8, 29, 64, 0, 0, 28, 64, 51, 66, 127, 40, 68, 10, 0, 1, 0,}, 9,}, + +{ 0x43, 0, "FLANGER 1", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 14, 14, 104, 2, 0, 28, 64, 46, 64, 96, 40, 64, 10, 4, 0, 0,}, 9, }, + +{ 0x43, 0x01, "FLANGER 2", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 32, 17, 26, 2, 0, 28, 64, 46, 60, 96, 40, 64, 10, 4, 0, 0,}, 9, }, + +{ 0x43, 0x07, "GM FLANGER", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 3, 21, 120, 1, 0, 28, 64, 46, 64, 96, 40, 64, 10, 4, 0, 0,}, 9, }, + +{ 0x43, 0x08, "FLANGER 3", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 4, 109, 109, 2, 0, 28, 64, 46, 64, 127, 40, 64, 10, 4, 0, 0,}, 9, }, + +{ 0x44, 0, "SYMPHONIC", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 12, 25, 16, 0, 0, 28, 64, 46, 64, 127, 46, 64, 10, 0, 0, 0,}, 9,}, + +{ 0x49, 0, "DISTORTION", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 40, 20, 72, 53, 48, 0, 43, 74, 10, 127, 120, 0, 0, 0, 0,0,}, 0,}, + +{ 0x49, 0x08, "STEREO DISTORTION", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 18, 27, 71, 48, 84, 0, 32, 66, 10, 127, 105, 0, 0, 0, 0, 0,}, 0,}, + +{ 0x4A, 0, "OVERDRIVE", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 29, 24, 68, 45, 55, 0, 41, 72, 10, 127, 104, 0, 0, 0, 0, 0,}, 0,}, + +{ 0x4A, 0x08, "STEREO OVERDRIVE", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 10, 24, 69, 46, 105, 0, 41, 66, 10, 127, 104, 0, 0, 0, 0, 0,}, 0,}, + +{ 0x4B, 0, "AMP SIMULATOR", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 39, 1, 48, 55, 0, 0, 0, 0, 0, 127, 112, 0, 0, 0, 0, 0,}, 0,}, + +{ 0x4B, 0x08, "STEREO AMP SIMULATOR", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 16, 2, 46, 119, 0, 0, 0, 0, 0, 127, 106, 0, 0, 0, 0, 0,}, 0,}, + +{ 0x4C, 0, "3-BAND EQ", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 70, 34, 60, 10, 70, 28, 46, 0, 0, 127, 0, 0, 0, 0, 0, 0,}, -1,}, + +{ 0x4D, 0, "2-BAND EQ", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 28, 70, 46, 70, 0, 0, 0, 0, 0, 127, 0, 0, 0, 0, 0, 0,}, -1,}, + +{ 0x4E, 0, "AUTO WAH", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 70, 56, 39, 25, 0, 28, 66, 46, 64, 127, 0, 0, 0, 0, 0, 0,}, 2, }, + +{ 0x4E, 0x01, "AUTO WAH+DISTORTION", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 40, 73, 26, 29, 0, 28, 66, 46, 64, 127, 30, 72, 74, 53, 48, 0,}, 2, }, + +{ 0x4E, 0x02, "AUTO WAH+OVERDRIVE", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 48, 64, 32, 23, 0, 28, 66, 46, 64, 127, 29, 68, 72, 45, 55, 0,}, 2, }, + +{ 0x5E, 0, "LO-FI",{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 2, 60, 6, 54, 5, 10, 1, 1, 0, 127, 0, 0, 0, 0, 1, 0,}, 9, }, + +{ -1, -1, "EOF",{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,}, 0,}, }; struct effect_parameter_gs_t effect_parameter_gs[] = { - 0, 0, "None", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0x01, 0x00, "Stereo-EQ", 1, 0x45, 1, 0x34, 0x48, 0, 0x48, 0x38, 0, 0x48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 19, -1, - 0x01, 0x10, "Overdrive", 48, 1, 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0x40, 0x40, 0x40, 96, 0, 18, - 0x01, 0x11, "Distrotion", 76, 3, 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0x40, 0x38, 0x40, 84, 0, 18, - 0x11, 0x03, "OD1/OD2", 0, 48, 1, 1, 0, 1, 76, 3, 1, 0, - 0, 0, 0, 0, 0, 0x40, 96, 0x40, 84, 127, 1, 6, - 0x01, 0x40, "Hexa Chorus", 0x18, 0x08, 127, 5, 66, 16, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0x40, 0x40, 64, 112, 1, 15, - 0x01, 0x72, "Lo-Fi 1", 2, 6, 2, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 127, 0x40, 0x40, 64, 127, 15, 18, - 0x01, 0x73, "Lo-Fi 2", 2, 1, 0x20, 0, 64, 1, 127, 0, 0, 127, - 0, 0, 127, 0, 1, 127, 0x40, 0x40, 64, 127, 3, 15, - -1, -1, "EOF", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +{ 0, 0, "None", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,}, 0, 0,}, +{ 0x01, 0x00, "Stereo-EQ", { 1, 0x45, 1, 0x34, 0x48, 0, 0x48, 0x38, 0, 0x48, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 127,}, 19, -1,}, +{ 0x01, 0x10, "Overdrive",{ 48, 1, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0x40, 0x40, 0x40, 96,}, 0, 18,}, +{ 0x01, 0x11, "Distrotion",{ 76, 3, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0x40, 0x38, 0x40, 84,}, 0, 18, }, +{ 0x11, 0x03, "OD1/OD2",{ 0, 48, 1, 1, 0, 1, 76, 3, 1, 0, + 0, 0, 0, 0, 0, 0x40, 96, 0x40, 84, 127,}, 1, 6, }, +{ 0x01, 0x40, "Hexa Chorus",{ 0x18, 0x08, 127, 5, 66, 16, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0x40, 0x40, 64, 112,}, 1, 15, }, +{ 0x01, 0x72, "Lo-Fi 1",{ 2, 6, 2, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 127, 0x40, 0x40, 64, 127,}, 15, 18, }, +{ 0x01, 0x73, "Lo-Fi 2",{ 2, 1, 0x20, 0, 64, 1, 127, 0, 0, 127, + 0, 0, 127, 0, 1, 127, 0x40, 0x40, 64, 127,}, 3, 15, }, +{ -1, -1, "EOF",{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,}, 0, 0,}, }; --- timidity-2.13.2.orig/timidity/aq.c +++ timidity-2.13.2/timidity/aq.c @@ -87,7 +87,7 @@ static int32 estimate_queue_size(void); /* effect.c */ extern void init_effect(void); -extern int do_effect(int32* buf, int32 count); +extern void do_effect(int32* buf, int32 count); int aq_calc_fragsize(void) { --- timidity-2.13.2.orig/timidity/esd_a.c +++ timidity-2.13.2/timidity/esd_a.c @@ -78,7 +78,7 @@ PlayMode dpm = { static int try_open(void) { - int fd, tmp, i; + //int fd, tmp, i; int include_enc, exclude_enc; esd_format_t esdformat; --- timidity-2.13.2.orig/timidity/effect.c +++ timidity-2.13.2/timidity/effect.c @@ -35,8 +35,10 @@ #include #endif +#include + #include "mt19937ar.h" -#define RAND_MAX 0xffffffff +//#define RAND_MAX 0xffffffff #include "timidity.h" #include "instrum.h" --- timidity-2.13.2.orig/timidity/wrd.h +++ timidity-2.13.2/timidity/wrd.h @@ -148,6 +148,7 @@ static inline void print_ecmd(char*, int #endif #include #include "mblock.h" +#include "common.h" #include "controls.h" static inline void print_ecmd(char *cmd, int *args, int narg) { --- timidity-2.13.2.orig/timidity/playmidi.c +++ timidity-2.13.2/timidity/playmidi.c @@ -298,7 +298,7 @@ static int16 get_midi_controller_amp_dep /* Rx. ~ (Rcv ~) */ static void init_rx(int); static void set_rx(int, int32, int); -static int32 get_rx(int, int32); +//static int32 get_rx(int, int32); static void init_rx_drum(struct DrumParts *); static void set_rx_drum(struct DrumParts *, int32, int); static int32 get_rx_drum(struct DrumParts *, int32); @@ -4159,7 +4159,7 @@ static void process_sysex_event(int ev, break; case 0x20: /* Delay Send Level to Reverb */ ctl->cmsg(CMSG_INFO,VERB_NOISY,"Delay Send Level to Reverb (%d)",val); - if (delay_status_gs.send_reverb = val) { + if (delay_status_gs.send_reverb != val) { delay_status_gs.send_reverb = val; recompute_delay_status_gs(); init_ch_delay(); @@ -6691,7 +6691,7 @@ static void do_compute_data_midi(int32 c for (i = 0; i < uv; i++) { if (voice[i].status != VOICE_FREE) { - int32 *vpb; + int32 *vpb = 0; int8 flag; if (channel_effect) { @@ -7980,7 +7980,7 @@ int play_event(MidiEvent *ev) channel[ch].temper_type = current_event->a; ctl_mode_event(CTLE_TEMPER_TYPE, 1, ch, channel[ch].temper_type); if (temper_type_mute) { - if (temper_type_mute & 1 << current_event->a + if ((temper_type_mute & 1 << current_event->a) - ((current_event->a >= 0x40) ? 0x3c : 0)) { SET_CHANNELMASK(channel_mute, ch); ctl_mode_event(CTLE_MUTE, 1, ch, 1); @@ -8003,7 +8003,7 @@ int play_event(MidiEvent *ev) ctl_mode_event(CTLE_TEMPER_TYPE, 1, i, channel[i].temper_type); } if (temper_type_mute) { - if (temper_type_mute & 1 << current_event->a + if ((temper_type_mute & 1 << current_event->a) - ((current_event->a >= 0x40) ? 0x3c : 0)) { FILL_CHANNELMASK(channel_mute); for (i = 0; i < MAX_CHANNELS; i++) --- timidity-2.13.2.orig/timidity/Makefile.am +++ timidity-2.13.2/timidity/Makefile.am @@ -308,7 +308,7 @@ endif version.$(OBJEXT): version.c ../configure $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c $(srcdir)/version.c -resample.c: newton_table.c +$(srcdir)/resample.c: newton_table.c if VCPP newton_table.c: calcnewt$(EXEEXT) --- timidity-2.13.2.orig/timidity/vorbis_a.c +++ timidity-2.13.2/timidity/vorbis_a.c @@ -476,8 +476,8 @@ static int output_data(char *readbuffer, /* write out pages (if any) */ while(ogg_stream_pageout(&os, &og) != 0) { - write(dpm.fd, og.header, og.header_len); - write(dpm.fd, og.body, og.body_len); + ssize_t dummy = write(dpm.fd, og.header, og.header_len); + dummy = write(dpm.fd, og.body, og.body_len); } } } @@ -518,8 +518,8 @@ static void close_output(void) int result = ogg_stream_pageout(&os,&og); if(result == 0) break; - write(dpm.fd, og.header, og.header_len); - write(dpm.fd, og.body, og.body_len); + ssize_t dummy = write(dpm.fd, og.header, og.header_len); + dummy = write(dpm.fd, og.body, og.body_len); /* this could be set above, but for illustrative purposes, I do it here (to show that vorbis does know where the stream ends) */ --- timidity-2.13.2.orig/timidity/readmidi.c +++ timidity-2.13.2/timidity/readmidi.c @@ -970,7 +970,7 @@ int parse_sysex_event_multi(uint8 *val, val[0] == 0x43 && /* Yamaha ID */ val[2] == 0x4C && /* XG Model ID */ ((val[1] < 0x10 && val[5] == 0x08 && /* Bulk Dump */ - val[4] == 0x29 || val[4] == 0x3F) || /* Blocks 1 or 2 */ + (val[4] == 0x29 || val[4] == 0x3F)) || /* Blocks 1 or 2 */ (val[1] >= 0x10 && val[3] == 0x08))) /* Parameter Change */ { uint8 addhigh, addmid, addlow; /* Addresses */ @@ -5359,8 +5359,9 @@ int midi_file_save_as(char *in_name, cha return -1; } - while((n = tf_read(buff, 1, sizeof(buff), tf)) > 0) - fwrite(buff, 1, n, ofp); + while((n = tf_read(buff, 1, sizeof(buff), tf)) > 0) { + size_t dummy = fwrite(buff, 1, n, ofp); ++dummy; + } ctl->cmsg(CMSG_INFO, VERB_NORMAL, "Save as %s...Done", out_name); fclose(ofp); --- timidity-2.13.2.orig/timidity/Makefile.in +++ timidity-2.13.2/timidity/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -41,7 +41,6 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -55,7 +54,86 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/common.makefile.in +bin_PROGRAMS = timidity$(EXEEXT) +noinst_PROGRAMS = calcnewt$(EXEEXT) +subdir = timidity +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) +am_calcnewt_OBJECTS = calcnewt.$(OBJEXT) +calcnewt_OBJECTS = $(am_calcnewt_OBJECTS) +calcnewt_LDADD = $(LDADD) +am_timidity_OBJECTS = aiff_a.$(OBJEXT) aq.$(OBJEXT) au_a.$(OBJEXT) \ + audio_cnv.$(OBJEXT) common.$(OBJEXT) controls.$(OBJEXT) \ + effect.$(OBJEXT) filter.$(OBJEXT) freq.$(OBJEXT) \ + instrum.$(OBJEXT) list_a.$(OBJEXT) loadtab.$(OBJEXT) \ + m2m.$(OBJEXT) mfi.$(OBJEXT) miditrace.$(OBJEXT) mix.$(OBJEXT) \ + mod.$(OBJEXT) mod2midi.$(OBJEXT) modmid_a.$(OBJEXT) \ + mt19937ar.$(OBJEXT) optcode.$(OBJEXT) output.$(OBJEXT) \ + playmidi.$(OBJEXT) quantity.$(OBJEXT) raw_a.$(OBJEXT) \ + rcp.$(OBJEXT) readmidi.$(OBJEXT) recache.$(OBJEXT) \ + resample.$(OBJEXT) reverb.$(OBJEXT) sbkconv.$(OBJEXT) \ + sffile.$(OBJEXT) sfitem.$(OBJEXT) smfconv.$(OBJEXT) \ + smplfile.$(OBJEXT) sndfont.$(OBJEXT) tables.$(OBJEXT) \ + timidity.$(OBJEXT) version.$(OBJEXT) wave_a.$(OBJEXT) \ + wrd_read.$(OBJEXT) wrdt.$(OBJEXT) +timidity_OBJECTS = $(am_timidity_OBJECTS) +@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/interface/w32g_res.res +@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/interface/w32g_res.res +@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@am__DEPENDENCIES_1 = w32g_res.res +@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@am__DEPENDENCIES_1 = w32g_res.res +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = $(SYSEXTRAS:.c=.$(OBJEXT)) \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(am__DEPENDENCIES_1) +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ interface.lib \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ arc.lib unimod.lib \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ utils.lib +@BORLANDC_TRUE@@VCPP_FALSE@timidity_DEPENDENCIES = interface.lib \ +@BORLANDC_TRUE@@VCPP_FALSE@ arc.lib unimod.lib utils.lib +@VCPP_TRUE@timidity_DEPENDENCIES = $(SYSEXTRAS:.c=.$(OBJEXT)) \ +@VCPP_TRUE@ $(top_builddir)/interface/interface.lib \ +@VCPP_TRUE@ $(top_builddir)/libarc/arc.lib \ +@VCPP_TRUE@ $(top_builddir)/libunimod/unimod.lib \ +@VCPP_TRUE@ $(top_builddir)/utils/utils.lib \ +@VCPP_TRUE@ $(am__DEPENDENCIES_1) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(calcnewt_SOURCES) $(timidity_SOURCES) \ + $(EXTRA_timidity_SOURCES) +DIST_SOURCES = $(calcnewt_SOURCES) $(timidity_SOURCES) \ + $(EXTRA_timidity_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ #CC= @CC@ @@ -114,6 +192,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -204,7 +283,6 @@ P_so_libs = @P_so_libs@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHCFLAGS = @SHCFLAGS@ - SHELL = @SHELL@ SHLD = @SHLD@ STRIP = @STRIP@ @@ -238,6 +316,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -265,6 +345,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -312,7 +393,6 @@ DEF_PKGDATADIR = -DPKGDATADIR=\"$(PKGDAT DEF_PKGLIBDIR = -DPKGLIBDIR=\"$(PKGLIBDIR)\" DEF_SHLIB_DIR = -DSHLIB_DIR=\"$(SHLIB_DIR)\" BITMAP_DIR = $(TCL_DIR)/bitmaps - INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/libarc \ @@ -321,11 +401,6 @@ INCLUDES = \ -I$(top_srcdir)/utils \ $(EXTRAINCS) - -bin_PROGRAMS = timidity - -noinst_PROGRAMS = calcnewt - timidity_SOURCES = \ aenc.h \ aiff_a.c \ @@ -402,7 +477,6 @@ timidity_SOURCES = \ wrd_read.c \ wrdt.c - EXTRA_timidity_SOURCES = \ alsa_a.c \ ao_a.c \ @@ -458,22 +532,12 @@ EXTRA_timidity_SOURCES = \ w32_libOggFLAC_dll_g.h \ w32_libOggFLAC_dll_i.h - calcnewt_SOURCES = calcnewt.c - -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@W32GUI_RES = w32g_res.res @BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@W32GUI_RES = $(top_builddir)/interface/w32g_res.res - @BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@W32GUI_RES = $(top_builddir)/interface/w32g_res.res @BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@W32GUI_RES = w32g_res.res - +@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@W32GUI_RES = w32g_res.res @BORLANDC_FALSE@CLEANFILES = newton_table.c -@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_LDADD = \ -@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ interface.lib \ -@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ arc.lib \ -@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ unimod.lib \ -@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ utils.lib - @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_LDADD = \ @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ @@ -482,6 +546,17 @@ calcnewt_SOURCES = calcnewt.c @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \ @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(W32GUI_RES) +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_LDADD = \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ interface.lib \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ arc.lib \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ unimod.lib \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ utils.lib + +@BORLANDC_TRUE@@VCPP_FALSE@timidity_LDADD = \ +@BORLANDC_TRUE@@VCPP_FALSE@ interface.lib \ +@BORLANDC_TRUE@@VCPP_FALSE@ arc.lib \ +@BORLANDC_TRUE@@VCPP_FALSE@ unimod.lib \ +@BORLANDC_TRUE@@VCPP_FALSE@ utils.lib @VCPP_TRUE@timidity_LDADD = \ @VCPP_TRUE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ @@ -491,12 +566,12 @@ calcnewt_SOURCES = calcnewt.c @VCPP_TRUE@ $(top_builddir)/utils/utils.lib \ @VCPP_TRUE@ $(W32GUI_RES) - -@BORLANDC_TRUE@@VCPP_FALSE@timidity_LDADD = \ -@BORLANDC_TRUE@@VCPP_FALSE@ interface.lib \ -@BORLANDC_TRUE@@VCPP_FALSE@ arc.lib \ -@BORLANDC_TRUE@@VCPP_FALSE@ unimod.lib \ -@BORLANDC_TRUE@@VCPP_FALSE@ utils.lib +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \ +@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(W32GUI_RES) @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \ @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ $(top_builddir)/interface/interface.lib \ @@ -505,14 +580,12 @@ calcnewt_SOURCES = calcnewt.c @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ $(top_builddir)/utils/utils.lib \ @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ $(W32GUI_RES) - -@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ -@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ -@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ -@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \ -@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(W32GUI_RES) - +@BORLANDC_TRUE@@VCPP_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \ +@BORLANDC_TRUE@@VCPP_FALSE@ $(top_builddir)/interface/interface.lib \ +@BORLANDC_TRUE@@VCPP_FALSE@ $(top_builddir)/libarc/arc.lib \ +@BORLANDC_TRUE@@VCPP_FALSE@ $(top_builddir)/libunimod/unimod.lib \ +@BORLANDC_TRUE@@VCPP_FALSE@ $(top_builddir)/utils/utils.lib \ +@BORLANDC_TRUE@@VCPP_FALSE@ $(W32GUI_RES) @VCPP_TRUE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \ @VCPP_TRUE@ $(top_builddir)/interface/interface.lib \ @@ -521,13 +594,6 @@ calcnewt_SOURCES = calcnewt.c @VCPP_TRUE@ $(top_builddir)/utils/utils.lib \ @VCPP_TRUE@ $(W32GUI_RES) -@BORLANDC_TRUE@@VCPP_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_TRUE@@VCPP_FALSE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_TRUE@@VCPP_FALSE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_TRUE@@VCPP_FALSE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_TRUE@@VCPP_FALSE@ $(top_builddir)/utils/utils.lib \ -@BORLANDC_TRUE@@VCPP_FALSE@ $(W32GUI_RES) - @BORLANDC_TRUE@@VCPP_FALSE@BORLANDC_LINK_OPTIONS = \ @BORLANDC_TRUE@@VCPP_FALSE@ -L..\\interface \ @BORLANDC_TRUE@@VCPP_FALSE@ -L..\\libarc \ @@ -540,315 +606,53 @@ calcnewt_SOURCES = calcnewt.c @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ LibPath ..\\libunimod \ @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ LibPath ..\\utils - @VCPP_TRUE@VC_LINK = link.exe @VCPP_TRUE@VCC_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) - @BORLANDC_TRUE@@VCPP_FALSE@BORLANDC_LINK = ilink32.exe -C -Gn - @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@WATCOM_LINK = wlink.exe -subdir = timidity -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h -CONFIG_CLEAN_FILES = -bin_PROGRAMS = timidity$(EXEEXT) -noinst_PROGRAMS = calcnewt$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) - -am_calcnewt_OBJECTS = calcnewt.$(OBJEXT) -calcnewt_OBJECTS = $(am_calcnewt_OBJECTS) -calcnewt_LDADD = $(LDADD) -calcnewt_DEPENDENCIES = -calcnewt_LDFLAGS = -am_timidity_OBJECTS = aiff_a.$(OBJEXT) aq.$(OBJEXT) au_a.$(OBJEXT) \ - audio_cnv.$(OBJEXT) common.$(OBJEXT) controls.$(OBJEXT) \ - effect.$(OBJEXT) filter.$(OBJEXT) freq.$(OBJEXT) \ - instrum.$(OBJEXT) list_a.$(OBJEXT) loadtab.$(OBJEXT) \ - m2m.$(OBJEXT) mfi.$(OBJEXT) miditrace.$(OBJEXT) mix.$(OBJEXT) \ - mod.$(OBJEXT) mod2midi.$(OBJEXT) modmid_a.$(OBJEXT) \ - mt19937ar.$(OBJEXT) optcode.$(OBJEXT) output.$(OBJEXT) \ - playmidi.$(OBJEXT) quantity.$(OBJEXT) raw_a.$(OBJEXT) \ - rcp.$(OBJEXT) readmidi.$(OBJEXT) recache.$(OBJEXT) \ - resample.$(OBJEXT) reverb.$(OBJEXT) sbkconv.$(OBJEXT) \ - sffile.$(OBJEXT) sfitem.$(OBJEXT) smfconv.$(OBJEXT) \ - smplfile.$(OBJEXT) sndfont.$(OBJEXT) tables.$(OBJEXT) \ - timidity.$(OBJEXT) version.$(OBJEXT) wave_a.$(OBJEXT) \ - wrd_read.$(OBJEXT) wrdt.$(OBJEXT) -timidity_OBJECTS = $(am_timidity_OBJECTS) -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ interface.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ arc.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ unimod.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ utils.lib -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/utils/utils.lib -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/utils/utils.lib -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ interface.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ arc.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ unimod.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ utils.lib -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/w32g_res.res -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/utils/utils.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/interface/w32g_res.res -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/utils/utils.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/interface/w32g_res.res -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ interface.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ arc.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ unimod.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ utils.lib -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/w32g_res.res -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/utils/utils.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/interface/w32g_res.res -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/utils/utils.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/interface/w32g_res.res -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ interface.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ arc.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ unimod.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ utils.lib -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/w32g_res.res -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/utils/utils.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/interface/w32g_res.res -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/utils/utils.lib \ -@BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/interface/w32g_res.res -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ utils.lib -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ utils.lib -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/utils/utils.lib -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/utils/utils.lib -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ utils.lib -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ utils.lib -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/utils/utils.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ w32g_res.res -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/utils/utils.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ w32g_res.res -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ utils.lib -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ utils.lib -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/utils/utils.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@ w32g_res.res -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/utils/utils.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@VCPP_TRUE@@WATCOM_C_FALSE@ w32g_res.res -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_TRUE@ utils.lib -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_FALSE@@WATCOM_C_FALSE@ utils.lib -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ $(top_builddir)/utils/utils.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_TRUE@ w32g_res.res -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/interface/interface.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/arc.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/unimod.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ $(top_builddir)/utils/utils.lib \ -@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@VCPP_TRUE@@WATCOM_C_FALSE@ w32g_res.res - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/aRts_a.Po ./$(DEPDIR)/aiff_a.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/alsa_a.Po ./$(DEPDIR)/ao_a.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/aq.Po ./$(DEPDIR)/au_a.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/audio_cnv.Po ./$(DEPDIR)/audriv_a.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/audriv_al.Po ./$(DEPDIR)/audriv_mme.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/audriv_none.Po ./$(DEPDIR)/bsd20_a.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/calcnewt.Po ./$(DEPDIR)/common.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/controls.Po ./$(DEPDIR)/darwin_a.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/dl_dld.Po ./$(DEPDIR)/dl_dlopen.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/dl_dyld.Po ./$(DEPDIR)/dl_hpux.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/dl_w32.Po ./$(DEPDIR)/effect.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/esd_a.Po ./$(DEPDIR)/filter.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/flac_a.Po ./$(DEPDIR)/freq.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gogo_a.Po ./$(DEPDIR)/hpux_a.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/hpux_d_a.Po ./$(DEPDIR)/instrum.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/jack_a.Po ./$(DEPDIR)/list_a.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/loadtab.Po ./$(DEPDIR)/m2m.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mac_a.Po ./$(DEPDIR)/mac_dlog.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mac_main.Po ./$(DEPDIR)/mac_qt_a.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mac_soundspec.Po ./$(DEPDIR)/mfi.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mfnode.Po ./$(DEPDIR)/miditrace.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mix.Po ./$(DEPDIR)/mod.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mod2midi.Po ./$(DEPDIR)/modmid_a.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mt19937ar.Po ./$(DEPDIR)/nas_a.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/optcode.Po ./$(DEPDIR)/oss_a.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/output.Po ./$(DEPDIR)/playmidi.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/portaudio_a.Po ./$(DEPDIR)/quantity.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/raw_a.Po ./$(DEPDIR)/rcp.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/readmidi.Po ./$(DEPDIR)/recache.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/resample.Po ./$(DEPDIR)/reverb.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/sbkconv.Po ./$(DEPDIR)/sffile.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/sfitem.Po ./$(DEPDIR)/smfconv.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/smplfile.Po ./$(DEPDIR)/sndfont.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/speex_a.Po ./$(DEPDIR)/sun_a.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/tables.Po ./$(DEPDIR)/timidity.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/version.Po ./$(DEPDIR)/vorbis_a.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/w32_a.Po ./$(DEPDIR)/w32_gogo.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/w32_libFLAC_dll.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/w32_libOggFLAC_dll.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/w32_portaudio_dll.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/w32g_ogg_dll.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/w32g_vorbis_dll.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/w32g_vorbisenc_dll.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/wave_a.Po ./$(DEPDIR)/wrd_read.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/wrdt.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(calcnewt_SOURCES) $(timidity_SOURCES) \ - $(EXTRA_timidity_SOURCES) -DIST_COMMON = $(top_srcdir)/common.makefile.in Makefile.am Makefile.in -SOURCES = $(calcnewt_SOURCES) $(timidity_SOURCES) $(EXTRA_timidity_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/common.makefile.in $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common.makefile.in $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu timidity/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu timidity/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -856,8 +660,8 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ done clean-binPROGRAMS: @@ -873,7 +677,7 @@ clean-noinstPROGRAMS: @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(LINK) $(timidity_LDFLAGS) $(timidity_OBJECTS) $(timidity_LDADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -962,40 +766,21 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrd_read.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrdt.Po@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .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 +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; 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)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .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 +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; 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` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -1004,6 +789,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -1015,10 +801,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -1041,13 +828,9 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/.. + $(mkdir_p) $(distdir)/.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -1059,7 +842,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -1077,9 +860,10 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -1091,7 +875,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -1100,7 +884,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -1111,14 +895,17 @@ clean-am: clean-binPROGRAMS clean-generi mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -1134,7 +921,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -1153,14 +941,14 @@ uninstall-am: uninstall-binPROGRAMS unin .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-depend distclean-generic \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-binPROGRAMS install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ - ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ + distclean-compile distclean-generic distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-info-am @@ -1192,7 +980,7 @@ uninstall-am: uninstall-binPROGRAMS unin version.$(OBJEXT): version.c ../configure $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c $(srcdir)/version.c -resample.c: newton_table.c +$(srcdir)/resample.c: newton_table.c @VCPP_TRUE@newton_table.c: calcnewt$(EXEEXT) @VCPP_TRUE@ ./calcnewt $@ --- timidity-2.13.2.orig/timidity/instrum.c +++ timidity-2.13.2/timidity/instrum.c @@ -1043,11 +1043,12 @@ Instrument *load_instrument(int dr, int char infomsg[256]; #ifndef CFG_FOR_SF - if (play_system_mode == GS_SYSTEM_MODE && (b == 64 || b == 65)) + if (play_system_mode == GS_SYSTEM_MODE && (b == 64 || b == 65)) { if (! dr) /* User Instrument */ recompute_userinst(b, prog); else /* User Drumset */ recompute_userdrum(b, prog); + } #endif if (bank->tone[prog].instype == 1 || bank->tone[prog].instype == 2) { if (bank->tone[prog].instype == 1) { /* Font extention */ @@ -1070,7 +1071,7 @@ Instrument *load_instrument(int dr, int } /* panning */ if (ip != NULL && bank->tone[prog].pan != -1) { - pan = ((int) bank->tone[prog].pan & 0x7f) - 64; + pan = ((int) bank->tone[prog].pan & 0x7f); /* - 64 */; for (i = 0; i < ip->samples; i++) { panning = (int) ip->sample[i].panning + pan; panning = (panning < 0) ? 0 --- timidity-2.13.2.orig/timidity/resample.c +++ timidity-2.13.2/timidity/resample.c @@ -255,7 +255,7 @@ static sample_t *newt_old_src = NULL; static resample_t resample_newton(sample_t *src, splen_t ofs, resample_rec_t *rec) { int n_new, n_old; - int32 v1, v2, diff; + int32 v1, v2, diff = 0; sample_t *sptr; double y, xd; int32 left, right, temp_n; --- timidity-2.13.2.orig/timidity/sndfont.c +++ timidity-2.13.2/timidity/sndfont.c @@ -56,6 +56,10 @@ #include "filter.h" #include "resample.h" +// use from freq.c +float freq_fourier(Sample *sp, int *chord); +int assign_pitch_to_freq(float freq); + #define FILENAME_NORMALIZE(fname) url_expand_home_dir(fname) #define FILENAME_REDUCED(fname) url_unexpand_home_dir(fname) #define SFMalloc(rec, count) new_segment(&(rec)->pool, count) --- timidity-2.13.2.orig/timidity/calcnewt.c +++ timidity-2.13.2/timidity/calcnewt.c @@ -53,9 +53,13 @@ int main(int argc, const char *argv[]) fprintf(fp, "(float)%2.32g,\n", newt_coeffs[i][j]); fclose(fp); #else - for (i = 0; i <= n; i++) - for (j = 0; j <= n; j++) - printf("%2.32g,\n", newt_coeffs[i][j]); + for (i = 0; i <= n; i++) { + printf("{\n"); + for (j = 0; j <= n; j++) { + printf("%2.32g,\n", newt_coeffs[i][j]); + } + printf("},\n"); + } #endif return 0; } --- timidity-2.13.2.orig/timidity/output.c +++ timidity-2.13.2/timidity/output.c @@ -606,7 +606,7 @@ char *create_auto_output_name(const char *p = '_'; if(mode==2){ - char *p1,*p2,*p3; + char *p1,*p2; #ifndef __W32__ p = strrchr(output_filename+dir_len,PATH_SEP); #else @@ -617,6 +617,7 @@ char *create_auto_output_name(const char #endif p1 = STRRCHR(output_filename+dir_len,'/'); p2 = STRRCHR(output_filename+dir_len,'\\'); + char *p3; p3 = STRRCHR(output_filename+dir_len,':'); #undef STRRCHR p1>p2 ? (p1>p3 ? (p = p1) : (p = p3)) : (p2>p3 ? (p = p2) : (p = p3)); --- timidity-2.13.2.orig/timidity/recache.c +++ timidity-2.13.2/timidity/recache.c @@ -56,7 +56,7 @@ #define MAX_EXPANDLEN (1024 * 32) #define CACHE_DATA_LEN (allocate_cache_size / sizeof(sample_t)) -#define sp_hash(sp, note) ((unsigned int) (sp) + (unsigned int) (note)) +#define sp_hash(sp, note) ((unsigned long) (sp) + (unsigned int) (note)) #define CACHE_RESAMPLING_OK 0 #define CACHE_RESAMPLING_NOTOK 1 #define SORT_THRESHOLD 20 --- timidity-2.13.2.orig/timidity/timidity.c +++ timidity-2.13.2/timidity/timidity.c @@ -40,31 +40,21 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif /* TIME_WITH_SYS_TIME */ #ifdef HAVE_SYS_STAT_H #include #endif /* NAVE_SYS_STAT_H */ #include /* for open */ -#ifdef HAVE_STDBOOL_H -#include -#endif - -#ifndef __bool_true_false_are_defined -# ifdef bool -# undef bool -# endif -# ifdef ture -# undef ture -# endif -# ifdef false -# undef false -# endif -# define bool int -# define false ((bool)0) -# define true (!false) -# define __bool_true_false_are_defined true -#endif /* C99 _Bool hack */ - #ifdef BORLANDC_EXCEPTION #include #endif /* BORLANDC_EXCEPTION */ @@ -311,9 +301,7 @@ static const struct option longopts[] = { "flac-verify", no_argument, NULL, TIM_OPT_FLAC_VERIFY }, { "flac-padding", required_argument, NULL, TIM_OPT_FLAC_PADDING }, { "flac-complevel", required_argument, NULL, TIM_OPT_FLAC_COMPLEVEL }, -#ifdef AU_OGGFLAC { "oggflac", no_argument, NULL, TIM_OPT_FLAC_OGGFLAC }, -#endif /* AU_OGGFLAC */ #endif /* AU_FLAC */ #ifdef AU_SPEEX { "speex-quality", required_argument, NULL, TIM_OPT_SPEEX_QUALITY }, @@ -449,9 +437,7 @@ static inline int parse_opt_output_swab( static inline int parse_opt_flac_verify(const char *); static inline int parse_opt_flac_padding(const char *); static inline int parse_opt_flac_complevel(const char *); -#ifdef AU_OGGFLAC static inline int parse_opt_flac_oggflac(const char *); -#endif /* AU_OGGFLAC */ #endif /* AU_FLAC */ #ifdef AU_SPEEX static inline int parse_opt_speex_quality(const char *); @@ -2789,10 +2775,8 @@ MAIN_INTERFACE int set_tim_opt_long(int return parse_opt_flac_padding(arg); case TIM_OPT_FLAC_COMPLEVEL: return parse_opt_flac_complevel(arg); -#ifdef AU_OGGFLAC case TIM_OPT_FLAC_OGGFLAC: return parse_opt_flac_oggflac(arg); -#endif /* AU_OGGFLAC */ #endif /* AU_FLAC */ #ifdef AU_SPEEX case TIM_OPT_SPEEX_QUALITY: @@ -3642,10 +3626,8 @@ static inline int parse_opt_h(const char " Write a PADDING block of length n", " --flac-complevel=n (for Ogg FLAC only)", " Set compression level n:[0..8]", -#ifdef AU_OGGFLAC " --oggflac (for Ogg FLAC only)", " Output OggFLAC stream (experimental)", -#endif /* AU_OGGFLAC */ #endif /* AU_FLAC */ #ifdef AU_SPEEX " --speex-quality=n (for Ogg Speex only)", @@ -3751,7 +3733,7 @@ static inline int parse_opt_h(const char if (*(strchr(h, '%') + 1) != '%') fprintf(fp, h, help_args[j++]); else - fprintf(fp, h); + fprintf(fp, "%s", h); } else fputs(h, fp); fputs(NLS, fp); @@ -4381,7 +4363,6 @@ static inline int parse_opt_flac_complev return 0; } -#ifdef AU_OGGFLAC extern void flac_set_option_oggflac(int); static inline int parse_opt_flac_oggflac(const char *arg) @@ -4389,7 +4370,6 @@ static inline int parse_opt_flac_oggflac flac_set_option_oggflac(1); return 0; } -#endif /* AU_OGGFLAC */ #endif /* AU_FLAC */ #ifdef AU_SPEEX @@ -4927,11 +4907,11 @@ static RETSIGTYPE sigterm_exit(int sig) * function. It is possible coredump if the signal is called in printf's. */ - write(2, "Terminated sig=0x", 17); + ssize_t dummy = write(2, "Terminated sig=0x", 17); s[0] = "0123456789abcdef"[(sig >> 4) & 0xf]; s[1] = "0123456789abcdef"[sig & 0xf]; s[2] = '\n'; - write(2, s, 3); + dummy = write(2, s, 3); safe_exit(1); } @@ -5147,6 +5127,29 @@ MAIN_INTERFACE int timidity_post_load_co { int i, cmderr = 0; + /* If we're going to fork for daemon mode, we need to fork now, as + certain output libraries (pulseaudio) become unhappy if initialized + before forking and then being used from the child. */ + if (ctl->id_character == 'A' && (ctl->flags & CTLF_DAEMONIZE)) + { + int pid = fork(); + FILE *pidf; + switch (pid) + { + case 0: // child is the daemon + break; + case -1: // error status return + exit(7); + default: // no error, doing well + if ((pidf = fopen( "/var/run/timidity/timidity.pid", "w" )) != NULL ) + { + fprintf( pidf, "%d\n", pid ); + fclose( pidf ); + } + exit(0); + } + } + if(play_mode == &null_play_mode) { char *output_id; @@ -5466,14 +5469,14 @@ extern int volatile save_playlist_once_b static int CoInitializeOK = 0; #endif -static inline bool directory_p(const char* path) +static inline int directory_p(const char* path) { #if defined ( IA_W32GUI ) || defined ( IA_W32G_SYN ) return is_directory(path); #else struct stat st; if(stat(path, &st) != -1) return S_ISDIR(st.st_mode); - return false; + return 0; #endif } @@ -5649,11 +5652,11 @@ int main(int argc, char **argv) } ctl->cmsg(CMSG_FATAL, VERB_NORMAL, - "%s: Can't read any configuration file.\nPlease check " + "%s: Error reading configuration file.\nPlease check " "%s or %s", program_name, config1, config2); #else ctl->cmsg(CMSG_FATAL, VERB_NORMAL, - "%s: Can't read any configuration file.\nPlease check " + "%s: Error reading configuration file.\nPlease check " CONFIG_FILE, program_name); #endif /* __W32__ */ } --- timidity-2.13.2.orig/timidity/mod2midi.c +++ timidity-2.13.2/timidity/mod2midi.c @@ -195,7 +195,8 @@ period2note (int period, int *finetune) if (period < 14 || period > 13696) { - ctl->cmsg(CMSG_WARNING, VERB_NORMAL, "BAD period %d\n", period); + ctl->cmsg(CMSG_WARNING, VERB_NOISY, "BAD period %d", period); + *finetune = 0; return -1; } @@ -266,11 +267,13 @@ Voice_SetPeriod (UBYTE v, ULONG period) return; new_noteon = period2note (ModV[v].period, &bend); + if (new_noteon >= 0) { #ifndef TRACE_SLIDE_NOTES - bend += (new_noteon - ModV[v].noteon) << 13; - new_noteon = ModV[v].noteon; + bend += (new_noteon - ModV[v].noteon) << 13; + new_noteon = ModV[v].noteon; #endif - bend = WHEEL_VALUE(bend); + bend = WHEEL_VALUE(bend); + } if (ModV[v].noteon != new_noteon) { @@ -278,7 +281,7 @@ Voice_SetPeriod (UBYTE v, ULONG period) if (new_noteon < 0) { - ctl->cmsg(CMSG_WARNING, VERB_VERBOSE, + ctl->cmsg(CMSG_WARNING, VERB_NOISY, "Strange period %d", ModV[v].period); return; @@ -330,13 +333,13 @@ Voice_Play (UBYTE v, SAMPLE * s, ULONG s Voice_Stop (v); new_noteon = period2note (ModV[v].period, &bend); - bend = WHEEL_VALUE(bend); if (new_noteon < 0) { - ctl->cmsg(CMSG_WARNING, VERB_VERBOSE, + ctl->cmsg(CMSG_WARNING, VERB_NOISY, "Strange period %d", ModV[v].period); return; } + bend = WHEEL_VALUE(bend); ModV[v].noteon = new_noteon; ModV[v].time = at; @@ -590,9 +593,13 @@ void load_module_samples (SAMPLE * s, in special_patch[i]->sample = sp = (Sample *)safe_malloc(sizeof(Sample)); memset(sp, 0, sizeof(Sample)); - strncpy(name, s->samplename, 22); - name[22] = '\0'; - code_convert(name, NULL, 23, NULL, "ASCII"); + memset(name, 0, 23 * sizeof(char)); + if (s->samplename != NULL) + { + strncpy(name, s->samplename, 22); + name[22] = '\0'; + code_convert(name, NULL, 23, NULL, "ASCII"); + } if(name[0] == '\0') special_patch[i]->name = NULL; else --- timidity-2.13.2.orig/timidity/wave_a.c +++ timidity-2.13.2/timidity/wave_a.c @@ -283,7 +283,7 @@ static int update_header(void) } lseek(dpm.fd, 40, SEEK_SET); tmp = LE_LONG(bytes_output); - write(dpm.fd, &tmp, 4); + ssize_t dummy = write(dpm.fd, &tmp, 4); ++dummy; lseek(dpm.fd, save_point, SEEK_SET); ctl->cmsg(CMSG_INFO, VERB_DEBUG, --- timidity-2.13.2.orig/timidity/oss_a.c +++ timidity-2.13.2/timidity/oss_a.c @@ -51,6 +51,8 @@ #include #endif /* HAVE_SYS_SOUNDCARD_H */ +#include + #include "timidity.h" #include "common.h" #include "output.h" --- timidity-2.13.2.orig/timidity/wrd_read.c +++ timidity-2.13.2/timidity/wrd_read.c @@ -1765,7 +1765,10 @@ static char *wrd_name_string(int cmd) #ifdef ENABLE_SHERRY /*******************************************************************************/ +#if 0 +/* for mac only */ #pragma mark - +#endif static int sherry_started; /* 0 - before start command 0x01*/ /* 1 - after start command 0x01*/ --- timidity-2.13.2.orig/libarc/Makefile.in +++ timidity-2.13.2/libarc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -41,7 +41,6 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -55,7 +54,56 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/common.makefile.in +subdir = libarc +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) +AR = ar +ARFLAGS = cru +libarc_a_AR = $(AR) $(ARFLAGS) +@ENABLE_NETWORK_TRUE@am__DEPENDENCIES_1 = url_http.$(OBJEXT) \ +@ENABLE_NETWORK_TRUE@ url_ftp.$(OBJEXT) url_news.$(OBJEXT) \ +@ENABLE_NETWORK_TRUE@ url_newsgroup.$(OBJEXT) +libarc_a_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_libarc_a_OBJECTS = arc.$(OBJEXT) arc_lzh.$(OBJEXT) \ + arc_mime.$(OBJEXT) arc_tar.$(OBJEXT) arc_zip.$(OBJEXT) \ + deflate.$(OBJEXT) explode.$(OBJEXT) inflate.$(OBJEXT) \ + unlzh.$(OBJEXT) url.$(OBJEXT) url_b64decode.$(OBJEXT) \ + url_buff.$(OBJEXT) url_cache.$(OBJEXT) url_dir.$(OBJEXT) \ + url_file.$(OBJEXT) url_hqxdecode.$(OBJEXT) \ + url_inflate.$(OBJEXT) url_mem.$(OBJEXT) url_pipe.$(OBJEXT) \ + url_qsdecode.$(OBJEXT) url_uudecode.$(OBJEXT) +libarc_a_OBJECTS = $(am_libarc_a_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libarc_a_SOURCES) $(EXTRA_libarc_a_SOURCES) +DIST_SOURCES = $(libarc_a_SOURCES) $(EXTRA_libarc_a_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ #CC= @CC@ @@ -114,6 +162,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -204,7 +253,6 @@ P_so_libs = @P_so_libs@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHCFLAGS = @SHCFLAGS@ - SHELL = @SHELL@ SHLD = @SHLD@ STRIP = @STRIP@ @@ -238,6 +286,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -265,6 +315,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -312,15 +363,12 @@ DEF_PKGDATADIR = -DPKGDATADIR=\"$(PKGDAT DEF_PKGLIBDIR = -DPKGLIBDIR=\"$(PKGLIBDIR)\" DEF_SHLIB_DIR = -DSHLIB_DIR=\"$(SHLIB_DIR)\" BITMAP_DIR = $(TCL_DIR)/bitmaps - INCLUDES = \ -I$(top_srcdir)/timidity \ -I$(top_srcdir)/utils \ $(EXTRAINCS) - noinst_LIBRARIES = libarc.a - libarc_a_SOURCES = \ arc.c \ arc.h \ @@ -349,86 +397,58 @@ libarc_a_SOURCES = \ url_uudecode.c \ zip.h - EXTRA_libarc_a_SOURCES = \ url_http.c \ url_ftp.c \ url_news.c \ url_newsgroup.c - @ENABLE_NETWORK_TRUE@NET_OBJS = \ @ENABLE_NETWORK_TRUE@ url_http.$(OBJEXT) \ @ENABLE_NETWORK_TRUE@ url_ftp.$(OBJEXT) \ @ENABLE_NETWORK_TRUE@ url_news.$(OBJEXT) \ @ENABLE_NETWORK_TRUE@ url_newsgroup.$(OBJEXT) - libarc_a_LIBADD = $(NET_OBJS) -subdir = libarc -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) - -libarc_a_AR = $(AR) cru -@ENABLE_NETWORK_TRUE@libarc_a_DEPENDENCIES = url_http.$(OBJEXT) \ -@ENABLE_NETWORK_TRUE@ url_ftp.$(OBJEXT) url_news.$(OBJEXT) \ -@ENABLE_NETWORK_TRUE@ url_newsgroup.$(OBJEXT) -@ENABLE_NETWORK_FALSE@libarc_a_DEPENDENCIES = -am_libarc_a_OBJECTS = arc.$(OBJEXT) arc_lzh.$(OBJEXT) arc_mime.$(OBJEXT) \ - arc_tar.$(OBJEXT) arc_zip.$(OBJEXT) deflate.$(OBJEXT) \ - explode.$(OBJEXT) inflate.$(OBJEXT) unlzh.$(OBJEXT) \ - url.$(OBJEXT) url_b64decode.$(OBJEXT) url_buff.$(OBJEXT) \ - url_cache.$(OBJEXT) url_dir.$(OBJEXT) url_file.$(OBJEXT) \ - url_hqxdecode.$(OBJEXT) url_inflate.$(OBJEXT) url_mem.$(OBJEXT) \ - url_pipe.$(OBJEXT) url_qsdecode.$(OBJEXT) \ - url_uudecode.$(OBJEXT) -libarc_a_OBJECTS = $(am_libarc_a_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/arc.Po ./$(DEPDIR)/arc_lzh.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/arc_mime.Po ./$(DEPDIR)/arc_tar.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/arc_zip.Po ./$(DEPDIR)/deflate.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/explode.Po ./$(DEPDIR)/inflate.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/unlzh.Po ./$(DEPDIR)/url.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/url_b64decode.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/url_buff.Po ./$(DEPDIR)/url_cache.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/url_dir.Po ./$(DEPDIR)/url_file.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/url_ftp.Po ./$(DEPDIR)/url_hqxdecode.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/url_http.Po ./$(DEPDIR)/url_inflate.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/url_mem.Po ./$(DEPDIR)/url_news.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/url_newsgroup.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/url_pipe.Po ./$(DEPDIR)/url_qsdecode.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/url_uudecode.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libarc_a_SOURCES) $(EXTRA_libarc_a_SOURCES) -DIST_COMMON = $(top_srcdir)/common.makefile.in Makefile.am Makefile.in -SOURCES = $(libarc_a_SOURCES) $(EXTRA_libarc_a_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/common.makefile.in $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common.makefile.in $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libarc/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu libarc/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - -AR = ar +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -459,40 +479,21 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url_qsdecode.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url_uudecode.Po@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .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 +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; 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)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .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 +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; 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` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -501,6 +502,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -512,10 +514,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -538,13 +541,9 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/.. + $(mkdir_p) $(distdir)/.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -556,7 +555,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -574,7 +573,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) - installdirs: install: install-am install-exec: install-exec-am @@ -587,7 +585,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -595,24 +593,25 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -628,7 +627,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -647,8 +647,8 @@ uninstall-am: uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-noinstLIBRARIES ctags distclean distclean-compile \ - distclean-depend distclean-generic distclean-tags distdir dvi \ - dvi-am info info-am install install-am install-data \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ --- timidity-2.13.2.orig/interface/x_wrdwindow.h +++ timidity-2.13.2/interface/x_wrdwindow.h @@ -26,7 +26,7 @@ extern void WinEvent(void); extern void EndWin(void); extern void WinFlush(void); -extern void AddLine(const unsigned char *,int); +extern void AddLine(const char *,int); extern int OpenWRDWindow(char *opt); extern void CloseWRDWindow(void); extern void x_RedrawControl(int flag); --- timidity-2.13.2.orig/interface/tk_c.c +++ timidity-2.13.2/interface/tk_c.c @@ -758,8 +758,8 @@ static void k_pipe_puts(char *str) int len; char lf = '\n'; len = line_strlen(str); - write(fpip_out, str, len); - write(fpip_out, &lf, 1); + ssize_t dummy = write(fpip_out, str, len); + dummy = write(fpip_out, &lf, 1); } @@ -772,7 +772,8 @@ int k_pipe_gets(char *str, int maxlen) /* at least 5 letters (4+\n) command */ len = 0; for (p = str; len < maxlen - 1; p++) { - read(fpip_in, p, 1); + ssize_t dummy = read(fpip_in, p, 1); + dummy += 1; if (*p == '\n') break; len++; --- timidity-2.13.2.orig/interface/tkmidity.ptcl +++ timidity-2.13.2/interface/tkmidity.ptcl @@ -1,4 +1,4 @@ -#!/usr/local/bin/wishx -f +#!/usr/bin/wish -f # # TiMidity++ -- MIDI to WAVE converter and player # Copyright (C) 1999-2002 Masanao Izumo --- timidity-2.13.2.orig/interface/tkpanel.tcl +++ timidity-2.13.2/interface/tkpanel.tcl @@ -1,4 +1,4 @@ -#!/usr/local/bin/wishx -f +#!/usr/bin/wish -f # # TiMidity++ -- MIDI to WAVE converter and player # Copyright (C) 1999-2002 Masanao Izumo --- timidity-2.13.2.orig/interface/xaw_i.c +++ timidity-2.13.2/interface/xaw_i.c @@ -204,7 +204,7 @@ static void drawProg(int,int,int,int,Boo optionsCB(),optionspopupCB(),optionscloseCB(),chorusCB(),optionsdestroyCB(), flistpopupCB(),flistcloseCB(), forwardCB(),backCB(),repeatCB(),randomCB(),menuCB(),sndspecCB(), - volsetCB(),volupdownCB(),tuneslideCB(),filemenuCB(), + volsetCB(),volupdownCB(),filemenuCB(), fselectCB(),fdeleteCB(),fdelallCB(),backspaceCB(),aboutCB(),aboutcloseCB(), #ifndef WIDGET_IS_LABEL_WIDGET deleteTextCB(), @@ -216,7 +216,7 @@ static void drawProg(int,int,int,int,Boo drawKeyboardAll(),draw1Note(),redrawAction(),redrawCaption(), exchgWidth(),toggletrace(), checkRightAndPopupSubmenu(),popdownSubmenuCB(),popdownSubmenu(),leaveSubmenu(), - addOneFile(int,int,char *,Boolean), + addOneFile(int,long,char *,Boolean), flistMove(),closeParent(),createOptions(),createFlist(); static char *expandDir(),*strmatch(); static int configcmp(); @@ -261,8 +261,8 @@ int amplitude = DEFAULT_AMPLIFICATION; String bitmapdir = XAW_BITMAP_DIR; Boolean arrangetitle,savelist; static char **current_flist = NULL; -static int voices = 0, last_voice = 0, voices_num_width; -static int maxentry_on_a_menu = 0,submenu_n = 0; +static int last_voice = 0, voices_num_width; +static long maxentry_on_a_menu = 0,submenu_n = 0; #define OPTIONS_WINDOW 1 #define FLIST_WINDOW 2 #define ABOUT_WINDOW 4 @@ -371,8 +371,8 @@ static Display *disp; static int screen; static Pixmap check_mark, arrow_mark, on_mark, off_mark, layer[2]; -static int bm_height[MAXBITMAP], bm_width[MAXBITMAP], - x_hot,y_hot, root_height, root_width; +static unsigned int bm_width[MAXBITMAP], bm_height[MAXBITMAP]; +static int x_hot,y_hot, root_height, root_width; static Pixmap bm_Pixmap[MAXBITMAP]; static int max_files, init_options = 0, init_chorus = 0; static char basepath[PATH_MAX]; @@ -881,7 +881,7 @@ static void randomCB(Widget w,XtPointer static void menuCB(Widget w,XtPointer data,XtPointer dummy) { onPlayOffPause(); - sprintf(local_buf,"L %d",((int)data)+1); + sprintf(local_buf,"L %ld",((long)data)+1); a_pipe_write(local_buf); } @@ -914,7 +914,7 @@ static void volsetCB(Widget w,XtPointer } static void volupdownCB(Widget w,XtPointer data,XtPointer diff) { - int i = ((int)diff > 0)? (-10):10; + int i = ((long)diff > 0)? (-10):10; i += amplitude; setVolbar(i); @@ -964,12 +964,14 @@ static void tunesetAction(Widget w,XEven a_pipe_write(s); } +#if 0 static void tuneslideCB(Widget w,XtPointer data,XtPointer diff) { char s[16]; - sprintf(s, "T %d\n", curr_time+ (int)diff); + sprintf(s, "T %ld\n", curr_time+ (long)diff); a_pipe_write(s); } +#endif static void tuneslideAction(Widget w,XEvent *e,String *v,Cardinal *n) { char s[16]; @@ -2326,7 +2328,7 @@ static void a_readconfig (Config *Cfg) { if (c == LF || c == EOF || i > SSIZE) break; *p++ = c; } - *p = (char)NULL; + *p = (char)0; if (0 != strncasecmp(s, "set ", 4)) continue; switch (configcmp(s+4, &k)) { case S_RepeatPlay: @@ -2489,7 +2491,7 @@ static void checkRightAndPopupSubmenu(Wi /*ARGSUSED*/ static void popdownSubmenuCB(Widget w,XtPointer data,XtPointer dummy) { - int i = (int)data; + long i = (long)data; if (i < 0) i = submenu_n -1; while(i >= 0) XtPopdown(psmenu[i--]); @@ -2540,7 +2542,7 @@ static void addFlist(char *fname, int cu flist[current_n+1]= NULL; } -static void addOneFile(int max_files,int curr_num,char *fname,Boolean update_flist) { +static void addOneFile(int max_files,long curr_num,char *fname,Boolean update_flist) { static Dimension tmpi; static int menu_height; static Widget tmpw; @@ -2560,24 +2562,24 @@ static void addOneFile(int max_files,int psmenu = (Widget *)safe_malloc(sizeof(Widget) * ((int)(max_files / curr_num)+ 2)); else psmenu = (Widget *)safe_realloc((char *)psmenu, sizeof(Widget)*(submenu_n + 2)); - sprintf(sbuf, "morebox%d", submenu_n); + sprintf(sbuf, "morebox%ld", submenu_n); pbox=XtVaCreateManagedWidget(sbuf,smeBSBObjectClass,tmpw,XtNlabel," More...", XtNbackground,textbgcolor,XtNforeground,capcolor, XtNrightBitmap,arrow_mark, XtNfont,app_resources.label_font, NULL); snprintf(sbuf,sizeof(sbuf), - ": unhighlight() checkRightAndPopupSubmenu(%d)",submenu_n); + ": unhighlight() checkRightAndPopupSubmenu(%ld)",submenu_n); XtOverrideTranslations(tmpw, XtParseTranslationTable(sbuf)); - sprintf(sbuf, "psmenu%d", submenu_n); + sprintf(sbuf, "psmenu%ld", submenu_n); psmenu[submenu_n] = XtVaCreatePopupShell(sbuf,simpleMenuWidgetClass,title_sm, XtNforeground,textcolor, XtNbackground,textbgcolor, XtNbackingStore,NotUseful,XtNsaveUnder,False, XtNwidth,menu_width, NULL); - snprintf(sbuf,sizeof(sbuf), ": popdownSubmenu(%d) notify() unhighlight()\n\ + snprintf(sbuf,sizeof(sbuf), ": popdownSubmenu(%ld) notify() unhighlight()\n\ : unhighlight()\n\ - : leaveSubmenu(%d) unhighlight()",submenu_n,submenu_n); + : leaveSubmenu(%ld) unhighlight()",submenu_n,submenu_n); XtOverrideTranslations(psmenu[submenu_n],XtParseTranslationTable(sbuf)); tmpw = psmenu[submenu_n++]; psmenu[submenu_n] = NULL; j = 0; @@ -3234,7 +3236,7 @@ void a_start_interface(int pipe_in) { XtAppContext app_con; char cbuf[PATH_MAX]; Pixmap bmPixmap; - int bmwidth, bmheight; + unsigned int bmwidth, bmheight; int i, j, k, tmpi; int argc=1; float thumb, l_thumb, l_thumbj; --- timidity-2.13.2.orig/interface/x_wrdwindow.c +++ timidity-2.13.2/interface/x_wrdwindow.c @@ -1872,7 +1872,7 @@ static int Parse(int c) } return 0; } -void AddLine(const unsigned char *str,int len) +void AddLine(const char *str,int len) { Linbuf *ptr; int i,j; --- timidity-2.13.2.orig/interface/xaw_c.c +++ timidity-2.13.2/interface/xaw_c.c @@ -629,8 +629,8 @@ static void a_pipe_open(void) { } void a_pipe_write(char *buf) { - write(pipe_out_fd,buf,strlen(buf)); - write(pipe_out_fd,"\n",1); + ssize_t dummy = write(pipe_out_fd,buf,strlen(buf)); + dummy = write(pipe_out_fd,"\n",1); } static int a_pipe_ready(void) { @@ -692,9 +692,9 @@ static void a_pipe_write_msg(char *msg) buf[1] = '\n'; memcpy(buf + 2, &msglen, sizeof(int)); - write(pipe_out_fd, buf, sizeof(buf)); - write(pipe_out_fd, msg, msglen - 1); - write(pipe_out_fd, "\n", 1); + ssize_t dummy = write(pipe_out_fd, buf, sizeof(buf)); + dummy = write(pipe_out_fd, msg, msglen - 1); + dummy = write(pipe_out_fd, "\n", 1); } static void --- timidity-2.13.2.orig/interface/Makefile.am +++ timidity-2.13.2/interface/Makefile.am @@ -247,7 +247,7 @@ clean: tclIndex: $(TCLSRCS) rm -f tclIndex - echo 'auto_mkindex . *.tcl; exit' | $(WISH) + echo "auto_mkindex . *.tcl" | tclsh if ENABLE_TCLTK install_tk = install.tk --- timidity-2.13.2.orig/interface/x_mag.c +++ timidity-2.13.2/interface/x_mag.c @@ -187,7 +187,7 @@ magdata *mag_create(char *file) magdata mg,*res; struct magfilehdr mfh; int len,c,header_pos; - char *flaga=NULL,*flagb=NULL,*pixels=NULL; + unsigned char *flaga=NULL,*flagb=NULL,*pixels=NULL; if((res=mag_search(file))){ return res; } --- timidity-2.13.2.orig/interface/Makefile.in +++ timidity-2.13.2/interface/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -41,7 +41,6 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -55,7 +54,66 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/common.makefile.in +subdir = interface +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) +AR = ar +ARFLAGS = cru +libinterface_a_AR = $(AR) $(ARFLAGS) +am__DEPENDENCIES_1 = $(INTERFACE_SRCS:.c=.$(OBJEXT)) +@ENABLE_WRD_TRUE@am__DEPENDENCIES_2 = wrdt_x.$(OBJEXT) \ +@ENABLE_WRD_TRUE@ x_wrdwindow.$(OBJEXT) VTPrsTbl.$(OBJEXT) \ +@ENABLE_WRD_TRUE@ x_mag.$(OBJEXT) x_sherry.$(OBJEXT) +@CYGNUS_TRUE@am__DEPENDENCIES_3 = wrdt_wcon.$(OBJEXT) +@MSYS_TRUE@am__DEPENDENCIES_4 = wrdt_wcon.$(OBJEXT) +@NEEDDLOPEN_TRUE@am__DEPENDENCIES_5 = dynamic_c.$(OBJEXT) +@ENABLE_SOUND_SPEC_TRUE@am__DEPENDENCIES_6 = soundspec.$(OBJEXT) +am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) \ + $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) +libinterface_a_DEPENDENCIES = $(am__DEPENDENCIES_7) +am_libinterface_a_OBJECTS = dumb_c.$(OBJEXT) wrdt_dumb.$(OBJEXT) \ + wrdt_tty.$(OBJEXT) +libinterface_a_OBJECTS = $(am_libinterface_a_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libinterface_a_SOURCES) $(EXTRA_libinterface_a_SOURCES) +DIST_SOURCES = $(libinterface_a_SOURCES) \ + $(EXTRA_libinterface_a_SOURCES) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ #CC= @CC@ @@ -114,6 +172,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -204,7 +263,6 @@ P_so_libs = @P_so_libs@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHCFLAGS = @SHCFLAGS@ - SHELL = @SHELL@ SHLD = @SHLD@ STRIP = @STRIP@ @@ -238,6 +296,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -265,6 +325,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -312,25 +373,19 @@ DEF_PKGDATADIR = -DPKGDATADIR=\"$(PKGDAT DEF_PKGLIBDIR = -DPKGLIBDIR=\"$(PKGLIBDIR)\" DEF_SHLIB_DIR = -DSHLIB_DIR=\"$(SHLIB_DIR)\" BITMAP_DIR = $(TCL_DIR)/bitmaps - SUFFIXES = .ptcl .tcl .@so@ - SUBDIRS = motif_bitmaps bitmaps pixmaps - INCLUDES = \ -I$(top_srcdir)/timidity \ -I$(top_srcdir)/libarc \ -I$(top_srcdir)/utils - noinst_LIBRARIES = libinterface.a - libinterface_a_SOURCES = \ dumb_c.c \ wrdt_dumb.c \ wrdt_tty.c - EXTRA_libinterface_a_SOURCES = \ ncurs_c.c \ slang_c.c \ @@ -424,7 +479,6 @@ EXTRA_libinterface_a_SOURCES = \ rtsyn_portmidi.c \ portmidisyn_c.c - @ENABLE_WRD_TRUE@WRD_OBJS = \ @ENABLE_WRD_TRUE@ wrdt_x.$(OBJEXT) \ @ENABLE_WRD_TRUE@ x_wrdwindow.$(OBJEXT) \ @@ -432,22 +486,15 @@ EXTRA_libinterface_a_SOURCES = \ @ENABLE_WRD_TRUE@ x_mag.$(OBJEXT) \ @ENABLE_WRD_TRUE@ x_sherry.$(OBJEXT) - @CYGNUS_TRUE@WRD_WINCON_OBJS = wrdt_wcon.$(OBJEXT) @MSYS_TRUE@WRD_WINCON_OBJS2 = wrdt_wcon.$(OBJEXT) - @NEEDDLOPEN_TRUE@DYNAMIC_OBJS = dynamic_c.$(OBJEXT) - @ENABLE_SOUND_SPEC_TRUE@SOUND_SPEC_OBJS = \ @ENABLE_SOUND_SPEC_TRUE@ soundspec.$(OBJEXT) - -@ENABLE_W32G_SYN_TRUE@W32GUI_DEPS = w32g_res.res - @ENABLE_W32GUI_TRUE@W32GUI_DEPS = w32g_res.res - +@ENABLE_W32G_SYN_TRUE@W32GUI_DEPS = w32g_res.res INTERFACE_OBJS = $(INTERFACE_SRCS:.c=.$(OBJEXT)) - libinterface_LIBADD = \ $(INTERFACE_OBJS) \ $(WRD_OBJS) \ @@ -456,9 +503,7 @@ libinterface_LIBADD = \ $(DYNAMIC_OBJS) \ $(SOUND_SPEC_OBJS) - libinterface_a_LIBADD = $(libinterface_LIBADD) - libinterface_dep = \ $(top_builddir)/interface.h \ $(libinterface_a_LIBADD) \ @@ -471,7 +516,6 @@ TCLSRCS = tkmidity.ptcl tkpanel.tcl brow # Tcl/Tk sources TCLF = tkmidity.tcl tkpanel.tcl browser.tcl misc.tcl ALLTCLF = $(TCLF) tclIndex - EXTRA_DIST = \ escape_sjis.pl \ tkmidity.ptcl \ @@ -491,11 +535,9 @@ EXTRA_DIST = \ interface_n.txt \ interface_s.txt - -@ENABLE_TCLTK_TRUE@install_tk = install.tk @ENABLE_DYNAMIC_TCLTK_TRUE@install_tk = install.tk +@ENABLE_TCLTK_TRUE@install_tk = install.tk @ENABLE_DYNAMIC_XAW_TRUE@install_xaw = install.xaw - @ENABLE_XAW_TRUE@install_xaw = install.xaw # ELFILES = @ELFILES@ # autoconf already define this @@ -513,292 +555,45 @@ EXTRA_DIST = \ # dynamic_targets = @dynamic_targets@ # autoconf already define this @NEEDDLOPEN_TRUE@install_dynamics = install.dynamics -subdir = interface -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) - -libinterface_a_AR = $(AR) cru -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ x_mag.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ x_sherry.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ x_mag.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ x_sherry.$(OBJEXT) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ x_mag.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ x_sherry.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ x_mag.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ x_sherry.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ soundspec.$(OBJEXT) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ soundspec.$(OBJEXT) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ soundspec.$(OBJEXT) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ soundspec.$(OBJEXT) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ x_mag.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ x_sherry.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ soundspec.$(OBJEXT) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ x_mag.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ x_sherry.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ soundspec.$(OBJEXT) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ x_mag.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ x_sherry.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ soundspec.$(OBJEXT) -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ x_mag.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ x_sherry.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ soundspec.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ x_mag.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ x_sherry.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ x_mag.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ x_sherry.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ x_mag.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ x_sherry.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ x_mag.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ x_sherry.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ soundspec.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ soundspec.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ soundspec.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ soundspec.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ x_mag.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ x_sherry.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@ soundspec.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ x_mag.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ x_sherry.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@ soundspec.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ x_mag.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ x_sherry.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ dynamic_c.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@ soundspec.$(OBJEXT) -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ $(INTERFACE_SRCS:.c=.$(OBJEXT)) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_x.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ x_wrdwindow.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ VTPrsTbl.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ x_mag.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ x_sherry.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ wrdt_wcon.$(OBJEXT) \ -@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@ soundspec.$(OBJEXT) -am_libinterface_a_OBJECTS = dumb_c.$(OBJEXT) wrdt_dumb.$(OBJEXT) \ - wrdt_tty.$(OBJEXT) -libinterface_a_OBJECTS = $(am_libinterface_a_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/VTPrsTbl.Po ./$(DEPDIR)/alsaseq_c.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/dumb_c.Po ./$(DEPDIR)/dynamic_c.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/emacs_c.Po ./$(DEPDIR)/gtk_c.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtk_i.Po ./$(DEPDIR)/gtk_p.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mac_c.Po ./$(DEPDIR)/mac_mag.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mac_trace.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mac_wrdwindow.Po ./$(DEPDIR)/motif_c.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/motif_i.Po ./$(DEPDIR)/motif_p.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ncurs_c.Po ./$(DEPDIR)/portmidisyn_c.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/rtsyn_common.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/rtsyn_portmidi.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/rtsyn_winmm.Po ./$(DEPDIR)/server_c.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/slang_c.Po ./$(DEPDIR)/soundspec.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/tk_c.Po ./$(DEPDIR)/vt100.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/vt100_c.Po ./$(DEPDIR)/w32g_c.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/w32g_dib.Po ./$(DEPDIR)/w32g_i.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/w32g_ini.Po ./$(DEPDIR)/w32g_mag.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/w32g_playlist.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/w32g_pref.Po ./$(DEPDIR)/w32g_subwin.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/w32g_subwin2.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/w32g_subwin3.Po ./$(DEPDIR)/w32g_syn.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/w32g_ut2.Po ./$(DEPDIR)/w32g_utl.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/winsyn_c.Po ./$(DEPDIR)/wrdt_dumb.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/wrdt_mac.Po ./$(DEPDIR)/wrdt_tty.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/wrdt_w32g.Po ./$(DEPDIR)/wrdt_wcon.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/wrdt_x.Po ./$(DEPDIR)/x_mag.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/x_sherry.Po ./$(DEPDIR)/x_wrdwindow.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xaw_c.Po ./$(DEPDIR)/xaw_i.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xaw_redef.Po ./$(DEPDIR)/xskin_c.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xskin_i.Po ./$(DEPDIR)/xskin_loadBMP.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xskin_spectrum.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libinterface_a_SOURCES) $(EXTRA_libinterface_a_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 = $(top_srcdir)/common.makefile.in Makefile.am Makefile.in -DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(libinterface_a_SOURCES) $(EXTRA_libinterface_a_SOURCES) - all: all-recursive .SUFFIXES: .SUFFIXES: .ptcl .tcl .@so@ .$(so) .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/common.makefile.in $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common.makefile.in $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu interface/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu interface/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - -AR = ar +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -860,30 +655,19 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xskin_loadBMP.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xskin_spectrum.Po@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .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 +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; 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)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .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 +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; 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` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd @@ -893,7 +677,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -905,7 +695,7 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ @@ -913,7 +703,13 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -934,7 +730,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -945,14 +741,6 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -961,19 +749,22 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -983,10 +774,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -1009,13 +801,9 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/.. + $(mkdir_p) $(distdir)/.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -1027,7 +815,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -1042,15 +830,17 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - list='$(SUBDIRS)'; for subdir in $$list; do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -1060,7 +850,6 @@ check: check-recursive all-am: Makefile $(LIBRARIES) installdirs: installdirs-recursive installdirs-am: - install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -1072,7 +861,7 @@ install-am: all-am installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -1080,24 +869,25 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am distclean: distclean-recursive - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-recursive dvi-am: +html: html-recursive + info: info-recursive info-am: @@ -1113,7 +903,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive @@ -1132,22 +923,18 @@ uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-noinstLIBRARIES clean-recursive ctags \ - ctags-recursive distclean distclean-compile distclean-depend \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-noinstLIBRARIES clean-recursive \ + ctags ctags-recursive distclean distclean-compile \ distclean-generic distclean-recursive distclean-tags 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 install-exec-local \ - install-exec-recursive install-info install-info-am \ - install-info-recursive install-man install-recursive \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-exec-local install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ - installdirs-am installdirs-recursive maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive mostlyclean \ - mostlyclean-compile mostlyclean-generic 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-recursive + installdirs-am maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-info-am libinterface.a: $(libinterface_a_OBJECTS) $(libinterface_a_DEPENDENCIES) $(libinterface_dep) @@ -1185,7 +972,7 @@ clean: tclIndex: $(TCLSRCS) rm -f tclIndex - echo 'auto_mkindex . *.tcl; exit' | $(WISH) + echo "auto_mkindex . *.tcl" | tclsh install.tk: $(ALLTCLF) install.bitmaps test -d $(DESTDIR)$(TCL_DIR) || mkdir -p $(DESTDIR)$(TCL_DIR) --- timidity-2.13.2.orig/interface/xskin_c.c +++ timidity-2.13.2/interface/xskin_c.c @@ -487,8 +487,8 @@ static void xskin_pipe_open(void) { } void xskin_pipe_write(char *buf) { - write(pipe_out_fd,buf,strlen(buf)); - write(pipe_out_fd,"\n",1); + ssize_t dummy = write(pipe_out_fd,buf,strlen(buf)); + dummy = write(pipe_out_fd,"\n",1); } static int xskin_pipe_ready(void) { @@ -512,7 +512,7 @@ int xskin_pipe_read(char *buf,int bufsiz bufsize--; for (i=0;iclose_output(); while(1) { - int addrlen; + socklen_t addrlen; addrlen = sizeof(control_client); memset(&control_client, 0, addrlen); @@ -553,6 +553,7 @@ static void add_tick(int tick) seq_play_event(&ev); } +#if 0 static int tick2sample(int tick) { int32 samples, cum; @@ -563,6 +564,7 @@ static int tick2sample(int tick) samples += ((sample_cum >> 16) & 0xFFFF); return samples; } +#endif int time2tick(double sec) { @@ -592,7 +594,7 @@ static void do_timing(uint8 *); static void do_sysex(uint8 *, int len); static void do_extended(uint8 *); static void do_timeout(void); -static void server_seq_sync(double tm); +//static void server_seq_sync(double tm); static uint8 data_buffer[BUFSIZ]; static int data_buffer_len; @@ -769,6 +771,7 @@ static int data_flush(int discard) return 0; } +#if 0 static void server_seq_sync(double tm) { double t; @@ -777,6 +780,7 @@ static void server_seq_sync(double tm) if(t > tm) usleep((unsigned long)((t - tm) * 1000000)); } +#endif static void server_reset(void) { @@ -848,7 +852,7 @@ static int cmd_open(int argc, char **arg { int sock; struct sockaddr_in in; - int addrlen; + socklen_t addrlen; int port; if(data_fd != -1) --- timidity-2.13.2.orig/interface/gtk_i.c +++ timidity-2.13.2/interface/gtk_i.c @@ -56,7 +56,7 @@ #include "pixmaps/timidity.xpm" static GtkWidget *create_menubar(void); -static GtkWidget *create_button_with_pixmap(GtkWidget *, gchar **, gint, gchar *); +static GtkWidget *create_button_with_pixmap(GtkWidget *, gchar **, glong, gchar *); static GtkWidget *create_pixmap_label(GtkWidget *, gchar **); static gint delete_event(GtkWidget *, GdkEvent *, gpointer); static void destroy (GtkWidget *, gpointer); @@ -65,7 +65,7 @@ static void handle_input(gpointer, gint, static void generic_cb(GtkWidget *, gpointer); static void generic_scale_cb(GtkAdjustment *, gpointer); static void open_file_cb(GtkWidget *, gpointer); -static void playlist_cb(GtkWidget *, guint); +static void playlist_cb(GtkWidget *, gulong); static void playlist_op(GtkWidget *, guint); static void file_list_cb(GtkWidget *, gint, gint, GdkEventButton *, gpointer); static void clear_all_cb(GtkWidget *, gpointer); @@ -107,8 +107,8 @@ static GtkTextMark *mark; static void generic_cb(GtkWidget *widget, gpointer data) { - gtk_pipe_int_write((int)data); - if((int)data == GTK_PAUSE) { + gtk_pipe_int_write((long)data); + if((long)data == GTK_PAUSE) { gtk_label_set(GTK_LABEL(cnt_lbl), "Pause"); } } @@ -167,7 +167,7 @@ filer_cb(GtkWidget *widget, gpointer dat #endif glob_t pglob; - if((int)data == 1) { + if((long)data == 1) { patt = gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel)); if(glob(patt, GLOB_BRACE|GLOB_NOMAGIC|GLOB_TILDE, NULL, &pglob)) return; @@ -195,11 +195,11 @@ generic_scale_cb(GtkAdjustment *adj, gpo if(local_adjust) return; - gtk_pipe_int_write((int)data); + gtk_pipe_int_write((long)data); /* This is a bit of a hack as the volume scale (a GtkVScale) seems to have it's minimum at the top which is counter-intuitive. */ - if((int)data == GTK_CHANGE_VOLUME) { + if((long)data == GTK_CHANGE_VOLUME) { gtk_pipe_int_write(MAX_AMPLIFICATION - adj->value); } else { @@ -231,7 +231,7 @@ file_list_cb(GtkWidget *widget, gint row } static void -playlist_cb(GtkWidget *widget, guint data) +playlist_cb(GtkWidget *widget, gulong data) { const gchar *pldir; gchar *plpatt; @@ -277,8 +277,8 @@ playlist_op(GtkWidget *widget, guint dat if(!data) return; - action = (gchar)(int)gtk_object_get_user_data(GTK_OBJECT(plfilesel)); - filename[0] = gtk_file_selection_get_filename(GTK_FILE_SELECTION(plfilesel)); + action = (gchar)(long)gtk_object_get_user_data(GTK_OBJECT(plfilesel)); + filename[0] = (gchar*)gtk_file_selection_get_filename(GTK_FILE_SELECTION(plfilesel)); if(action == 'l') { if((plfp = fopen(filename[0], "r")) == NULL) { @@ -580,7 +580,7 @@ Launch_Gtk_Process(int pipe_number) } static GtkWidget * -create_button_with_pixmap(GtkWidget *window, gchar **bits, gint data, gchar *thelp) +create_button_with_pixmap(GtkWidget *window, gchar **bits, glong data, gchar *thelp) { GtkWidget *pw, *button; GdkPixmap *pixmap; --- timidity-2.13.2.orig/interface/wrdt_tty.c +++ timidity-2.13.2/interface/wrdt_tty.c @@ -292,7 +292,7 @@ static void wrdt_apply(int cmd, int wrd_ fillbuf[0]=0x1b; fillbuf[1]='7'; fillbuf[2]=0; - printf(fillbuf); + printf("%s", fillbuf); /* 0-7: normal, 8-16: reverse */ if(wrd_args[4] <= 7) @@ -308,7 +308,7 @@ static void wrdt_apply(int cmd, int wrd_ fillbuf[0]=0x1b; fillbuf[1]='8'; fillbuf[2]=0; - printf(fillbuf); + printf("%s", fillbuf); printf("\033[%dm",txtclr_preserve); fflush(stdout); } --- timidity-2.13.2.orig/interface/alsaseq_c.c +++ timidity-2.13.2/interface/alsaseq_c.c @@ -390,23 +390,6 @@ static void ctl_pass_playing_list(int n, play_mode->close_output(); - if (ctl.flags & CTLF_DAEMONIZE) - { - int pid = fork(); - FILE *pidf; - switch (pid) - { - case 0: // child is the daemon - break; - case -1: // error status return - exit(7); - default: // no error, doing well - if ((pidf = fopen( "/var/run/timidity.pid", "w" )) != NULL ) - fprintf( pidf, "%d\n", pid ); - exit(0); - } - } - for (;;) { server_reset(); doit(&alsactx); @@ -500,6 +483,7 @@ static void stop_playing(void) static void doit(struct seq_context *ctxp) { + int err, timeout_val = 10; for (;;) { while (snd_seq_event_input_pending(ctxp->handle, 1)) { if (do_sequencer(ctxp)) @@ -529,13 +513,23 @@ static void doit(struct seq_context *ctx } if (! ctxp->active || ! IS_STREAM_TRACE) { fd_set rfds; - struct timeval timeout; + struct timeval timeout; FD_ZERO(&rfds); FD_SET(ctxp->fd, &rfds); - timeout.tv_sec = 0; - timeout.tv_usec = 10000; /* 10ms */ - if (select(ctxp->fd + 1, &rfds, NULL, NULL, &timeout) < 0) + timeout.tv_sec = (timeout_val / 1000); + timeout.tv_usec = (timeout_val % 1000) * 1000; + err = select(ctxp->fd + 1, &rfds, NULL, NULL, timeout_val < 0 ? NULL : &timeout); + if (err < 0) { goto __done; + } else if (err == 0) { + if (timeout_val < 1024) { + timeout_val+=timeout_val; + } else { + timeout_val = -1; + } + } else { + timeout_val = 10; + } } } --- timidity-2.13.2.orig/interface/x_sherry.c +++ timidity-2.13.2/interface/x_sherry.c @@ -827,7 +827,7 @@ static void sry_load_png(uint8 *data) screen = SRY_GET_SHORT(data) & 0xffff; vpalette = SRY_GET_SHORT(data + 2) & 0xffff; - filename = data + 4; + filename = (char *)data + 4; #ifdef SRY_DEBUG printf("Load png: %s: scr=%d pal=%d\n", filename, screen, vpalette); @@ -845,7 +845,7 @@ static void sry_load_png(uint8 *data) err_to_stop = 1; return; } - if(png_sig_cmp(sig, 0, sizeof(sig))) + if(png_sig_cmp((unsigned char*)sig, 0, sizeof(sig))) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: Not a png file", filename); err_to_stop = 1; --- timidity-2.13.2.orig/interface/timidity.el +++ timidity-2.13.2/interface/timidity.el @@ -35,7 +35,7 @@ ;; Configuration parameters. ; Absolute path of timidity. -(defvar timidity-prog-path "/usr/local/bin/timidity") +(defvar timidity-prog-path "/usr/bin/timidity") ; String list for timidity program options. (defvar timidity-default-options nil) --- timidity-2.13.2.orig/interface/pixmaps/Makefile.in +++ timidity-2.13.2/interface/pixmaps/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,13 +17,11 @@ # Define follows if you want to change. # Note that the definition of beginning with just one `#' implies # default value from configure. - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -37,7 +35,30 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/common.makefile.in +subdir = interface/pixmaps +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ #CC= @CC@ @@ -96,6 +117,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -186,7 +208,6 @@ P_so_libs = @P_so_libs@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHCFLAGS = @SHCFLAGS@ - SHELL = @SHELL@ SHLD = @SHLD@ STRIP = @STRIP@ @@ -220,6 +241,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -247,6 +270,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -295,7 +319,6 @@ DEF_PKGLIBDIR = -DPKGLIBDIR=\"$(PKGLIBDI DEF_SHLIB_DIR = -DSHLIB_DIR=\"$(SHLIB_DIR)\" BITMAP_DIR = $(TCL_DIR)/bitmaps - # TiMidity++ -- MIDI to WAVE converter and player # Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen @@ -333,23 +356,39 @@ PIXMAPS = \ keydown.xpm \ timidity.xpm - EXTRA_DIST = $(PIXMAPS) -subdir = interface/pixmaps -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = $(top_srcdir)/common.makefile.in Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/common.makefile.in $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common.makefile.in $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu interface/pixmaps/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu interface/pixmaps/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: tags: TAGS TAGS: @@ -357,13 +396,9 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../.. + $(mkdir_p) $(distdir)/../.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -375,7 +410,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -393,7 +428,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am @@ -406,7 +440,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -414,7 +448,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -424,13 +458,15 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -446,7 +482,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -464,8 +500,8 @@ ps-am: uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ --- timidity-2.13.2.orig/interface/bitmaps/Makefile.in +++ timidity-2.13.2/interface/bitmaps/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -35,13 +35,11 @@ # Define follows if you want to change. # Note that the definition of beginning with just one `#' implies # default value from configure. - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -55,7 +53,30 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/common.makefile.in +subdir = interface/bitmaps +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ #CC= @CC@ @@ -114,6 +135,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -204,7 +226,6 @@ P_so_libs = @P_so_libs@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHCFLAGS = @SHCFLAGS@ - SHELL = @SHELL@ SHLD = @SHLD@ STRIP = @STRIP@ @@ -238,6 +259,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -265,6 +288,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -312,7 +336,6 @@ DEF_PKGDATADIR = -DPKGDATADIR=\"$(PKGDAT DEF_PKGLIBDIR = -DPKGLIBDIR=\"$(PKGLIBDIR)\" DEF_SHLIB_DIR = -DSHLIB_DIR=\"$(SHLIB_DIR)\" BITMAP_DIR = $(TCL_DIR)/bitmaps - BITMAPS = \ back.xbm \ fwrd.xbm \ @@ -326,23 +349,39 @@ BITMAPS = \ repeat.xbm \ timidity.xbm - EXTRA_DIST = $(BITMAPS) -subdir = interface/bitmaps -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = $(top_srcdir)/common.makefile.in Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/common.makefile.in $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common.makefile.in $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu interface/bitmaps/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu interface/bitmaps/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: tags: TAGS TAGS: @@ -350,13 +389,9 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../.. + $(mkdir_p) $(distdir)/../.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -368,7 +403,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -386,7 +421,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am @@ -399,7 +433,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -407,7 +441,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -417,13 +451,15 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -439,7 +475,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -457,8 +493,8 @@ ps-am: uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ --- timidity-2.13.2.orig/interface/motif_bitmaps/Makefile.in +++ timidity-2.13.2/interface/motif_bitmaps/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,13 +17,11 @@ # Define follows if you want to change. # Note that the definition of beginning with just one `#' implies # default value from configure. - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -37,7 +35,30 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/common.makefile.in +subdir = interface/motif_bitmaps +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ #CC= @CC@ @@ -96,6 +117,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -186,7 +208,6 @@ P_so_libs = @P_so_libs@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHCFLAGS = @SHCFLAGS@ - SHELL = @SHELL@ SHLD = @SHLD@ STRIP = @STRIP@ @@ -220,6 +241,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -247,6 +270,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -295,7 +319,6 @@ DEF_PKGLIBDIR = -DPKGLIBDIR=\"$(PKGLIBDI DEF_SHLIB_DIR = -DSHLIB_DIR=\"$(SHLIB_DIR)\" BITMAP_DIR = $(TCL_DIR)/bitmaps - # TiMidity++ -- MIDI to WAVE converter and player # Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen @@ -323,23 +346,39 @@ BITMAPS = \ restart.xbm \ timidity.xbm - EXTRA_DIST = $(BITMAPS) -subdir = interface/motif_bitmaps -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = $(top_srcdir)/common.makefile.in Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/common.makefile.in $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common.makefile.in $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu interface/motif_bitmaps/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu interface/motif_bitmaps/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: tags: TAGS TAGS: @@ -347,13 +386,9 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../.. + $(mkdir_p) $(distdir)/../.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -365,7 +400,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -383,7 +418,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am @@ -396,7 +430,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -404,7 +438,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -414,13 +448,15 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -436,7 +472,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -454,8 +490,8 @@ ps-am: uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ --- timidity-2.13.2.orig/configs/Makefile.in +++ timidity-2.13.2/configs/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -32,15 +32,11 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -54,7 +50,31 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +subdir = configs +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkglibdir = @pkglibdir@ ACLOCAL = @ACLOCAL@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ @@ -91,6 +111,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -214,6 +235,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -241,6 +264,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -260,28 +284,44 @@ target_vendor = @target_vendor@ tcltk_dep = @tcltk_dep@ timidity_LDFLAGS = @timidity_LDFLAGS@ w_so_libs = @w_so_libs@ - EXTRA_DIST = \ msc6-project.zip \ msc6-sjis.txt \ msc7-project.zip \ msc7-sjis.txt -subdir = configs -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu configs/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu configs/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: tags: TAGS TAGS: @@ -289,10 +329,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -306,7 +342,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -324,7 +360,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am @@ -337,7 +372,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -345,7 +380,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -355,13 +390,15 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -377,7 +414,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -395,8 +432,8 @@ ps-am: uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ --- timidity-2.13.2.orig/libunimod/mlutil.c +++ timidity-2.13.2/libunimod/mlutil.c @@ -321,6 +321,7 @@ ULONG getAmigaPeriod (UBYTE flags, ULONG if (flags & UF_LINEAR) { period = lintab[period % 768] >> (period / 768); + if (period < 1) period = 1; period = (8363L * 1712L) / period; } --- timidity-2.13.2.orig/libunimod/mloader.c +++ timidity-2.13.2/libunimod/mloader.c @@ -309,8 +309,8 @@ SL_LoadInternal (void *buffer, UWORD inf int stodo, t, u; int result, c_block = 0; /* compression bytes until next block */ - ITPACK status; - UWORD incnt; + ITPACK status = { 0,0,0,0 }; + UWORD incnt = 0; while (length) { @@ -636,14 +636,14 @@ SL_LoadSamples (void) s->sample->flags = (s->sample->flags & ~SF_FORMATMASK) | s->outfmt; if (s->sample->data == NULL) { - FreeSampleList (musiclist); + FreeSampleList (); return 1; } } s = s->next; } - FreeSampleList (musiclist); + FreeSampleList (); return 0; } --- timidity-2.13.2.orig/libunimod/Makefile.in +++ timidity-2.13.2/libunimod/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -41,7 +41,6 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -55,7 +54,53 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/common.makefile.in AUTHORS +subdir = libunimod +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) +AR = ar +ARFLAGS = cru +libunimod_a_AR = $(AR) $(ARFLAGS) +libunimod_a_LIBADD = +am_libunimod_a_OBJECTS = load_669.$(OBJEXT) load_amf.$(OBJEXT) \ + load_dsm.$(OBJEXT) load_far.$(OBJEXT) load_gdm.$(OBJEXT) \ + load_imf.$(OBJEXT) load_it.$(OBJEXT) load_m15.$(OBJEXT) \ + load_med.$(OBJEXT) load_mod.$(OBJEXT) load_mtm.$(OBJEXT) \ + load_okt.$(OBJEXT) load_s3m.$(OBJEXT) load_stm.$(OBJEXT) \ + load_stx.$(OBJEXT) load_ult.$(OBJEXT) load_uni.$(OBJEXT) \ + load_xm.$(OBJEXT) mloader.$(OBJEXT) mlutil.$(OBJEXT) \ + mmsup.$(OBJEXT) munitrk.$(OBJEXT) +libunimod_a_OBJECTS = $(am_libunimod_a_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libunimod_a_SOURCES) +DIST_SOURCES = $(libunimod_a_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ #CC= @CC@ @@ -114,6 +159,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -204,7 +250,6 @@ P_so_libs = @P_so_libs@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHCFLAGS = @SHCFLAGS@ - SHELL = @SHELL@ SHLD = @SHLD@ STRIP = @STRIP@ @@ -238,6 +283,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -265,6 +312,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -312,7 +360,6 @@ DEF_PKGDATADIR = -DPKGDATADIR=\"$(PKGDAT DEF_PKGLIBDIR = -DPKGLIBDIR=\"$(PKGLIBDIR)\" DEF_SHLIB_DIR = -DSHLIB_DIR=\"$(SHLIB_DIR)\" BITMAP_DIR = $(TCL_DIR)/bitmaps - INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/timidity \ @@ -320,9 +367,7 @@ INCLUDES = \ -I$(top_srcdir)/libarc \ $(EXTRAINCS) - noinst_LIBRARIES = libunimod.a - libunimod_a_SOURCES = \ load_669.c \ load_amf.c \ @@ -349,65 +394,45 @@ libunimod_a_SOURCES = \ unimod.h \ unimod_priv.h -subdir = libunimod -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) - -libunimod_a_AR = $(AR) cru -libunimod_a_LIBADD = -am_libunimod_a_OBJECTS = load_669.$(OBJEXT) load_amf.$(OBJEXT) \ - load_dsm.$(OBJEXT) load_far.$(OBJEXT) load_gdm.$(OBJEXT) \ - load_imf.$(OBJEXT) load_it.$(OBJEXT) load_m15.$(OBJEXT) \ - load_med.$(OBJEXT) load_mod.$(OBJEXT) load_mtm.$(OBJEXT) \ - load_okt.$(OBJEXT) load_s3m.$(OBJEXT) load_stm.$(OBJEXT) \ - load_stx.$(OBJEXT) load_ult.$(OBJEXT) load_uni.$(OBJEXT) \ - load_xm.$(OBJEXT) mloader.$(OBJEXT) mlutil.$(OBJEXT) \ - mmsup.$(OBJEXT) munitrk.$(OBJEXT) -libunimod_a_OBJECTS = $(am_libunimod_a_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/load_669.Po ./$(DEPDIR)/load_amf.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/load_dsm.Po ./$(DEPDIR)/load_far.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/load_gdm.Po ./$(DEPDIR)/load_imf.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/load_it.Po ./$(DEPDIR)/load_m15.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/load_med.Po ./$(DEPDIR)/load_mod.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/load_mtm.Po ./$(DEPDIR)/load_okt.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/load_s3m.Po ./$(DEPDIR)/load_stm.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/load_stx.Po ./$(DEPDIR)/load_ult.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/load_uni.Po ./$(DEPDIR)/load_xm.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mloader.Po ./$(DEPDIR)/mlutil.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mmsup.Po ./$(DEPDIR)/munitrk.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libunimod_a_SOURCES) -DIST_COMMON = $(top_srcdir)/common.makefile.in AUTHORS Makefile.am \ - Makefile.in -SOURCES = $(libunimod_a_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/common.makefile.in $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common.makefile.in $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libunimod/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu libunimod/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - -AR = ar +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -435,40 +460,21 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mmsup.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/munitrk.Po@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .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 +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; 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)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .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 +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; 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` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -477,6 +483,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -488,10 +495,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -514,13 +522,9 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/.. + $(mkdir_p) $(distdir)/.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -532,7 +536,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -550,7 +554,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) - installdirs: install: install-am install-exec: install-exec-am @@ -563,7 +566,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -571,24 +574,25 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -604,7 +608,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -623,8 +628,8 @@ uninstall-am: uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-noinstLIBRARIES ctags distclean distclean-compile \ - distclean-depend distclean-generic distclean-tags distdir dvi \ - dvi-am info info-am install install-am install-data \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ --- timidity-2.13.2.orig/doc/Makefile.in +++ timidity-2.13.2/doc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -35,13 +35,11 @@ # Define follows if you want to change. # Note that the definition of beginning with just one `#' implies # default value from configure. - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -55,7 +53,44 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/common.makefile.in +subdir = doc +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +man1dir = $(mandir)/man1 +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" +man5dir = $(mandir)/man5 +NROFF = nroff +MANS = $(man_MANS) +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ #CC= @CC@ @@ -114,6 +149,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -204,7 +240,6 @@ P_so_libs = @P_so_libs@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHCFLAGS = @SHCFLAGS@ - SHELL = @SHELL@ SHLD = @SHLD@ STRIP = @STRIP@ @@ -238,6 +273,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -265,6 +302,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -312,50 +350,51 @@ DEF_PKGDATADIR = -DPKGDATADIR=\"$(PKGDAT DEF_PKGLIBDIR = -DPKGLIBDIR=\"$(PKGLIBDIR)\" DEF_SHLIB_DIR = -DSHLIB_DIR=\"$(SHLIB_DIR)\" BITMAP_DIR = $(TCL_DIR)/bitmaps - SUFFIXES = .1 .5 .txt .ps - SUBDIRS = C ja_JP.eucJP lang_target = C - man_MANS = \ timidity.1 \ timidity.cfg.5 - EXTRA_DIST = -subdir = doc -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = - -NROFF = nroff -MANS = $(man_MANS) - -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 = $(top_srcdir)/common.makefile.in Makefile.am Makefile.in -DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: .SUFFIXES: .1 .5 .txt .ps -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/common.makefile.in $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common.makefile.in $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: - -man1dir = $(mandir)/man1 install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(man1dir) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -374,8 +413,8 @@ install-man1: $(man1_MANS) $(man_MANS) inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ done uninstall-man1: @$(NORMAL_UNINSTALL) @@ -395,14 +434,12 @@ uninstall-man1: inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ done - -man5dir = $(mandir)/man5 install-man5: $(man5_MANS) $(man_MANS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(man5dir) + test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)" @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -421,8 +458,8 @@ install-man5: $(man5_MANS) $(man_MANS) inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \ done uninstall-man5: @$(NORMAL_UNINSTALL) @@ -442,8 +479,8 @@ uninstall-man5: inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \ - rm -f $(DESTDIR)$(man5dir)/$$inst; \ + echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ done # This directory's subdirectories are mostly independent; you can cd @@ -453,7 +490,13 @@ uninstall-man5: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -465,7 +508,7 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ @@ -473,7 +516,13 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -494,7 +543,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -505,14 +554,6 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -521,19 +562,22 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -543,10 +587,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -569,13 +614,9 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/.. + $(mkdir_p) $(distdir)/.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -587,7 +628,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -602,15 +643,17 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - list='$(SUBDIRS)'; for subdir in $$list; do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -620,8 +663,9 @@ check: check-recursive all-am: Makefile $(MANS) installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) - + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -633,7 +677,7 @@ install-am: all-am installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -641,23 +685,23 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - clean-am: clean-generic mostlyclean-am distclean: distclean-recursive - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive dvi-am: +html: html-recursive + info: info-recursive info-am: @@ -673,7 +717,7 @@ install-man: install-man1 install-man5 installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive @@ -694,21 +738,18 @@ uninstall-info: uninstall-info-recursive uninstall-man: uninstall-man1 uninstall-man5 -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-recursive ctags ctags-recursive distclean \ - distclean-generic distclean-recursive distclean-tags 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 install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-man1 install-man5 install-recursive install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - installdirs-recursive maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - 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-man \ - uninstall-man1 uninstall-man5 uninstall-recursive +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-recursive distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-man1 install-man5 install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-info-am uninstall-man uninstall-man1 uninstall-man5 .1.txt: --- timidity-2.13.2.orig/doc/ja_JP.eucJP/timidity.cfg.5 +++ timidity-2.13.2/doc/ja_JP.eucJP/timidity.cfg.5 @@ -466,8 +466,6 @@ timidity 'cat fild.mid|' .SH ե .TP .B /etc/timidity.cfg -.TP -.B /usr/local/share/timidity/timidity.cfg .SH Ϣ timidity(1), lsmidiprog(1), mididump(1), patinfo(1), sf2text(1), wav2pat(1) .SH  --- timidity-2.13.2.orig/doc/ja_JP.eucJP/Makefile.in +++ timidity-2.13.2/doc/ja_JP.eucJP/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -31,15 +31,11 @@ # 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 - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -53,7 +49,31 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +subdir = doc/ja_JP.eucJP +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkglibdir = @pkglibdir@ ACLOCAL = @ACLOCAL@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ @@ -90,6 +110,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -213,6 +234,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -240,6 +263,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -259,7 +283,6 @@ target_vendor = @target_vendor@ tcltk_dep = @tcltk_dep@ timidity_LDFLAGS = @timidity_LDFLAGS@ w_so_libs = @w_so_libs@ - EXTRA_DIST = \ timidity.1 \ timidity.cfg.5 \ @@ -273,21 +296,38 @@ EXTRA_DIST = \ README.mts \ README.w32 -subdir = doc/ja_JP.eucJP -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ja_JP.eucJP/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/ja_JP.eucJP/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: tags: TAGS TAGS: @@ -295,10 +335,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -312,7 +348,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -330,7 +366,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am @@ -343,7 +378,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -351,7 +386,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -361,13 +396,15 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -383,7 +420,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -401,8 +438,8 @@ ps-am: uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ --- timidity-2.13.2.orig/doc/ja_JP.eucJP/timidity.1 +++ timidity-2.13.2/doc/ja_JP.eucJP/timidity.1 @@ -745,7 +745,7 @@ PortAudio .B \-Oj JACK .TP -.B \-Or +.B \-OR aRts .TP .B \-OA --- timidity-2.13.2.orig/doc/C/timidity.cfg.5 +++ timidity-2.13.2/doc/C/timidity.cfg.5 @@ -4,7 +4,7 @@ timidity.cfg \- configure file of TiMidi .SH DESCRIPTION The file \fBtimidity.cfg\fP describes the runtime environments of timidity(1): that are the path of sound font, instruments -configurations or else. +configurations, etc. .br \fBTiMidity++\fP looks for the configuration file \fBtimidity.cfg\fP at startup, before processing any options. If it can't be accessed, @@ -30,7 +30,7 @@ $variable ${variable} # same as $variable .sp For the moment, the command which newly defines variables is not -prepared. The undifined variable is transposed to null string. +prepared. The undefined variable is transposed to null string. .br The variable defined as a regular variable is the next only one. .TP @@ -89,13 +89,13 @@ that follow are set and displayed as the .BI "bank " "[MapID1] number" Selects the tone bank to modify. Patch mappings that follow will affect this tone bank. You can indicate specific map as a target, by -specifing any ofthe following to \fIMapID1\fP: \fBgm2\fP, \fBsc55\fP, +specifying any of the following to \fIMapID1\fP: \fBgm2\fP, \fBsc55\fP, \fBsc88\fP, \fBsc88pro\fP, \fBsc8850\fP, \fBxg\fP and \fBxgsfx64\fP. .TP .BI "drumset " "[MapID2] number" Selects the drum set to modify. Patch mappings that follow will affect this drum set. You can indicate specific map as a target, by -specifing any ofthe following to \fIMapID2\fP: \fBgm2drum\fP, +specifying any ofthe following to \fIMapID2\fP: \fBgm2drum\fP, \fBsc55drum\fP, \fBsc88drum\fP, \fBsc88prodrum\fP, \fBsc8850drum\fP, \fBxgdrum\fP and \fBxgsfx126\fP. .TP @@ -363,7 +363,7 @@ These comments are displayed in the indi .TP .BI "#extension timeout " "program second" Specifies the time\-out value of the \fIprogram\fP. If any notes -played with the tone number \fIprogram\fP are suspended more than +played with the tone number \fIprogram\fP are suspended for more than \fIsecond\fP seconds, \fBTiMidity++\fP kills the notes. .TP .BI "#extension copydrumset " drumset @@ -470,9 +470,7 @@ timidity 'cat fild.mid|' will read from the output of cat fild.mid. .SH FILES .TP -.B /etc/timidity.cfg -.TP -.B /usr/local/share/timidity/timidity.cfg +.B /etc/timidity/timidity.cfg .SH SEE ALSO timidity(1), lsmidiprog(1), mididump(1), patinfo(1), sf2text(1), wav2pat(1) .SH COPYRIGHT --- timidity-2.13.2.orig/doc/C/Makefile.in +++ timidity-2.13.2/doc/C/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -31,15 +31,11 @@ # 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 - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -53,7 +49,31 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ +subdir = doc/C +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/autoconf/alsa.m4 \ + $(top_srcdir)/autoconf/ao.m4 $(top_srcdir)/autoconf/arts.m4 \ + $(top_srcdir)/autoconf/esd.m4 \ + $(top_srcdir)/autoconf/gtk-2.0.m4 \ + $(top_srcdir)/autoconf/gtk.m4 \ + $(top_srcdir)/autoconf/libFLAC.m4 \ + $(top_srcdir)/autoconf/libOggFLAC.m4 \ + $(top_srcdir)/autoconf/ogg.m4 $(top_srcdir)/autoconf/utils.m4 \ + $(top_srcdir)/autoconf/vorbis.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkglibdir = @pkglibdir@ ACLOCAL = @ACLOCAL@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ @@ -90,6 +110,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EMACSLOADPATH = @EMACSLOADPATH@ ENABLE_ALSASEQ_FALSE = @ENABLE_ALSASEQ_FALSE@ ENABLE_ALSASEQ_TRUE = @ENABLE_ALSASEQ_TRUE@ ENABLE_DYNAMIC_TCLTK_FALSE = @ENABLE_DYNAMIC_TCLTK_FALSE@ @@ -213,6 +234,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -240,6 +263,7 @@ lispdir = @lispdir@ localstatedir = @localstatedir@ m_so_libs = @m_so_libs@ mandir = @mandir@ +mkdir_p = @mkdir_p@ n_so_libs = @n_so_libs@ oldincludedir = @oldincludedir@ p_so_libs = @p_so_libs@ @@ -259,7 +283,6 @@ target_vendor = @target_vendor@ tcltk_dep = @tcltk_dep@ timidity_LDFLAGS = @timidity_LDFLAGS@ w_so_libs = @w_so_libs@ - EXTRA_DIST = \ timidity.1 \ timidity.cfg.5 \ @@ -275,21 +298,38 @@ EXTRA_DIST = \ README.mts \ README.w32 -subdir = doc/C -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/C/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/C/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: tags: TAGS TAGS: @@ -297,10 +337,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -314,7 +350,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -332,7 +368,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am @@ -345,7 +380,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -353,7 +388,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -363,13 +398,15 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -385,7 +422,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -403,8 +440,8 @@ ps-am: uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ --- timidity-2.13.2.orig/doc/C/timidity.1 +++ timidity-2.13.2/doc/C/timidity.1 @@ -199,7 +199,7 @@ volume 90%, drum power 120%, compensatio .RE .TP .B \-a, \-\-[no\-]anti\-alias -Turns on antialiasing. Samples are run through a lowpass filter +Turns on anti-aliasing. Samples are run through a lowpass filter before playing, which reduces aliasing noise at low resampling frequencies. .TP @@ -269,7 +269,7 @@ understood as \fB41\fP, \fB43\fP and \fB Sets the system manufacturer ID to \fIHH\fP (where \fIHH\fP are two hex\-digits). .br -In this option, the manufacuture ID is set unchangable. Manufacuture +In this option, the manufacture ID is set unchangeable. Manufacture ID from the input file would be ignored. .TP .BI b n ", \-\-default\-bank=" n @@ -440,14 +440,12 @@ Open the Sound\-Spectrogram window. Thi system has support for the X Window System. .TP .BI "\-H " n ", \-\-force\-keysig=" n -Specify the number of key signature. MIDI file is performed with -transposition to the key of the number of sharp (when \fIn\fP is -positive) or flat (when \fIn\fP is negative). Valid values of \fIn\fP -are in the interval from \fB\-7\fP to \fB7\fP. For example, if \fIn\fP -is \fB1\fP, MIDI file with any tonality will be performed transposing -to \fB1\fP flat (i.e., F major or D minor). Therefore, it is -convenient to use for the accompaniment when practicing a musical -instrument by the tonality which is easy to perform. +Specify the key signature. MIDI playback is transposed to the key +with the same number of sharps (when \fIn\fP is +positive) or flats (when \fIn\fP is negative). Valid values for \fIn\fP +range from \fB\-7\fP to \fB7\fP. For example, if \fIn\fP +is \fB1\fP, MIDI playback would transpose \fB1\fP flat +(i.e., F major or D minor). .TP .B \-h, \-\-help Show the help message. @@ -516,10 +514,10 @@ Launch \fBTiMidity++\fP as MIDI server. Launch \fBTiMidity++\fP as ALSA sequencer client. .TP .B \-iW -Windodws synthesizer interface +Windows synthesizer interface .TP .B \-iw -Windodws GUI interface +Windows GUI interface .TP .B \-iP PortMIDI synthesizer interface @@ -740,7 +738,7 @@ PortAudio .B \-Oj JACK .TP -.B \-Or +.B \-OR aRts .TP .B \-OA @@ -1064,8 +1062,7 @@ Reserved for \fBTiMidity++\fP specificat \fBTiMidity++\fP Debug .RE .SH SEE ALSO -lsmidiprog(1), mididump(1), patinfo(1), sf2text(1), wav2pat(1), -timidity.cfg(5) +sf2text(1), timidity.cfg(5) .SH COPYRIGHT Copyright (C) 1999\-2004 Masanao Izumo .br debian/rules0000755000000000000000000001311312222347474010254 0ustar #!/usr/bin/make -f # debian/rules for TiMidity++ 2.12.x # # GNU copyright 1997 by Joey Hess. # Copyright (c) 2003 by Henrique de Moraes Holschuh # Published under the GNU GPL license # Based on previous work by Martin Mitchell # # $Id: rules,v 1.24 2004/10/01 15:18:25 hmh Exp $ export TMPPKG := $(CURDIR)/debian/tmp # Autotools export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) export DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # FOR AUTOCONF 2.52 AND NEWER ONLY CONFFLAGS = ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) CONFFLAGS += --build $(DEB_HOST_GNU_TYPE) else CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif # DEB_BUILD_OPTIONS DEBUGFLAGS=-g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) DEBUGFLAGS += -O0 else DEBUGFLAGS += -O2 endif EXTRAFLAGS:=-DUSE_INTERP_RESULT -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) CONFFLAGS += --enable-debug endif # audio and interface ifeq ($(DEB_BUILD_ARCH_OS), linux) audio = default,oss,nas,esd,jack,vorbis,flac,speex,alsa interface = ncurses,emacs,xaw,alsaseq else audio = default,oss,nas,esd,jack,vorbis,flac,speex interface = ncurses,emacs,xaw endif MAKE_CFLAGS:=$(EXTRAFLAGS) -fno-strict-aliasing -Wall -pipe $(DEBUGFLAGS) ## ## The rules ## build: doconfigure build-stamp build-stamp: dh_testdir $(MAKE) CFLAGS="$(MAKE_CFLAGS)" touch build-stamp doconfigure: doconfigure-stamp doconfigure-stamp: dh_testdir rm -f autoconf/config.sub autoconf/config.guess ln -s /usr/share/misc/config.sub autoconf/config.sub ln -s /usr/share/misc/config.guess autoconf/config.guess CFLAGS="-fno-strict-aliasing -Wall -pipe $(DEBUGFLAGS)" ./configure $(CONFFLAGS) \ --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \ --sysconfdir=/etc --with-default-path=/etc/timidity \ --with-lispdir=/usr/share/emacs/site-lisp/timidity-el \ --with-x \ --with-tcl-includes=/usr/include/tcl \ --with-tk-includes=/usr/include/tcl \ --enable-audio=$(audio) \ --with-default-output=default \ --enable-interface=$(interface) \ --enable-dynamic=slang,tcltk,vt100,xskin,gtk \ --enable-server --enable-network --enable-spectrogram --enable-wrd \ --with-nas-library=/usr/lib/$(DEB_HOST_MULTIARCH)/libaudio.so touch doconfigure-stamp clean: configure doconfigure dh_testdir dh_testroot -find -type f -perm +111 ! -name 'rules' -exec chmod 644 {} \; -xargs -t -r chmod +x < debian/executable.files rm -f build-stamp $(MAKE) clean $(MAKE) distclean rm -f common.makefile TiMidity-uj.ad TiMidity.ad rm -f interface/tclIndex rm -f doc/timidity.1 doc/timidity.cfg.5 rm -f autoconf/config.sub autoconf/config.guess rm -rf autom4te.cache rm -f config.log Makefile rm -f doconfigure-stamp dh_clean configure: sh ./autogen.sh install: install: build dh_testdir dh_testroot dh_prep dh_installdirs $(MAKE) DESTDIR=$(TMPPKG) install #XAW interface mkdir -p $(TMPPKG)/etc/X11/app-defaults install -m 644 TiMidity.ad $(TMPPKG)/etc/X11/app-defaults/TiMidity mkdir -p $(TMPPKG)/etc/X11/ja_JP.eucJP/app-defaults install -m 644 TiMidity-uj.ad $(TMPPKG)/etc/X11/ja_JP.eucJP/app-defaults/TiMidity mkdir -p $(TMPPKG)/etc/X11/ja_JP.UTF-8/app-defaults install -m 644 debian/TiMidity-uj_UTF8.ad $(TMPPKG)/etc/X11/ja_JP.UTF-8/app-defaults/TiMidity if [ -r debian/timidity.cfg ] ; then \ mkdir -p $(TMPPKG)/etc/timidity && \ install -m 644 debian/timidity.cfg $(TMPPKG)/etc/timidity ;\ fi mkdir -p $(TMPPKG)/etc/default # install desktop file mkdir -p $(TMPPKG)/usr/share/applications install -m 644 debian/timidity-interfaces-extra.desktop $(TMPPKG)/usr/share/applications # install an icon for menu mkdir -p $(TMPPKG)/usr/share/pixmaps install -m 644 debian/timidity.xpm $(TMPPKG)/usr/share/pixmaps # install Japanese man files mkdir -p $(TMPPKG)/usr/share/man/ja/man1 install -m 644 doc/ja_JP.eucJP/timidity.1 $(TMPPKG)/usr/share/man/ja/man1 mkdir -p $(TMPPKG)/usr/share/man/ja/man5 install -m 644 doc/ja_JP.eucJP/timidity.cfg.5 $(TMPPKG)/usr/share/man/ja/man5 # fix permissions chmod a+x $(TMPPKG)/usr/lib/timidity/tk*.tcl # Lintian and Linda overrides ( cd debian && \ for i in *.linda ; do [ -r "$$i" ] && { \ mkdir -p "$${i%%.linda}/usr/share/linda/overrides" ;\ install -m 644 "$$i" "$${i%%.linda}/usr/share/linda/overrides/$${i%%.linda}" ;\ } ; done ; true ) ( cd debian && \ for i in *.lintian ; do [ -r "$$i" ] && { \ mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\ install -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\ } ; done ; true ) #dh_installdebconf dh_installdocs dh_installexamples dh_installmenu dh_installemacsen dh_installman dh_installchangelogs dh_installinit -R --name=timidity -i -- defaults 99 01 install -m 644 debian/timidity.default $(TMPPKG)/etc/default/timidity dh_install # Build architecture-independent files here. binary-indep: build install dh_testdir -i dh_testroot -i dh_link -i dh_compress -i dh_fixperms -i dh_installdeb -i # dh_perl -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i # Build architecture-dependent files here. binary-arch: build install dh_testdir -a dh_testroot -a dh_strip -a dh_link -a dh_compress -a dh_fixperms -a dh_installdeb -a # dh_makeshlibs -a # dh_perl -a dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a dh_builddeb -a binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install debian/timidity.prerm0000644000000000000000000000125311252410745012073 0ustar #!/bin/sh set -e rm_conffile() { local PKGNAME="$1" local CONFFILE="$2" [ -e "$CONFFILE" ] || return 0 local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')" local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \ sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")" if [ "$md5sum" != "$old_md5sum" ]; then echo "init.d conffile $CONFFILE has been modified by you." echo "Saving as $CONFFILE.dpkg-bak ..." mv -f "$CONFFILE" "$CONFFILE".dpkg-bak else echo "Removing init.d conffile $CONFFILE ..." rm -f "$CONFFILE" fi } case "$1" in remove) # ... ;; esac #DEBHELPER# exit 0 debian/timidity.lintian0000644000000000000000000000045711662474322012417 0ustar timidity: image-file-in-usr-lib # There's a forked copy of mikmod with the player UI, etc. removed/mangled # dating from 2000. It's going to take some effort to even determine if this # will work with a modern mikmod... this is tracked in #649344. timidity: embedded-library usr/bin/timidity: libmikmod debian/timidity.postinst0000644000000000000000000000025711230024365012627 0ustar #!/bin/sh set -e init_failure() { echo The timidity sequencer init script failed. echo If you rely on a running sequencer, please start it manually } #DEBHELPER# exit 0 debian/timidity-daemon.postinst0000644000000000000000000000337511252423640014077 0ustar #!/bin/sh set -e case "$1" in configure) [ -f "/etc/default/timidity" ] && . /etc/default/timidity # Sane defaults, needed for when the user has messed with /etc/default/timidity: [ -z "$SERVER_HOME" ] && SERVER_HOME=/etc/timidity [ -z "$SERVER_USER" ] && SERVER_USER=timidity [ -z "$SERVER_NAME" ] && SERVER_NAME="TiMidity++ MIDI sequencer service" [ -z "$SERVER_GROUP" ] && SERVER_GROUP=timidity # Groups that the user will be added to, if undefined, then none. [ -z "$ADDGROUP" ] && ADDGROUP=audio # create user to avoid running server as root # 1. create group if not existing if ! getent group | grep -q "^$SERVER_GROUP:" ; then echo -n "Adding group $SERVER_GROUP.." addgroup --quiet --system $SERVER_GROUP 2>/dev/null ||true echo "..done" fi # 2. create user if not existing if ! getent passwd | grep -q "^$SERVER_USER:"; then echo -n "Adding system user $SERVER_USER.." adduser --quiet \ --system \ --ingroup $SERVER_GROUP \ --no-create-home \ --disabled-password \ $SERVER_USER 2>/dev/null || true echo "..done" fi # 3. adjust passwd entry usermod -c "$SERVER_NAME" \ -d $SERVER_HOME \ -g $SERVER_GROUP \ $SERVER_USER 2> /dev/null || true # 4. Add the user to the ADDGROUP group if test -n $ADDGROUP then if ! groups $SERVER_USER | cut -d: -f2 | \ grep -qw $ADDGROUP; then adduser $SERVER_USER $ADDGROUP fi fi ;; esac rm -f /etc/timidity/timidity.daemon # make sure we really stop, because packaging system doesn't # understand what we're trying to do with migration to timidity-daemon [ -f "/etc/init.d/timidity" ] && if which invoke-rc.d >/dev/null 2>&1; then invoke-rc.d timidity stop else /etc/init.d/timidity stop fi #DEBHELPER# exit 0 debian/timidity-daemon.preinst0000644000000000000000000000053411252416114013670 0ustar #! /bin/sh set -e LAST_VERSION=2.13.2-31 case "$1" in install) ;; upgrade) ;; abort-upgrade) ;; *) echo "preinst called with unknown argument \`$1'" >&2 exit 1 ;; esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 debian/timidity.docs0000644000000000000000000000007211126120277011672 0ustar AUTHORS README NEWS doc/C/README* doc/ja_JP.eucJP/README* debian/executable.files0000644000000000000000000000024211112236154012325 0ustar ./debian/rules ./interface/tkpanel.tcl ./interface/tkmidity.ptcl ./autoconf/missing ./autoconf/install-sh ./autoconf/mkinstalldirs ./autoconf/depcomp ./configure debian/timidity.default0000644000000000000000000000116111230026435012363 0ustar # Defaults for TiMidity++ scripts # sourced by /etc/init.d/timidity # installed at /etc/default/timidity by the maintainer scripts # $Id: timidity.default,v 1.3 2004/08/07 14:33:26 hmh Exp $ # # This is a POSIX shell fragment # SERVER_HOME=/etc/timidity SERVER_USER=timidity SERVER_NAME="TiMidity++ MIDI sequencer service" SERVER_GROUP=timidity ADDGROUP=audio # Enable MIDI sequencer (ALSA), if timidity-deamon is installed # uncomment to override enabling triggered by availability of timidity-deamon # TIM_ALSASEQ=false # Setting overrides (of /etc/timidity.conf) for the ALSA sequencer daemon TIM_ALSASEQPARAMS="-Os" debian/timidity-daemon.timidity.init0000644000000000000000000000473211375452541015020 0ustar #!/bin/sh # # TiMidity /etc/init.d/ initscript for TiMidity++ # $Id: timidity.init,v 1.6 2004/09/30 01:04:04 hmh Exp $ # # Copyright (c) 2004 by Henrique M. Holschuh # Copyright (c) 2007-2009 Joost Yervante Damad # # Distributed under the GPL version 2 # ### BEGIN INIT INFO # Provides: timidity # Required-Start: $remote_fs # Required-Stop: $remote_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: start and stop timidity # Description: TiMidity++ is a very high quality software-only MIDI sequencer # and MOD player. ### END INIT INFO . /lib/lsb/init-functions NAME="timidity" PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/bin/${NAME} DESC="TiMidity++ ALSA midi emulation" PIDFILE=/var/run/timidity/${NAME}.pid set -e test -x ${DAEMON} || exit 0 TIM_ALSASEQ=true TIM_ALSASEQPARAMS="-B2,8" [ -r /etc/default/timidity ] && . /etc/default/timidity if [ "${TIM_ALSASEQ}" != "true" ]; then log_daemon_msg "Starting" "${NAME}" log_daemon_msg " (to get timidity as an ALSA Sequencer enable this by editing the file /etc/default/timidity)" log_end_msg 0 exit 0 fi [ -z "$SERVER_USER" ] && SERVER_USER=timidity [ -z "$SERVER_GROUP" ] && SERVER_GROUP=timidity if ! getent passwd | grep -q "^${SERVER_USER}:"; then log_daemon_msg "Server user does not exist. Aborting" log_end_msg 0 exit 1 fi if ! getent group | grep -q "^${SERVER_GROUP}:" ; then log_daemon_msg "Server group does not exist. Aborting" log_end_msg = exit 1 fi PARAMS="${TIM_ALSASEQPARAMS} -iAD" START="--start --chuid ${SERVER_USER} --quiet --exec ${DAEMON} --pidfile ${PIDFILE} -- ${PARAMS}" case "$1" in start) #log_daemon_msg "Starting" "${NAME}" [ -d /proc/asound ] && [ -d /dev/snd/ ] || { log_end_msg 1 || echo -n log_warning_msg "ALSA is not active, cannot start $DESC" exit 0 } log_begin_msg "Starting $DESC..." mkdir -p /var/run/timidity chown timidity /var/run/timidity if start-stop-daemon ${START} < /dev/null >/dev/null 2>&1; then log_end_msg 0 else log_end_msg 1 exit 1 fi ;; stop) log_begin_msg "Stopping $DESC..." if start-stop-daemon --stop --oknodo --pidfile ${PIDFILE} \ --name ${NAME} --retry 10 ; then log_end_msg 0 else log_end_msg 1 exit 1 fi ;; restart|force-reload) $0 stop exec $0 start ;; status) status_of_proc $DAEMON $NAME ;; *) echo "Usage: $0 {start|stop|restart|force-reload|status}" >&2 exit 1 esac exit 0 debian/copyright0000644000000000000000000000246511112236154011124 0ustar $Id: copyright,v 1.4 2003/12/27 13:31:44 hmh Exp $ This package was assembled by Henrique de Moraes Holschuh , based on previous work by Martin Mitchell . The Debian packaging of TiMidity++ is: Copyright (c) 2003 by Henrique de Moraes Holschuh , Copyright (c) 2002 by Martin Mitchell , and distributed in the same license as the upstream source it applies to. Upstream sources are at: http://www.timidity.jp/ Sourceforge project at: http://timidity.sourceforge.net/ The changes were fairly minimal, and consisted of adding various debian/* files to the distribution, as well as minor changes to the configuration files. This package was formerly maintained by Klee Dienes , and Martin Mitchell . Authors: Tuukka Toivonen , Masanao Izumo and others. Copyright: Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen 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. The GPL may be found in /usr/share/common-licenses/GPL on a Debian system. debian/TiMidity-uj_UTF8.ad0000644000000000000000000003434111126114575012462 0ustar ! TiMidity.ad -- app-defaults file for TiMidity++ XAW interface ! Created by Yoshishige Arai ! Modified by Chisato Yamauchi TiMidity*international: True TiMidity*inputMethod: none TiMidity*gradientBar: True TiMidity*highlightThickness: 1 TiMidity*BitmapDir: /usr/lib/timidity/bitmaps/ TiMidity*file_simplemenu*international: True TiMidity*file_simplemenu.load.label: ファイルのロード (Meta-N) TiMidity*file_simplemenu.saveconfig.label: 設定保存 (Meta-S) TiMidity*file_simplemenu.hidetext.label: メッセージの表示/非表示 (Ctrl-M) TiMidity*file_simplemenu.hidetrace.label: トレース画面の表示/非表示 (Ctrl-T) TiMidity*file_simplemenu.shuffle.label: シャッフル (Ctrl-S) TiMidity*file_simplemenu.repeat.label: リピート (Ctrl-R) TiMidity*file_simplemenu.autostart.label: 自動演奏 TiMidity*file_simplemenu.autoquit.label: 自動終了 TiMidity*file_simplemenu.filelist.label: 演奏ファイルリスト (Ctrl-F) TiMidity*file_simplemenu.modes.label: 拡張設定モード (Ctrl-O) TiMidity*file_simplemenu.about.label: TiMidity++ について TiMidity*file_simplemenu.quit.label: 終了 (Meta-Q, Q) TiMidity*load_dialog.label: ファイル名 TiMidity*load_dialog.OK.label: 確認 TiMidity*load_dialog.add.label: すべてを追加 TiMidity*load_dialog.cancel.label: キャンセル TiMidity*flist_cmdbox.fplaybutton.label: 演奏 TiMidity*flist_cmdbox.fdeletebutton.label: 削除 TiMidity*flist_cmdbox.fdelallbutton.label: すべてを削除 TiMidity*popup_abox.OK.label: 確認 TiMidity*modul_box.modul_lbl.label: モジュレーションコントロール TiMidity*porta_box.porta_lbl.label: ポルタメントコントロール TiMidity*nrpnv_box.nrpnv_lbl.label: NRPN ビブラート TiMidity*reverb_box.reverb_lbl.label: リバーブエフェクトコントロール TiMidity*chorus_box.chorus_lbl.label: コーラスエフェクトコントロール TiMidity*chpressure_box.chpressure_lbl.label: チャンネルプレッシャー TiMidity*overlapvoice_box.overlapv_lbl.label: 同一音の重複を許す TiMidity*txtmeta_box.txtmeta_lbl.label: すべてのテキストメタイベントをトレース TiMidity*closebutton.label: 閉じる TiMidity*base_form.translations: #override\n\ ~Ctrl Metas: do-menu(101)\n\ Ctrlm: do-menu(102)\n\ Ctrlt: do-menu(103)\n\ Ctrls: do-menu(104)\n\ Ctrlr: do-menu(105)\n\ ~Ctrl Metan: do-load()\n\ Right: do-next()\n\ ~Metan: do-next()\n\ Left: do-prev()\n\ p: do-prev()\n\ KP_Enter: do-play()\n\ Return: do-play()\n\ ~Ctrlr: do-play()\n\ ~Ctrlf: do-forward()\n\ ~Ctrlb: do-back()\n\ ~Ctrlspace: do-pause()\n\ ~Ctrls: do-stop()\n\ Up: do-volupdown(10)\n\ ~Ctrl Shiftv: do-volupdown(10)\n\ Down: do-volupdown(-10)\n\ ~Ctrl ~Shiftv: do-volupdown(-10)\n\ KP_Add: do-key()\n\ ~Ctrlplus: do-key()\n\ KP_Subtract: do-key(1)\n\ ~Shift-: do-key(1)\n\ ~Ctrlgreater: do-speed()\n\ ~Ctrlless: do-speed(1)\n\ ~Ctrl Shifto: do-voice(1)\n\ ~Ctrl ~Shifto: do-voice()\n\ ~Ctrlg: do-sndspec()\n\ ~Ctrlx: do-exchange()\n\ ~Ctrlt: do-toggletrace()\n\ l: do-filelist()\n\ Ctrlf: do-filelist()\n\ Ctrlo: do-options()\n\ a: do-about()\n\ : do-resize()\n\ ~Ctrlq: do-quit() TiMidity*menu_width: 300 TiMidity*menu_box.borderWidth: 0 TiMidity*MenuButton.translations: \ : highlight()\n\ : reset()\n\ Any: reset() fix-menu() PopupMenu() TiMidity*Command*international: True TiMidity*file_menubutton.menuName: file_simplemenu TiMidity*file_menubutton.width: 60 TiMidity*file_menubutton.height: 26 TiMidity*file_menubutton.horizDistance: 6 TiMidity*file_menubutton.vertDistance: 4 TiMidity*file_menubutton.shadowWidth: 1 TiMidity*title_menubutton.menuName: title_simplemenu TiMidity*title_menubutton.width: 210 TiMidity*title_menubutton.height: 26 TiMidity*title_menubutton.resize: false TiMidity*title_menubutton.fromHoriz: file_menubutton TiMidity*title_menubutton.horizDistance: 6 TiMidity*title_menubutton.vertDistance: 4 TiMidity*title_menubutton.shadowWidth: 1 TiMidity*time_label.label: time / mode TiMidity*time_label.width: 92 TiMidity*time_label.height: 26 TiMidity*time_label.resize: false TiMidity*time_label.fromHoriz: title_menubutton TiMidity*time_label.horizDistance: 1 TiMidity*time_label.vertDistance: 4 TiMidity*time_label.shadowWidth: 1 TiMidity*time_label.translations: #override\n\ : do-menu(103)\n\ : do-exchange() TiMidity*button_box.height: 40 TiMidity*button_box.horizDistance: 4 TiMidity*button_box.borderWidth: 0 TiMidity*play_button.width: 32 TiMidity*play_button.height: 32 TiMidity*play_button.horizDistance: 1 TiMidity*play_button.vertDistance: 9 TiMidity*pause_button.width: 32 TiMidity*pause_button.height: 32 TiMidity*pause_button.horizDistance: 1 TiMidity*pause_button.vertDistance: 1 TiMidity*stop_button.width: 32 TiMidity*stop_button.height: 32 TiMidity*stop_button.horizDistance: 1 TiMidity*stop_button.vertDistance: 1 TiMidity*prev_button.width: 32 TiMidity*prev_button.height: 32 TiMidity*prev_button.horizDistance: 1 TiMidity*prev_button.vertDistance: 1 TiMidity*back_button.width: 32 TiMidity*back_button.height: 32 TiMidity*back_button.horizDistance: 1 TiMidity*back_button.vertDistance: 1 TiMidity*fwd_button.width: 32 TiMidity*fwd_button.height: 32 TiMidity*fwd_button.horizDistance: 1 TiMidity*fwd_button.vertDistance: 1 TiMidity*next_button.width: 32 TiMidity*next_button.height: 32 TiMidity*next_button.horizDistance: 1 TiMidity*next_button.vertDistance: 1 TiMidity*quit_button.width: 32 TiMidity*quit_button.height: 32 TiMidity*quit_button.horizDistance: 1 TiMidity*quit_button.vertDistance: 1 TiMidity*random_button.width: 32 TiMidity*random_button.height: 32 TiMidity*random_button.horizDistance: 4 TiMidity*random_button.vertDistance: 1 TiMidity*repeat_button.width: 32 TiMidity*repeat_button.height: 32 TiMidity*repeat_button.horizDistance: 1 TiMidity*repeat_button.vertDistance: 1 TiMidity*volume_label.vertDistance: 0 TiMidity*volume_label.borderWidth: 0 TiMidity*volume_box.vertDistance: 2 TiMidity*volume_box.borderWidth: 0 TiMidity*volume_bar.length: 330 TiMidity*volume_bar.translations: #override\n\ ~Ctrl Shift: do-volupdown(-50)\n\ ~Ctrl Shift: do-volupdown(50)\n\ Ctrl ~Shift: do-volupdown(-5)\n\ Ctrl ~Shift: do-volupdown(5)\n\ : MoveThumb()\n\ : NotifyScroll(FullLength) EndScroll() TiMidity*tune_label.label: ---- TiMidity*tune_label.horizDistance: 0 TiMidity*tune_label.vertDistance: 0 TiMidity*tune_label0.horizDistance: 0 TiMidity*tune_box.vertDistance: 2 TiMidity*tune_box.borderWidth: 0 TiMidity*tune_bar.length: 330 TiMidity*tune_bar.translations: #override\n\ : do-tuneset()\n\ : do-tuneslide()\n\ : MoveThumb()\n\ : NotifyScroll(FullLength) EndScroll() TiMidity*lyric_text.international: True TiMidity*lyric_text.height: 120 TiMidity*lyric_text.fromVert: tune_box TiMidity*lyric_text.horizDistance: 6 TiMidity*lyric_text.vertDistance: 4 TiMidity*lyric_text.borderWidth: 1 TiMidity*lyric_text.scrollVertical: WhenNeeded TiMidity*lyric_text.translations: #override\n\ : do-deltext() TiMidity*trace.vertDistance: 2 TiMidity*trace.borderWidth: 1 TiMidity*trace.translations: #override\n\ : do-toggletrace()\n\ : do-revcaption()\n\ : do-revcaption()\n\ : draw-trace() TiMidity*trace_vport.borderWidth: 1 TiMidity*popup_load.title: TiMidity TiMidity*popup_loadform.height: 400 TiMidity*load_dialog.borderWidth: 0 TiMidity*load_dialog.height: 132 TiMidity*load_dialog.value.translations: #override\n\ Escape: do-dialog-button(1)\n\ Ctrl ~Shiftg: do-dialog-button(1)\n\ ~CtrlKP_Enter: do-chgdir()\n\ ~CtrlReturn: do-chgdir()\n\ BackSpace: do-backspace() delete-previous-character()\n\ ~Ctrl ~MetaTab: do-complete() end-of-line() TiMidity*popup_file.title: TiMidity TiMidity*popup_fbox.translations: #override\n\ ~Ctrlc: do-closeparent()\n\ Down: do-flistmove(1)\n\ n: do-flistmove(1)\n\ Up: do-flistmove(-1)\n\ p: do-flistmove(-1)\n\ Next: do-flistmove(5)\n\ Left: do-flistmove(5)\n\ Prior: do-flistmove(-5)\n\ Right: do-flistmove(-5)\n\ KP_Enter: do-fselect()\n\ Return: do-fselect()\n\ Ctrlm: do-fselect()\n\ ~Ctrlr: do-fselect()\n\ d: do-fdelete()\n\ ~Ctrlf: do-forward()\n\ ~Ctrlb: do-back()\n\ space: do-pause()\n\ s: do-stop()\n\ Shiftv: do-volupdown(10)\n\ ~Shiftv: do-volupdown(-10)\n\ ~Ctrlq: do-quit() TiMidity*popup_option.title: TiMidity TiMidity*popup_optbox*international: True TiMidity*popup_optbox.translations: #override\n\ ~Ctrlc: do-closeparent()\n\ ~Ctrlq: do-quit() TiMidity*popup_about.title: Information TiMidity*popup_abox.translations: #override\n\ ~Ctrlc: do-closeparent()\n\ KP_Enter: do-closeparent()\n\ Return: do-closeparent() TiMidity*foreground: #c0c0c0 TiMidity*background: #171717 TiMidity*BoxColor: #666666 TiMidity*Scrollbar*background: gray82 TiMidity*ButtonForeground: #c0c0c0 TiMidity*ButtonBackground: #444444 TiMidity*ToggleForeground: #c0c0f0 TiMidity*MenuButtonBackground: #839573 TiMidity*menu_box*Foreground: #000000 TiMidity*menu_box*SimpleMenu*Foreground: #c0c0c0 TiMidity*Command.background: gray78 TiMidity*Label.foreground: black TiMidity*Label.background: #CCFF33 TiMidity*Text*background: gray82 TiMidity*Text*scrollbar*background: gray82 TiMidity*TextBackground: #666666 TiMidity*Text2Background: #4e5945 TiMidity*Dialog.Command.background: gray78 TiMidity*Dialog.Text.background: gray82 TiMidity*lyric_text*Foreground: #c0c0c0 TiMidity*lyric_text*Background: #444444 TiMidity*lyric_text*Scrollbar*Background: #666666 TiMidity*TraceBackground: #4e5945 TiMidity*VelForeground: #c0a080 TiMidity*VelDrumForeground: #c08080 TiMidity*VolForeground: #c0b0b0 TiMidity*PanForeground: #a0a0c0 TiMidity*ReverbColor: #c0c080 TiMidity*CaptionColor: #a0a0a0 TiMidity*ExpForeground: #80c0c0 TiMidity*ChorusColor: #c0b080 TiMidity*WhiteKeyColor: #d8d8d8 TiMidity*trace_vport*background: #666666 TiMidity*load_dialog.label.background: gray67 TiMidity*popup_load*Viewport*background: #666666 TiMidity*popup_load*load_dialog.Command*background: #666666 TiMidity*popup_load*load_dialog*label*background: #666666 TiMidity*popup_load*load_dialog*value.background: #666666 TiMidity*popup_load*load_dialog*value.MultiSrc.background: #666666 TiMidity*popup_load*load_dialog*value.MultiSink.background: #666666 TiMidity*popup_load*load_dialog*value*TransientShell.Form.background: #c0c0c0 TiMidity*popup_load*load_dialog*value*TransientShell.Form.Label.background: #c0c0c0 TiMidity*popup_load*load_dialog*value*TransientShell.Form.Toggle.foreground: #000000 TiMidity*popup_load*load_dialog*value*TransientShell.Form.Toggle.background: #c0c0c0 TiMidity*popup_load*load_dialog*value*TransientShell.Form.Command.foreground: #000000 TiMidity*popup_load*load_dialog*value*TransientShell.Form.Command.background: #c0c0c0 TiMidity*popup_load*load_dialog*value*TransientShell.Form.Text.foreground: #000000 TiMidity*popup_load*load_dialog*value*TransientShell.Form.Text.background: #e7e7e7 TiMidity*popup_load*load_dialog*value*TransientShell.Form.Text.borderColor: #6f6f6f TiMidity*popup_load*load_dialog*value*TransientShell.Form.Text.MultiSrc.foreground: #000000 TiMidity*popup_load*load_dialog*value*TransientShell.Form.Text.MultiSrc.background: #e7e7e7 TiMidity*popup_load*load_dialog*value*TransientShell.Form.Text.MultiSink.foreground: #000000 TiMidity*popup_load*load_dialog*value*TransientShell.Form.Text.MultiSink.background: #e7e7e7 TiMidity*popup_load*popup_loadform*load_dialog*label*foreground: #c0c0c0 TiMidity*popup_load*popup_loadform*cwd_label*foreground: #c0c0c0 TiMidity*popup_load*popup_loadform*cwd_info*foreground: #c0c0c0 TiMidity*popup_file*background: #666666 TiMidity*popup_option*background: #666666 TiMidity*popup_about*background: #666666 TiMidity*fontSet: -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* TiMidity*Form*fontSet: -adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* TiMidity*MenuButton*fontSet: -adobe-helvetica-bold-r-normal--12-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* TiMidity*TextFontSet: -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* TiMidity*SmeBSB.fontSet: -adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* TiMidity*Command*fontSet: -adobe-helvetica-bold-r-normal--12-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* TiMidity*List*fontSet: -adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* TiMidity*Label*fontSet: -adobe-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* TiMidity*cwd_label.font: -adobe-helvetica-medium-r-normal--12-*-*-*-*-*-*-* TiMidity*Text*fontSet: -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* TiMidity*file_menubutton.file_simplemenu*fontSet: -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* TiMidity*title_menubutton.title_simplemenu*fontSet: -adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* TiMidity*time_label.font: -adobe-helvetica-bold-r-normal--14-*-*-*-*-*-*-* TiMidity*time_label*cwd_info.font: -adobe-helvetica-medium-r-normal--12-*-*-*-*-*-*-* TiMidity*volume_box*fontSet: -adobe-helvetica-bold-r-normal--12-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* TiMidity*tune_box*fontSet: -adobe-helvetica-bold-r-normal--12-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* TiMidity*popup_loadform.load_dialog.label.fontSet: -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* TiMidity*popup_abox*fontSet: -adobe-helvetica-bold-o-normal--14-*-*-*-*-*-*-*,-*-fixed-medium-r-normal--14-*-*-*-*-*-*-* debian/timidity.mime0000644000000000000000000000066211112236154011673 0ustar audio/midi; /usr/bin/timidity -ia %s; test=test -n "$DISPLAY"; description=A MIDI file; nametemplate=%s.mid; priority=7 audio/midi; /usr/bin/timidity -id %s; description=A MIDI file; nametemplate=%s.mid; priority=5 audio/x-midi; /usr/bin/timidity -ia %s; test=test -n "$DISPLAY"; description=A MIDI file; nametemplate=%s.mid; priority=7 audio/x-midi; /usr/bin/timidity -id %s; description=A MIDI file; nametemplate=%s.mid; priority=5 debian/timidity-daemon.prerm0000644000000000000000000000162212035604674013342 0ustar #!/bin/sh set -e rm_conffile() { local PKGNAME="$1" local CONFFILE="$2" [ -e "$CONFFILE" ] || return 0 local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')" local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \ sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")" if [ "$md5sum" != "$old_md5sum" ]; then echo "init.d conffile $CONFFILE has been modified by you." echo "Saving as $CONFFILE.dpkg-bak ..." mv -f "$CONFFILE" "$CONFFILE".dpkg-bak else echo "Removing init.d conffile $CONFFILE ..." rm -f "$CONFFILE" fi } case "$1" in remove) if [ -f "/etc/init.d/timidity" ]; then if which invoke-rc.d >/dev/null 2>&1; then invoke-rc.d timidity stop else /etc/init.d/timidity stop fi fi rm_conffile timidity-daemon /etc/timidity/timidity.daemon ;; esac #DEBHELPER# exit 0 debian/timidity.xpm0000644000000000000000000000276211112236154011553 0ustar /* XPM */ static char * timidity_xpm[] = { "32 32 21 1", " c None", ". c #333399", "+ c #000000", "@ c #666699", "# c #FFFFFF", "$ c #DDDDDD", "% c #888888", "& c #999999", "* c #7777A4", "= c #4949A4", "- c #BBBBBB", "; c #111111", "> c #444444", ", c #2B2B2B", "' c #555555", ") c #FF9999", "! c #FF9966", "~ c #666666", "{ c #333333", "] c #FF0000", "^ c #00FF00", " . .. ", " . ... + ", " . ..@ +#+ + ", " .@@.. +#$#+%#+ ", " ....@ +#$#$#+$#+ ", " .... +#$#$#$#+$#+ ", " @...@ +#$#$#$#$#+$#+ ", " @.... +#$#$#$#$#$#+$#+ ", " @...@. %#$#$#$#$#$#$#&$#& ", " @...@ +++++++$#++$+++++&$++ ", " ...@ ++$++#++$++#++$$++$++$ ", " @..@ %++#++$++#++$++$&++$++ ", " ... %#++$++#++$++#++&$++#++ ", "*..@ .&++#++$++#++$++++++&++ ", "=.. ...&#$#$#$#$#$#&-$#$& ", "=.. ...+++++$++#+$+++++++ ++ ", "=.. .. .&#$#$#$$&-$#&& ", "=.. .. . +&$#$&+-$#&+ ", " ;;;;;;;;;;;;;;;;;;;>;;;;;;; ", ",#%%%%%%%%%%%%%%%%%';#%%%%%'+ ", ",%+++++++++++++++''>;%'''''>+ ", ",%+#)))))))))))!;''>;%'%~+'>+ ", ",'+);;!;!!;!!!!!;>>>;'>+++>>+ ", ",'+)>!!;!!;!;!;!;>>>;'>>>>>>+ ", ",'+!!!!!!!!!!!!!;>>{;'>%~+>>+ ", ",'+;;;;;;;;;;;;;'>>{;'>+++>>+ ", ",'>>>>>>>>>>>>>>>>>{;'>>>>>>+> ", ",'%~'>>%~'>>'>'>'>>{;'>%~+>{++> ", ",']++>>^++>>+>+>+>>{;'>+++>{++>>", ",'>>>>>>>>>>>>>>{{{';'>>{{{'+>>~", " +++++++++++++++++++>+++++++>>~ ", " "}; debian/timidity.install0000644000000000000000000000015711230026601012404 0ustar usr/bin usr/lib/timidity/bitmaps usr/share/man usr/share/pixmaps etc/X11 etc/timidity/timidity.cfg etc/default debian/timidity-el.install0000644000000000000000000000004611112236154013004 0ustar usr/share/emacs/site-lisp/timidity-el debian/timidity-interfaces-extra.install0000644000000000000000000000016511126114217015652 0ustar usr/lib/timidity/interface_[skTig]* usr/lib/timidity/*tcl* usr/share/applications/timidity-interfaces-extra.desktop debian/control0000644000000000000000000000575712222346461010611 0ustar Source: timidity Section: sound Priority: optional Maintainer: Geoffrey Thomas Uploaders: Karl Ramm Build-Depends: debhelper (>= 7), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libesd0-dev, libjack-dev, libaudio-dev, libvorbis-dev (>= 1.0.0-3), libspeex-dev (>= 1.0), libflac-dev (>= 1.1.4), libncurses-dev, libslang2-dev, libx11-dev, libxext-dev, libxmu-dev, libxpm-dev, libxt-dev, libxaw7-dev, tcl-dev, tk-dev, libgtk2.0-dev, autotools-dev, dpkg-dev (>= 1.16.0) Standards-Version: 3.9.2 Homepage: http://timidity.sourceforge.net/ Package: timidity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-13) Recommends: freepats, timidity-daemon Suggests: pmidi, fluid-soundfont-gm, fluid-soundfont-gs Description: Software sound renderer (MIDI sequencer, MOD player) TiMidity++ is a very high quality software-only MIDI sequencer and MOD player. It uses sound fonts (GUS-compatible or SF2-compatible) to render MIDI files, which are not included in this package. . * Plays MIDI files without any external MIDI instruments at all * Understands SMF, RCP/R36/G18/G36, MFI, RMI (MIDI) * Autodetects and supports GM/GS/XG MIDI * Understands MOD, XM, S3M, IT, 699, AMF, DSM, FAR, GDM, IMF, MED, MTM, STM, STX, ULT, UNI (MOD) * Does MOD to MIDI conversion (including playback) * Outputs audio into various audio file formats: WAV, au, AIFF, Ogg (Vorbis, FLAC, Speex) * Supports NAS, eSound, JACK, ALSA and OSS drivers * Uses Gravis Ultrasound compatible patch files and SoundFont2 patch files as the voice data for MIDI instruments * Supports playing from archives (zip, lzh, tar...) and playing remote data from the network * Timidity++ can be used as an ALSA sequencer device Package: timidity-interfaces-extra Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, timidity (= ${binary:Version}) Replaces: timidity (<< 2.12.0) Description: TiMidity++ extra user interfaces TiMidity++ is a very high quality software-only MIDI sequencer and MOD player. . This package provides extra TiMidity++ user interfaces, which have limited functionality when compared to those in the main package. . Interfaces in this package: VT100, Tcl/Tk, S-Lang, XSkin, GTK2 Package: timidity-el Section: lisp Architecture: all Depends: emacsen-common, ${misc:Depends}, timidity (>= ${source:Version}) Description: Emacs front end to Timidity++ The timidity.el Emacs-Lisp program is a front-end to the TiMidity++ software- only MIDI sequencer and MOD player. You can play MIDI amd MOD files directly from Emacs with this package. Package: timidity-daemon Section: sound Architecture: all Depends: ${misc:Depends}, timidity (>= ${source:Version}), adduser Replaces: timidity (<< 2.13.2-31) Description: runs TiMidity++ as a system-wide MIDI sequencer TiMidity++ is a very high quality software-only MIDI sequencer and MOD player. . This package provides TiMidity++ as a system-wide MIDI sequencer. debian/timidity-el.dirs0000644000000000000000000000004611112236154012277 0ustar usr/share/emacs/site-lisp/timidity-el debian/source/0000755000000000000000000000000011313360273010465 5ustar debian/source/format0000644000000000000000000000001411313360336011673 0ustar 3.0 (quilt) debian/timidity-el.emacsen-remove0000644000000000000000000000104011112236154014237 0ustar #!/bin/sh -e # /usr/lib/emacsen-common/packages/remove/timidity-el # $Id: timidity-el.emacsen-remove,v 1.2 2003/12/27 13:31:44 hmh Exp $ FLAVOR=$1 PACKAGE=timidity-el if [ ${FLAVOR} != emacs ]; then if test -x /usr/sbin/install-info-altdir; then echo remove/${PACKAGE}: removing Info links for ${FLAVOR} install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/timidity.info.gz fi echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} fi debian/README.Debian0000644000000000000000000000706411230042453011230 0ustar TiMidity++ for Debian ----------------------------------------------------------- Enabling the ALSA sequencer daemon is done by installing the timidity-daemon package. You can disable Timidity as ALSA sequencer by uncommenting the line TIM_ALSASEQ=false in the /etc/default/timidity file, and doing an /etc/init.d/timidity restart. Using fluid-soundfont --------------------- Install fluid-soundfont-gm and/or fluid-soundfont-gs. uncomment the line that says #source /etc/timidity/fluidr3_gm.cfg or #source /etc/timidity/fluidr3_gs.cfg in /etc/timidity/timidity.cfg. Comment the freepats line. Installing Patchsets/soundfonts for TiMidity (requisite for MIDI playing) ----------------------------------------- For MIDI playing and sequencing, TiMidity _REQUIRES_ a patchset (or Sound Font), which is a table with the waveforms produced by the instruments. There are no good quality patch sets or sound fonts available that are compatible with the DFSG, AFAIK. The incomplete (as of this writing) FreePats set is the only DFSG-compliant set of patches available, and the default minimal config file will try to use that. See the freepats package for more details. You have to find a sound font or patch set, and configure /etc/timidity/timidity.cfg for that patchset. Good soundfonts in .sf2 format are often available from sound-card makers. For example the Soundblaster Live! driver CD contains the 8MBGMSFX.SF2 file. TiMidity can use those. There are also patchsets available for download on the Internet that are usable for TiMidity. You can find more information about patchsets and soundfonts in the TiMidity homepage and mailinglist. The homepage is at http://timidity.sourceforge.net/ Fine-tining TiMidity for your system's CPU power ------------------------------------------------ TiMidity can, and will use your CPU time to do its level best to get marvelous sound out of whatever you give it to work with. If you find TiMidity too slow, simply configure it to use faster methods of rendering sounds. You can put command line options in timidity.cfg by prefixing them with "opt". Thus, you could use the following, to reduce CPU usage to a minimum: opt anti-alias=d opt ext WPVSETOZ opt fast-decay opt interpolation linear opt poliphony 16 opt ext Fchorus=d opt ext Freverb=d opt ext Fvlpf=d opt ext Fresampl=d Also, reduce the sampling-frequency as much as you can. Usually, playing with -EFresampl (ext Fresampl) is enough to reduce a lot of the CPU usage. The timidity.cfg file --------------------- See timidity.cfg(5) for all the details. Command line options can be specified prefixing them with "opt". You'll probably want to "source " to load in config files distributed along with patchsets. -- Henrique de Moraes Holschuh Pulseaudio ---------- If you use a systemwide pulseaudio daemon, and you also want to run the timidity sequencer systemwide, make sure the root user uses the correct alsa pulseaudio configuration. This can be done by creating a file /etc/asound.conf with the following content: #-- begin -- pcm.pulse { type pulse } ctl.pulse { type pulse } pcm.!default { type pulse } ctl.!default { type pulse } #-- end -- And also add the root user to the pulse-access group: # adduser root pulse-access This will cause timidity to use pulseaudio. This is only an example; more advanced setups might require more or different configuration. Please consult the pulseaudio documentation. Alternatively you could run timidity in daemon mode as user. -- Joost Yervante Damad debian/timidity-el.emacsen-install0000644000000000000000000000254111112236154014417 0ustar #! /bin/sh -e # /usr/lib/emacsen-common/packages/install/timidity-el # $Id: timidity-el.emacsen-install,v 1.2 2003/12/27 13:31:44 hmh Exp $ # Written by Jim Van Zandt , borrowing heavily # from the install scripts for gettext by Santiago Vila # and octave by Dirk Eddelbuettel . # Adapted for Timidity by Martin Mitchell . FLAVOR=$1 PACKAGE=timidity-el if [ ${FLAVOR} = emacs ]; then exit 0; fi echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} #FLAVORTEST=`echo $FLAVOR | cut -c-6` #if [ ${FLAVORTEST} = xemacs ] ; then # SITEFLAG="-no-site-file" #else # SITEFLAG="--no-site-file" #fi FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} # Install-info-altdir does not actually exist. # Maybe somebody will write it. if test -x /usr/sbin/install-info-altdir; then echo install/${PACKAGE}: install Info links for ${FLAVOR} install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz fi install -m 755 -d ${ELCDIR} cd ${ELDIR} FILES=`echo *.el` cp ${FILES} ${ELCDIR} cd ${ELCDIR} cat << EOF > path.el (setq load-path (cons "." load-path) byte-compile-warnings nil) EOF ${FLAVOR} ${FLAGS} ${FILES} rm -f *.el path.el exit 0 debian/compat0000644000000000000000000000000211230023640010353 0ustar 7 debian/timidity-el.emacsen-startup0000644000000000000000000000171411112236154014454 0ustar ;; -*-emacs-lisp-*- ;; ;; Emacs startup file for the Debian GNU/Linux timidity-el package ;; $Id: timidity-el.emacsen-startup,v 1.2 2003/12/27 13:31:44 hmh Exp $ ;; ;; Originally contributed by Nils Naumann ;; Modified by Dirk Eddelbuettel ;; Adapted for dh-make by Jim Van Zandt ;; The timidity-el package follows the Debian/GNU Linux 'emacsen' policy and ;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, ;; xemacs19, emacs20, xemacs20...). The compiled code is then ;; installed in a subdirectory of the respective site-lisp directory. ;; We have to add this to the load-path: (setq load-path (nconc load-path (list (concat "/usr/share/" (symbol-name flavor) "/site-lisp/timidity-el")))) (autoload 'timidity "timidity" "TiMidity++ Interface" t) (setq timidity-prog-path "/usr/bin/timidity")