[PATCH 14/17] Silence autofoo warnings about have_speex ac cache identifier

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 configure.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9118f38..e36edb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,8 @@
          timidity/speex_a.c, timidity/timidity.c, utils/net.c,
          utils/nkflib.c: [PATCH 10/17] Fix / silence various compiler
          warnings
+       * configure.in: [PATCH 14/17] Silence autofoo warnings about
+         have_speex ac cache identifier (autoreconf by TAMUKI Shochi)
 
 2010-09-19  Kentaro Sato <kentaro@ranvis.com>
 

diff --git a/configure b/configure
index 59f3c3d..b7ade15 100755 (executable)
--- a/configure
+++ b/configure
@@ -15614,7 +15614,7 @@ fi
 echo "$as_me:$LINENO: checking enable_audio=speex" >&5
 echo $ECHO_N "checking enable_audio=speex... $ECHO_C" >&6
 if test "x$au_enable_speex" = xyes; then
-  if test "${have_speex+set}" = set; then
+  if test "${timidity_cv_have_speex+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

diff --git a/configure.in b/configure.in
index 12bd4cd..97c35db 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1424,7 +1424,7 @@ fi
 dnl ogg's speex
 AC_MSG_CHECKING(enable_audio=speex)
 if test "x$au_enable_speex" = xyes; then
