コミット: 8263144db589cbe6cd503dcce7a01bc9f27ac15a - timidity_mod (git)

TiMidity++ 改造版 (Windows 専用)

コミットメタ情報

• リビジョン: 8263144db589cbe6cd503dcce7a01bc9f27ac15a (tree)
• 日時: 2011-12-04 00:58:16
• 作者: Shoichi Tamuki <tamuki@line...>
• コミッター: Shoichi Tamuki

ログメッセージ

[PATCH 15/17] Get rid of the dynamic_control_mode ControlMode

This is a left over from before the dynamic_interface_module() rewrite,
not only is it no longer needed its code is plain wrong, as it still
contains a prototype for the old way different dynamic_interface_module()
and tries to call it as if it were the old version, if that code path where
to ever be invoked bad things (tm) would happen. Luckily it is never used,
so simply nuke it.

Signed-off-by: Hans de Goede <[e-mail]>
---

interface/Makefile.am | 6 --
interface/dynamic_c.c | 130 -------------------------------------------------
timidity/controls.c | 10 ----
timidity/timidity.c | 31 +++---------
4 files changed, 7 insertions(+), 170 deletions(-)
delete mode 100644 interface/dynamic_c.c

変更サマリ

• modified: ChangeLog
• modified: interface/Makefile.am
• modified: interface/Makefile.in
• delete: interface/dynamic_c.c
• modified: timidity/controls.c
• modified: timidity/timidity.c

差分

--- a/ChangeLog
+++ b/ChangeLog
@@ -65,6 +65,17 @@
 	  warnings
 	* configure.in: [PATCH 14/17] Silence autofoo warnings about
 	  have_speex ac cache identifier (autoreconf by TAMUKI Shochi)
+	* interface/Makefile.am, interface/dynamic_c.c,
+	  timidity/controls.c, timidity/timidity.c,
+	  (remove) interface/dynamic_c.c: [PATCH 15/17] Get rid of the
+	  dynamic_control_mode ControlMode
+	  This is a left over from before the dynamic_interface_module()
+	  rewrite, not only is it no longer needed its code is plain
+	  wrong, as it still contains a prototype for the old way
+	  different dynamic_interface_module() and tries to call it as
+	  if it were the old version, if that code path where to ever
+	  be invoked bad things (tm) would happen. Luckily it is never
+	  used, so simply nuke it. (autoreconf by TAMUKI Shoichi)
 
 2010-09-19  Kentaro Sato <[e-mail]>
 

--- a/interface/Makefile.am
+++ b/interface/Makefile.am
@@ -74,7 +74,6 @@ EXTRA_libinterface_a_SOURCES = \
 	VTparse.h \
 	x_mag.c \
 	x_mag.h \
-	dynamic_c.c \
 	mac_c.c \
 	mac_c.h \
 	mac_mag.c \
@@ -155,10 +154,6 @@ WRD_WINCON_OBJS = wrdt_wcon.$(OBJEXT)
 endif
 endif
 
-if NEEDDLOPEN
-DYNAMIC_OBJS = dynamic_c.$(OBJEXT)
-endif
-
 if ENABLE_SOUND_SPEC
 SOUND_SPEC_OBJS = \
 	soundspec.$(OBJEXT)
@@ -178,7 +173,6 @@ libinterface_LIBADD = \
 	$(INTERFACE_OBJS) \
 	$(WRD_OBJS) \
 	$(WRD_WINCON_OBJS) \
-	$(DYNAMIC_OBJS) \
 	$(SOUND_SPEC_OBJS)
 	
 libinterface_a_LIBADD=$(libinterface_LIBADD)

--- a/interface/Makefile.in
+++ b/interface/Makefile.in
@@ -389,7 +389,6 @@ EXTRA_libinterface_a_SOURCES = \
 	VTparse.h \
 	x_mag.c \
 	x_mag.h \
-	dynamic_c.c \
 	mac_c.c \
 	mac_c.h \
 	mac_mag.c \
@@ -463,8 +462,6 @@ EXTRA_libinterface_a_SOURCES = \
 
 @MSYS_TRUE@@W32G_GUI_FALSE@WRD_WINCON_OBJS = wrdt_wcon.$(OBJEXT)
 
-@NEEDDLOPEN_TRUE@DYNAMIC_OBJS = dynamic_c.$(OBJEXT)
-
 @ENABLE_SOUND_SPEC_TRUE@SOUND_SPEC_OBJS = \
 @ENABLE_SOUND_SPEC_TRUE@	soundspec.$(OBJEXT)
 
@@ -479,7 +476,6 @@ libinterface_LIBADD = \
 	$(INTERFACE_OBJS) \
 	$(WRD_OBJS) \
 	$(WRD_WINCON_OBJS) \
-	$(DYNAMIC_OBJS) \
 	$(SOUND_SPEC_OBJS)
 
 
@@ -537,190 +533,90 @@ CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 
 libinterface_a_AR = $(AR) cru
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT))
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT))
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	dynamic_c.$(OBJEXT)
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	dynamic_c.$(OBJEXT)
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT))
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	wrdt_wcon.$(OBJEXT)
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	dynamic_c.$(OBJEXT)
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	wrdt_wcon.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	dynamic_c.$(OBJEXT)
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	x_sherry.$(OBJEXT)
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	x_sherry.$(OBJEXT)
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	x_sherry.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	dynamic_c.$(OBJEXT)
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	x_sherry.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	dynamic_c.$(OBJEXT)
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	x_sherry.$(OBJEXT)
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	x_sherry.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	wrdt_wcon.$(OBJEXT)
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	x_sherry.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	dynamic_c.$(OBJEXT)
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	x_sherry.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	wrdt_wcon.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	dynamic_c.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	dynamic_c.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	dynamic_c.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	wrdt_wcon.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	dynamic_c.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	wrdt_wcon.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	dynamic_c.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	x_sherry.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	x_sherry.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	x_sherry.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	dynamic_c.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	x_sherry.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	dynamic_c.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	x_sherry.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_TRUE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	x_sherry.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	wrdt_wcon.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_FALSE@@W32G_GUI_FALSE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	x_sherry.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	dynamic_c.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_TRUE@	soundspec.$(OBJEXT)
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	wrdt_x.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	x_wrdwindow.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	VTPrsTbl.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	x_mag.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	x_sherry.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	wrdt_wcon.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	dynamic_c.$(OBJEXT) \
-@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@NEEDDLOPEN_TRUE@@W32G_GUI_FALSE@	soundspec.$(OBJEXT)
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT))
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT))
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT))
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@W32G_GUI_FALSE@	wrdt_wcon.$(OBJEXT)
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@	wrdt_x.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@	x_wrdwindow.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@	VTPrsTbl.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@	x_mag.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@	x_sherry.$(OBJEXT)
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@	wrdt_x.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@	x_wrdwindow.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@	VTPrsTbl.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@	x_mag.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@	x_sherry.$(OBJEXT)
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@	wrdt_x.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@	x_wrdwindow.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@	VTPrsTbl.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@	x_mag.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@	x_sherry.$(OBJEXT)
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	wrdt_x.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	x_wrdwindow.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	VTPrsTbl.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	x_mag.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	x_sherry.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	wrdt_wcon.$(OBJEXT)
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@W32G_GUI_TRUE@	soundspec.$(OBJEXT)
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_FALSE@@W32G_GUI_FALSE@	soundspec.$(OBJEXT)
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@W32G_GUI_TRUE@	soundspec.$(OBJEXT)
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@W32G_GUI_FALSE@	wrdt_wcon.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@MSYS_TRUE@@W32G_GUI_FALSE@	soundspec.$(OBJEXT)
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@	wrdt_x.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@	x_wrdwindow.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@	VTPrsTbl.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@	x_mag.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@	x_sherry.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_TRUE@	soundspec.$(OBJEXT)
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@	wrdt_x.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@	x_wrdwindow.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@	VTPrsTbl.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@	x_mag.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@	x_sherry.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_FALSE@@W32G_GUI_FALSE@	soundspec.$(OBJEXT)
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@	wrdt_x.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@	x_wrdwindow.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@	VTPrsTbl.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@	x_mag.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@	x_sherry.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_TRUE@	soundspec.$(OBJEXT)
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@libinterface_a_DEPENDENCIES = \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	$(INTERFACE_SRCS:.c=.$(OBJEXT)) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	wrdt_x.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	x_wrdwindow.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	VTPrsTbl.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	x_mag.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	x_sherry.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	wrdt_wcon.$(OBJEXT) \
+@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@MSYS_TRUE@@W32G_GUI_FALSE@	soundspec.$(OBJEXT)
 am__libinterface_a_SOURCES_DIST = dumb_c.c wrdt_dumb.c wrdt_tty.c
 @W32G_GUI_TRUE@am_libinterface_a_OBJECTS =
 @W32G_GUI_FALSE@am_libinterface_a_OBJECTS = dumb_c.$(OBJEXT) \