-  AC_CACHE_VAL(have_speex,
+  AC_CACHE_VAL(timidity_cv_have_speex,
   [AC_TRY_LINK([
   #include <speex/speex.h>
   #include <ogg/ogg.h>

diff --git a/interface/Makefile.in b/interface/Makefile.in
index f61fdd1..233006b 100644 (file)
--- a/interface/Makefile.in
+++ b/interface/Makefile.in
@@ -469,10 +469,10 @@ EXTRA_libinterface_a_SOURCES = \
 @ENABLE_SOUND_SPEC_TRUE@       soundspec.$(OBJEXT)
 
 
-@ENABLE_W32GUI_TRUE@W32GUI_DEPS = w32g_res.res
-
 @ENABLE_W32G_SYN_TRUE@W32GUI_DEPS = w32g_res.res
 
+@ENABLE_W32GUI_TRUE@W32GUI_DEPS = w32g_res.res
+
 INTERFACE_OBJS = $(INTERFACE_SRCS:.c=.$(OBJEXT))
 
 libinterface_LIBADD = \

diff --git a/timidity/Makefile.in b/timidity/Makefile.in
index 8779624..b9950e9 100644 (file)
--- a/timidity/Makefile.in
+++ b/timidity/Makefile.in
@@ -484,15 +484,24 @@ EXTRA_timidity_SOURCES = \
 
 calcnewt_SOURCES = calcnewt.c
 @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@W32GUI_RES = $(top_builddir)/interface/w32g_res.res
-
-@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@W32GUI_RES = w32g_res.res
-@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@W32GUI_RES = $(top_builddir)/interface/w32g_res.res
+@BORLANDC_FALSE@@DMC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@W32GUI_RES = $(top_builddir)\\interface\\w32g_res.res
 
 @BORLANDC_FALSE@@DMC_TRUE@@ENABLE_W32GUI_TRUE@W32GUI_RES = $(top_builddir)\\interface\\w32g_res.res
-@BORLANDC_FALSE@@DMC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@W32GUI_RES = $(top_builddir)\\interface\\w32g_res.res
+
+@BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@W32GUI_RES = w32g_res.res
 @BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@W32GUI_RES = w32g_res.res
+@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@W32GUI_RES = $(top_builddir)/interface/w32g_res.res
 
 @BORLANDC_FALSE@CLEANFILES = newton_table.c
+
+@VCPP_TRUE@timidity_LDADD = \
+@VCPP_TRUE@    $(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@    $(W32GUI_RES)
+
 @BORLANDC_FALSE@@DMC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_LDADD = \
 @BORLANDC_FALSE@@DMC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@     $(SYSEXTRAS:.c=.$(OBJEXT)) \
 @BORLANDC_FALSE@@DMC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@     $(top_builddir)\\interface\\interface.lib \
@@ -501,12 +510,11 @@ calcnewt_SOURCES = calcnewt.c
 @BORLANDC_FALSE@@DMC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@     $(top_builddir)\\utils\\utils.lib \
 @BORLANDC_FALSE@@DMC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@     $(W32GUI_RES)
 
-
-@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@timidity_LDADD = \
-@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@      interface.lib \
-@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@      arc.lib \
-@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@      unimod.lib \
-@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@      utils.lib
+@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_LDADD = \
+@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      interface.lib \
+@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      arc.lib \
+@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      unimod.lib \
+@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      utils.lib
 
 
 @POCC_TRUE@@VCPP_FALSE@timidity_LDADD = \
@@ -517,15 +525,6 @@ calcnewt_SOURCES = calcnewt.c
 @POCC_TRUE@@VCPP_FALSE@        $(top_builddir)/utils/utils.lib \
 @POCC_TRUE@@VCPP_FALSE@        $(W32GUI_RES)
 
-
-@VCPP_TRUE@timidity_LDADD = \
-@VCPP_TRUE@    $(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@    $(W32GUI_RES)
-
 @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_LDADD = \
 @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@    $(SYSEXTRAS:.c=.$(OBJEXT)) \
 @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@    $(top_builddir)/interface/libinterface.a \
@@ -534,11 +533,20 @@ calcnewt_SOURCES = calcnewt.c
 @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@    $(top_builddir)/utils/libutils.a \
 @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@    $(W32GUI_RES)
 
-@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_LDADD = \
-@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      interface.lib \
-@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      arc.lib \
-@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      unimod.lib \
-@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      utils.lib
+
+@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@timidity_LDADD = \
+@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@      interface.lib \
+@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@      arc.lib \
+@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@      unimod.lib \
+@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@      utils.lib
+
+
+@VCPP_TRUE@timidity_dep = $(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@    $(W32GUI_RES)
 
 
 @BORLANDC_FALSE@@DMC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
@@ -548,12 +556,12 @@ calcnewt_SOURCES = calcnewt.c
 @BORLANDC_FALSE@@DMC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@     $(top_builddir)/utils/utils.lib \
 @BORLANDC_FALSE@@DMC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@     $(W32GUI_RES)
 
-@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
-@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@        $(top_builddir)/interface/interface.lib \
-@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@        $(top_builddir)/libarc/arc.lib \
-@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@        $(top_builddir)/libunimod/unimod.lib \
-@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@        $(top_builddir)/utils/utils.lib \
-@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@        $(W32GUI_RES)
+@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
+@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@        $(top_builddir)/interface/interface.lib \
+@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@        $(top_builddir)/libarc/arc.lib \
+@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@        $(top_builddir)/libunimod/unimod.lib \
+@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@        $(top_builddir)/utils/utils.lib \
+@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@        $(W32GUI_RES)
 
 @POCC_TRUE@@VCPP_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
 @POCC_TRUE@@VCPP_FALSE@        $(top_builddir)/interface/interface.lib \
@@ -563,14 +571,6 @@ calcnewt_SOURCES = calcnewt.c
 @POCC_TRUE@@VCPP_FALSE@        $(W32GUI_RES)
 
 
-@VCPP_TRUE@timidity_dep = $(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@    $(W32GUI_RES)
-
-
 @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
 @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@    $(top_builddir)/interface/libinterface.a \
 @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@    $(top_builddir)/libarc/libarc.a \
@@ -578,12 +578,12 @@ calcnewt_SOURCES = calcnewt.c
 @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@    $(top_builddir)/utils/libutils.a \
 @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@    $(W32GUI_RES)
 
-@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
-@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@        $(top_builddir)/interface/interface.lib \
-@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@        $(top_builddir)/libarc/arc.lib \
-@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@        $(top_builddir)/libunimod/unimod.lib \
-@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@        $(top_builddir)/utils/utils.lib \
-@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@        $(W32GUI_RES)
+@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
+@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@        $(top_builddir)/interface/interface.lib \
+@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@        $(top_builddir)/libarc/arc.lib \
+@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@        $(top_builddir)/libunimod/unimod.lib \
+@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@        $(top_builddir)/utils/utils.lib \
+@BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@        $(W32GUI_RES)
 
 @BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@BORLANDC_LINK_OPTIONS = \
 @BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@      -L..\\interface \
@@ -597,15 +597,15 @@ calcnewt_SOURCES = calcnewt.c
 @BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      LibPath ..\\libunimod \
 @BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      LibPath ..\\utils
 
+@VCPP_TRUE@@WINDRV_FALSE@VC_LINK = link.exe
 
 @VCPP_TRUE@@WINDRV_TRUE@VC_LINK = link.exe -lib
-@VCPP_TRUE@@WINDRV_FALSE@VC_LINK = link.exe
 @VCPP_TRUE@VCC_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 
-@POCC_TRUE@@VCPP_FALSE@@WINDRV_FALSE@POCC_LINK = polink.exe
-
 @POCC_TRUE@@VCPP_FALSE@@WINDRV_TRUE@POCC_LINK = polib.exe
 
+@POCC_TRUE@@VCPP_FALSE@@WINDRV_FALSE@POCC_LINK = polink.exe
+
 @POCC_TRUE@@VCPP_FALSE@POCCC_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 @BORLANDC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WINDRV_FALSE@BORLANDC_LINK = ilink32.exe -C -Gn
 
@@ -1557,15 +1557,6 @@ clean-binPROGRAMS:
 
 clean-noinstPROGRAMS:
        -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-@BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES) 
-@BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@        @rm -f calcnewt$(EXEEXT)
-@BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@        $(LINK) $(calcnewt_LDFLAGS) $(calcnewt_OBJECTS) $(calcnewt_LDADD) $(LIBS)
-@BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES) 
-@BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@      @rm -f calcnewt$(EXEEXT)
-@BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@      $(LINK) $(calcnewt_LDFLAGS) $(calcnewt_OBJECTS) $(calcnewt_LDADD) $(LIBS)
-@BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES) 
-@BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@       @rm -f calcnewt$(EXEEXT)
-@BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@       $(LINK) $(calcnewt_LDFLAGS) $(calcnewt_OBJECTS) $(calcnewt_LDADD) $(LIBS)
 @BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_TRUE@calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES) 
 @BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_TRUE@ @rm -f calcnewt$(EXEEXT)
 @BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_TRUE@ $(LINK) $(calcnewt_LDFLAGS) $(calcnewt_OBJECTS) $(calcnewt_LDADD) $(LIBS)
@@ -1575,12 +1566,21 @@ clean-noinstPROGRAMS:
 @BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_TRUE@calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES) 
 @BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_TRUE@        @rm -f calcnewt$(EXEEXT)
 @BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_TRUE@        $(LINK) $(calcnewt_LDFLAGS) $(calcnewt_OBJECTS) $(calcnewt_LDADD) $(LIBS)
-@BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@timidity$(EXEEXT): $(timidity_OBJECTS) $(timidity_DEPENDENCIES) 
-@BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@      @rm -f timidity$(EXEEXT)
-@BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@      $(LINK) $(timidity_LDFLAGS) $(timidity_OBJECTS) $(timidity_LDADD) $(LIBS)
+@BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES) 
+@BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@        @rm -f calcnewt$(EXEEXT)
+@BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@        $(LINK) $(calcnewt_LDFLAGS) $(calcnewt_OBJECTS) $(calcnewt_LDADD) $(LIBS)
+@BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES) 
+@BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@      @rm -f calcnewt$(EXEEXT)
+@BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@      $(LINK) $(calcnewt_LDFLAGS) $(calcnewt_OBJECTS) $(calcnewt_LDADD) $(LIBS)
+@BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES) 
+@BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@       @rm -f calcnewt$(EXEEXT)
+@BORLANDC_FALSE@@DMC_TRUE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@       $(LINK) $(calcnewt_LDFLAGS) $(calcnewt_OBJECTS) $(calcnewt_LDADD) $(LIBS)
 @BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_TRUE@timidity$(EXEEXT): $(timidity_OBJECTS) $(timidity_DEPENDENCIES) 
 @BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_TRUE@       @rm -f timidity$(EXEEXT)
 @BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_TRUE@       $(LINK) $(timidity_LDFLAGS) $(timidity_OBJECTS) $(timidity_LDADD) $(LIBS)
+@BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@timidity$(EXEEXT): $(timidity_OBJECTS) $(timidity_DEPENDENCIES) 
+@BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@      @rm -f timidity$(EXEEXT)
+@BORLANDC_FALSE@@DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@@WINDRV_FALSE@      $(LINK) $(timidity_LDFLAGS) $(timidity_OBJECTS) $(timidity_LDADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT) core *.core

diff --git a/windrv/Makefile.in b/windrv/Makefile.in
index 8be11a5..f994cb8 100755 (executable)
--- a/windrv/Makefile.in
+++ b/windrv/Makefile.in
@@ -361,6 +361,13 @@ EXTRA_DIST = \
         timiditydrv.inf  \
         timiditydrv.idl
 
+@DMC_TRUE@@MINGWGCC_FALSE@libtimiditydrv_a_LIBADD = \
+@DMC_TRUE@@MINGWGCC_FALSE@     interface.lib \
+@DMC_TRUE@@MINGWGCC_FALSE@     arc.lib \
+@DMC_TRUE@@MINGWGCC_FALSE@     unimod.lib \
+@DMC_TRUE@@MINGWGCC_FALSE@     utils.lib \
+@DMC_TRUE@@MINGWGCC_FALSE@     timidity.lib
+
 
 @MINGWGCC_TRUE@libtimiditydrv_a_LIBADD = \
 @MINGWGCC_TRUE@        $(top_builddir)/timidity/timidity.exe \
@@ -369,13 +376,6 @@ EXTRA_DIST = \
 @MINGWGCC_TRUE@        $(top_builddir)/libunimod/libunimod.a \
 @MINGWGCC_TRUE@        $(top_builddir)/utils/libutils.a 
 
-@DMC_TRUE@@MINGWGCC_FALSE@libtimiditydrv_a_LIBADD = \
-@DMC_TRUE@@MINGWGCC_FALSE@     interface.lib \
-@DMC_TRUE@@MINGWGCC_FALSE@     arc.lib \
-@DMC_TRUE@@MINGWGCC_FALSE@     unimod.lib \
-@DMC_TRUE@@MINGWGCC_FALSE@     utils.lib \
-@DMC_TRUE@@MINGWGCC_FALSE@     timidity.lib
-
 @DMC_FALSE@@MINGWGCC_FALSE@@POCC_TRUE@libtimiditydrv_a_LIBADD = \
 @DMC_FALSE@@MINGWGCC_FALSE@@POCC_TRUE@ $(top_builddir)/interface/interface.lib \
 @DMC_FALSE@@MINGWGCC_FALSE@@POCC_TRUE@ $(top_builddir)/libarc/arc.lib \
@@ -390,13 +390,6 @@ EXTRA_DIST = \
 @DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@        $(top_builddir)/utils/utils.lib \
 @DMC_FALSE@@MINGWGCC_FALSE@@POCC_FALSE@        $(top_builddir)/timidity/timidity.exe
 
-@MINGWGCC_TRUE@libtimiditydrv_a_dep = \
-@MINGWGCC_TRUE@        $(top_builddir)/timidity/timidity.exe \
-@MINGWGCC_TRUE@        $(top_builddir)/interface/libinterface.a \
-@MINGWGCC_TRUE@        $(top_builddir)/libarc/libarc.a \
-@MINGWGCC_TRUE@        $(top_builddir)/libunimod/libunimod.a \
-@MINGWGCC_TRUE@        $(top_builddir)/utils/libutils.a 
-
 @DMC_TRUE@@MINGWGCC_FALSE@libtimiditydrv_a_dep = \
 @DMC_TRUE@@MINGWGCC_FALSE@     $(top_builddir)/interface/interface.lib \
 @DMC_TRUE@@MINGWGCC_FALSE@     $(top_builddir)/libarc/arc.lib \
@@ -404,6 +397,13 @@ EXTRA_DIST = \
 @DMC_TRUE@@MINGWGCC_FALSE@     $(top_builddir)/utils/utils.lib \
 @DMC_TRUE@@MINGWGCC_FALSE@     $(top_builddir)/timidity/timidity.lib
 
+@MINGWGCC_TRUE@libtimiditydrv_a_dep = \
+@MINGWGCC_TRUE@        $(top_builddir)/timidity/timidity.exe \
+@MINGWGCC_TRUE@        $(top_builddir)/interface/libinterface.a \
+@MINGWGCC_TRUE@        $(top_builddir)/libarc/libarc.a \
+@MINGWGCC_TRUE@        $(top_builddir)/libunimod/libunimod.a \
+@MINGWGCC_TRUE@        $(top_builddir)/utils/libutils.a 
+
 @DMC_FALSE@@MINGWGCC_FALSE@@POCC_TRUE@libtimiditydrv_a_dep = \
 @DMC_FALSE@@MINGWGCC_FALSE@@POCC_TRUE@ $(top_builddir)/interface/interface.lib \
 @DMC_FALSE@@MINGWGCC_FALSE@@POCC_TRUE@ $(top_builddir)/libarc/arc.lib \