@@ -731,11 +627,10 @@ 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)/dumb_c.Po ./$(DEPDIR)/emacs_c.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/gtk_c.Po ./$(DEPDIR)/gtk_i.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/gtk_p.Po ./$(DEPDIR)/mac_c.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/mac_mag.Po ./$(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)/npsyn_c.Po \
@@ -804,7 +699,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VTPrsTbl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsaseq_c.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dumb_c.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamic_c.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emacs_c.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_c.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_i.Po@am__quote@

--- a/interface/dynamic_c.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-    TiMidity++ -- MIDI to WAVE converter and player
-    Copyright (C) 1999-2004 Masanao Izumo <[e-mail]>
-    Copyright (C) 1995 Tuukka Toivonen <[e-mail]>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
-/*
-    dynamic_c.c
-    Dynamic loading control mode
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#ifndef NO_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#include "timidity.h"
-#include "common.h"
-#include "output.h"
-#include "controls.h"
-#include "dlutils.h"
-
-static int ctl_open(int using_stdin, int using_stdout);
-static void ctl_close(void);
-extern char *dynamic_interface_module(char *name);
-static void ctl_event(){} /* Do nothing */
-static int cmsg(int type, int verbosity_level, char *fmt, ...);
-static void *libhandle;
-static void (* ctl_close_hook)(void);
-
-ControlMode dynamic_control_mode =
-{
-    "Dynamic interface", 0,
-    "\0",
-    1,0,0,0,
-    ctl_open, ctl_close, NULL, NULL, NULL, cmsg, ctl_event,
-};
-
-static int cmsg(int type, int verbosity_level, char *fmt, ...)
-{
-  va_list ap;
-
-  if ((type==CMSG_TEXT || type==CMSG_INFO || type==CMSG_WARNING) &&
-      dynamic_control_mode.verbosity<verbosity_level)
-    return 0;
-  va_start(ap, fmt);
-
-  if (!dynamic_control_mode.opened)
-    {
-      vfprintf(stderr, fmt, ap);
-      fprintf(stderr, "\n");
-    }
-  else
-    {
-      vfprintf(stdout, fmt, ap);
-      fprintf(stdout, "\n");
-    }
-  va_end(ap);
-  return 0;
-}
-
-static int ctl_open(int using_stdin, int using_stdout)
-{
-    ControlMode *(* inferface_loader)(void);
-    char *path, *name;
-    char buff[256];
-    int id;
-
-    if(dynamic_control_mode.opened)
-	return 0;
-    dynamic_control_mode.opened = 1;
-
-    id = dynamic_control_mode.id_character;
-    name = dynamic_control_mode.id_short_name;
-    path = dynamic_interface_module(name);
-    if(path == NULL)
-    {
-	fprintf(stderr, "FATAL ERROR: dynamic_c.c: ctl_open()\n");
-	exit(1);
-    }
-
-    if((libhandle = dl_load_file(path)) == NULL)
-	return -1;
-
-    sprintf(buff, "interface_%c_loader", id);
-    if((inferface_loader = (ControlMode *(*)(void))
-	dl_find_symbol(libhandle, buff)) == NULL)
-	return -1;
-
-    ctl = inferface_loader();
-
-    ctl->verbosity = dynamic_control_mode.verbosity;
-    ctl->trace_playing = dynamic_control_mode.trace_playing;
-    ctl->flags = dynamic_control_mode.flags;
-    ctl_close_hook = ctl->close;
-    ctl->close = dynamic_control_mode.close; /* ctl_close() */
-
-    return ctl->open(using_stdin, using_stdout);
-}
-
-static void ctl_close(void)
-{
-    if(ctl_close_hook)
-    {
-	ctl_close_hook();
-	dl_free(libhandle);
-	ctl_close_hook = NULL;
-    }
-}

--- a/timidity/controls.c
+++ b/timidity/controls.c
@@ -90,13 +90,6 @@ extern ControlMode dumb_control_mode;
 # endif
 #endif
 
-#ifdef IA_DYNAMIC
-  extern ControlMode dynamic_control_mode;
-# ifndef DEFAULT_CONTROL_MODE
-#  define DEFAULT_CONTROL_MODE &dynamic_control_mode
-# endif
-#endif /* IA_DYNAMIC */
-
 #ifdef IA_EMACS
   extern ControlMode emacs_control_mode;
 # ifndef DEFAULT_CONTROL_MODE
@@ -219,9 +212,6 @@ ControlMode *ctl_list[]={
 #if !defined(__MACOS__)  && !defined(IA_W32GUI) && !defined(IA_W32G_SYN)
 	&dumb_control_mode,
 #endif
-#ifdef IA_DYNAMIC
-  &dynamic_control_mode,
-#endif
 #ifdef IA_PLUGIN
   &plugin_control_mode,
 #endif

--- a/timidity/timidity.c
+++ b/timidity/timidity.c
@@ -528,10 +528,6 @@ static inline FILE *open_pager(void);
 static inline void close_pager(FILE *);
 static void interesting_message(void);
 
-#ifdef IA_DYNAMIC
-MAIN_INTERFACE char dynamic_interface_id;
-#endif /* IA_DYNAMIC */
-
 extern StringTable wrd_read_opts;
 
 extern int SecondMode;
@@ -4015,22 +4011,14 @@ static int parse_opt_h(const char *arg)
 	fputs(NLS, fp);
 	fputs("Available interfaces (-i, --interface option):" NLS, fp);
 	for (cmpp = ctl_list; (cmp = *cmpp) != NULL; cmpp++)
-#ifdef IA_DYNAMIC
-		if (cmp->id_character != dynamic_interface_id)
-			fprintf(fp, "  -i%c          %s" NLS,
-					cmp->id_character, cmp->id_name);
-#else
 		fprintf(fp, "  -i%c          %s" NLS,
 				cmp->id_character, cmp->id_name);
-#endif	/* IA_DYNAMIC */
 #ifdef IA_DYNAMIC
 	fprintf(fp, "Supported dynamic load interfaces (%s):" NLS,
 			dynamic_lib_root);
 	memset(mark, 0, sizeof(mark));
 	for (cmpp = ctl_list; (cmp = *cmpp) != NULL; cmpp++)
 		mark[(int) cmp->id_character] = 1;
-	if (dynamic_interface_id != 0)
-		mark[(int) dynamic_interface_id] = 0;
 	list_dyna_interface(fp, dynamic_lib_root, mark);
 #endif	/* IA_DYNAMIC */
 	fputs(NLS, fp);
@@ -4187,17 +4175,16 @@ static inline int parse_opt_i(const char *arg)
 #endif	/* IA_W32GUI */
 			break;
 		}
+	}
 #ifdef IA_DYNAMIC
-		if (cmp->id_character == dynamic_interface_id) {
-			cmp = dynamic_interface_module(*arg);
-			if(cmp) {
-				ctl = cmp;
-				found = 1;
-				break;
-			}
+	if (! found) {
+		cmp = dynamic_interface_module(*arg);
+		if(cmp) {
+			ctl = cmp;
+			found = 1;
 		}
-#endif	/* IA_DYNAMIC */
 	}
+#endif	/* IA_DYNAMIC */
 	if (! found) {
 		ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
 				"Interface `%c' is not compiled in.", *arg);
@@ -5808,11 +5795,7 @@ int main(int argc, char **argv)
 #endif
 #ifdef IA_DYNAMIC
 {
-#ifdef XP_UNIX
-	argv[0] = "netscape";
-#endif /* XP_UNIX */
 	dynamic_lib_root = safe_strdup(SHARED_LIB_PATH);
-	dynamic_interface_id = 0;
 	dl_init(argc, argv);
 }
 #endif /* IA_DYNAMIC */