]> git.saurik.com Git - wxWidgets.git/blobdiff - contrib/src/mmedia/Makefile.in
fix evaluation order bug (patch 1158099)
[wxWidgets.git] / contrib / src / mmedia / Makefile.in
index 145ba2f0e35069357e87d7018c8ad2b26861b75b..522eb8d2d90bc7d55bc08525de1ee87a46d7667a 100644 (file)
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.7 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -11,8 +11,10 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 SHARED_LD_CXX = @SHARED_LD_CXX@
+LIBEXT = @LIBEXT@
 LIBPREFIX = @LIBPREFIX@
 SO_SUFFIX = @SO_SUFFIX@
+DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
 LN_S = @LN_S@
 PIC_FLAG = @PIC_FLAG@
 SONAME_FLAG = @SONAME_FLAG@
@@ -33,6 +35,8 @@ CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 VENDOR = @VENDOR@
+WX_FLAVOUR = @WX_FLAVOUR@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
@@ -44,7 +48,10 @@ EXTRALIBS_ESD = @EXTRALIBS_ESD@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_RELEASE = 2.5
+WX_RELEASE_NODOT = 25
+WX_VERSION = $(WX_RELEASE).4
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
 LIBDIRNAME = $(top_builddir)lib
 MMEDIADLL_CXXFLAGS = $(__mmediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
@@ -94,8 +101,6 @@ MMEDIALIB_ODEP =  $(___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname)
 
 ### Conditionally set variables: ###
 
-@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
-@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_USE_GUI_0@PORTNAME = base
@@ -109,81 +114,90 @@ MMEDIALIB_ODEP =  $(___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname)
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)251
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
+@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
+@COND_PLATFORM_WIN32_1@        wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 COND_SHARED_1___mmediadll___depname = \
-       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
 @COND_SHARED_1@__mmediadll___depname = $(COND_SHARED_1___mmediadll___depname)
 @COND_SHARED_1@__install_mmediadll___depname = install_mmediadll
 COND_PLATFORM_MACOSX_1___mmediadll___macinstnamecmd = -install_name \
-       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2)
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2)
 @COND_PLATFORM_MACOSX_1@__mmediadll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___mmediadll___macinstnamecmd)
+COND_PLATFORM_OS2_1___mmediadll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__mmediadll___importlib = $(COND_PLATFORM_OS2_1___mmediadll___importlib)
 COND_PLATFORM_WIN32_1___mmediadll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_PLATFORM_WIN32_1@__mmediadll___importlib = $(COND_PLATFORM_WIN32_1___mmediadll___importlib)
 @COND_GCC_PCH_1@__mmediadll_PCH_INC = -I.pch/wxprec_mmediadll
 @COND_GCC_PCH_1@___pch_wxprec_mmediadll_wx_wxprec_h_gch___depname \
 @COND_GCC_PCH_1@       = .pch/wxprec_mmediadll/wx/wxprec.h.gch
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__mmediadll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).1
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).4
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .1.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .4.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__mmediadll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__mmediadll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).1.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).4.0.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .1.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .4.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__mmediadll___targetsuf3 = .$(SO_SUFFIX)
 COND_USE_SOVERLINUX_1___mmediadll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2)
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2)
 @COND_USE_SOVERLINUX_1@__mmediadll___soname_flags = $(COND_USE_SOVERLINUX_1___mmediadll___soname_flags)
 COND_USE_SOVERSOLARIS_1___mmediadll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__mmediadll___soname_flags = $(COND_USE_SOVERSOLARIS_1___mmediadll___soname_flags)
 COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
        $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
        $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT))
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
 @COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_cmd)
 COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
        $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
        $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_inst_cmd)
 @COND_PLATFORM_MACOSX_1@__mmediadll___macver = \
 @COND_PLATFORM_MACOSX_1@       -compatibility_version $(WX_VERSION) \
 @COND_PLATFORM_MACOSX_1@       -current_version $(WX_VERSION)
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+       -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS =  \
        mmediadll_cdunix.o \
        mmediadll_sndesd.o \
@@ -194,12 +208,13 @@ COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS =  \
 @COND_PLATFORM_WIN32_1@        = mmediadll_cdwin.o mmediadll_sndwin.o \
 @COND_PLATFORM_WIN32_1@        mmediadll_vidwin.o
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
-@COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
 COND_SHARED_0___mmedialib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 @COND_SHARED_0@__mmedialib___depname = $(COND_SHARED_0___mmedialib___depname)
 @COND_SHARED_0@__install_mmedialib___depname = install_mmedialib
 @COND_GCC_PCH_1@__mmedialib_PCH_INC = -I.pch/wxprec_mmedialib
@@ -221,199 +236,199 @@ COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS_1 =  \
 all: $(__mmediadll___depname) $(__mmedialib___depname)
 
 install: all $(__install_mmediadll___depname) $(__install_mmedialib___depname)
-       $(INSTALL_DIR) $(DESTDIR)$(includedir)
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
        for f in wx/mmedia/cdbase.h wx/mmedia/cdunix.h wx/mmedia/cdwin.h wx/mmedia/sndaiff.h wx/mmedia/sndbase.h wx/mmedia/sndcodec.h wx/mmedia/sndcpcm.h wx/mmedia/sndesd.h wx/mmedia/sndfile.h wx/mmedia/sndg72x.h wx/mmedia/sndmsad.h wx/mmedia/sndoss.h wx/mmedia/sndpcm.h wx/mmedia/sndulaw.h wx/mmedia/sndwav.h wx/mmedia/sndwin.h wx/mmedia/vidbase.h wx/mmedia/vidwin.h wx/mmedia/vidxanm.h; do \
-       if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
-       $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
+       if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
        fi; \
-       $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
+       $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
        done
 
 uninstall: 
 
 install-strip: install
-       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a
+       rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 
 distclean: clean
-       rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+       rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(__mmediadll___macver) $(EXTRALIBS_ESD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(__mmediadll___macver) $(EXTRALIBS_ESD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 @COND_SHARED_1@        
 @COND_SHARED_1@        $(__mmediadll___so_symlinks_cmd)
 
 @COND_SHARED_1@install_mmediadll: 
 @COND_SHARED_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
-@COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_SHARED_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
+@COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) $(DESTDIR)$(libdir)
 @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__mmediadll___so_symlinks_inst_cmd))
 
 @COND_GCC_PCH_1@.pch/wxprec_mmediadll/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_mmediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIADLL_CXXFLAGS)
 
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a: $(MMEDIALIB_OBJECTS)
+@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(MMEDIALIB_OBJECTS)
 @COND_SHARED_0@        rm -f $@
 @COND_SHARED_0@        $(AR) rcu $@ $(MMEDIALIB_OBJECTS)
 @COND_SHARED_0@        $(RANLIB) $@
 
 @COND_SHARED_0@install_mmedialib: 
 @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
+@COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
 
 @COND_GCC_PCH_1@.pch/wxprec_mmedialib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_mmedialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIALIB_CXXFLAGS)
 
 mmediadll_cdunix.o: $(srcdir)/cdunix.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/cdunix.cpp
 
 mmediadll_sndesd.o: $(srcdir)/sndesd.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndesd.cpp
 
 mmediadll_sndoss.o: $(srcdir)/sndoss.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndoss.cpp
 
 mmediadll_vidxanm.o: $(srcdir)/vidxanm.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/vidxanm.cpp
 
 mmediadll_cdwin.o: $(srcdir)/cdwin.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/cdwin.cpp
 
 mmediadll_sndwin.o: $(srcdir)/sndwin.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndwin.cpp
 
 mmediadll_vidwin.o: $(srcdir)/vidwin.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/vidwin.cpp
 
 mmediadll_cdbase.o: $(srcdir)/cdbase.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/cdbase.cpp
 
 mmediadll_g711.o: $(srcdir)/g711.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g711.cpp
 
 mmediadll_g721.o: $(srcdir)/g721.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g721.cpp
 
 mmediadll_g723_24.o: $(srcdir)/g723_24.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g723_24.cpp
 
 mmediadll_g723_40.o: $(srcdir)/g723_40.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g723_40.cpp
 
 mmediadll_g72x.o: $(srcdir)/g72x.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g72x.cpp
 
 mmediadll_sndaiff.o: $(srcdir)/sndaiff.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndaiff.cpp
 
 mmediadll_sndbase.o: $(srcdir)/sndbase.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndbase.cpp
 
 mmediadll_sndcodec.o: $(srcdir)/sndcodec.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndcodec.cpp
 
 mmediadll_sndcpcm.o: $(srcdir)/sndcpcm.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndcpcm.cpp
 
 mmediadll_sndfile.o: $(srcdir)/sndfile.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndfile.cpp
 
 mmediadll_sndg72x.o: $(srcdir)/sndg72x.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndg72x.cpp
 
 mmediadll_sndmsad.o: $(srcdir)/sndmsad.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndmsad.cpp
 
 mmediadll_sndpcm.o: $(srcdir)/sndpcm.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndpcm.cpp
 
 mmediadll_sndulaw.o: $(srcdir)/sndulaw.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndulaw.cpp
 
 mmediadll_sndwav.o: $(srcdir)/sndwav.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndwav.cpp
 
 mmediadll_vidbase.o: $(srcdir)/vidbase.cpp $(MMEDIADLL_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/vidbase.cpp
 
 mmedialib_cdunix.o: $(srcdir)/cdunix.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/cdunix.cpp
 
 mmedialib_sndesd.o: $(srcdir)/sndesd.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndesd.cpp
 
 mmedialib_sndoss.o: $(srcdir)/sndoss.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndoss.cpp
 
 mmedialib_vidxanm.o: $(srcdir)/vidxanm.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/vidxanm.cpp
 
 mmedialib_cdwin.o: $(srcdir)/cdwin.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/cdwin.cpp
 
 mmedialib_sndwin.o: $(srcdir)/sndwin.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndwin.cpp
 
 mmedialib_vidwin.o: $(srcdir)/vidwin.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/vidwin.cpp
 
 mmedialib_cdbase.o: $(srcdir)/cdbase.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/cdbase.cpp
 
 mmedialib_g711.o: $(srcdir)/g711.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g711.cpp
 
 mmedialib_g721.o: $(srcdir)/g721.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g721.cpp
 
 mmedialib_g723_24.o: $(srcdir)/g723_24.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g723_24.cpp
 
 mmedialib_g723_40.o: $(srcdir)/g723_40.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g723_40.cpp
 
 mmedialib_g72x.o: $(srcdir)/g72x.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g72x.cpp
 
 mmedialib_sndaiff.o: $(srcdir)/sndaiff.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndaiff.cpp
 
 mmedialib_sndbase.o: $(srcdir)/sndbase.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndbase.cpp
 
 mmedialib_sndcodec.o: $(srcdir)/sndcodec.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndcodec.cpp
 
 mmedialib_sndcpcm.o: $(srcdir)/sndcpcm.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndcpcm.cpp
 
 mmedialib_sndfile.o: $(srcdir)/sndfile.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndfile.cpp
 
 mmedialib_sndg72x.o: $(srcdir)/sndg72x.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndg72x.cpp
 
 mmedialib_sndmsad.o: $(srcdir)/sndmsad.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndmsad.cpp
 
 mmedialib_sndpcm.o: $(srcdir)/sndpcm.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndpcm.cpp
 
 mmedialib_sndulaw.o: $(srcdir)/sndulaw.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndulaw.cpp
 
 mmedialib_sndwav.o: $(srcdir)/sndwav.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndwav.cpp
 
 mmedialib_vidbase.o: $(srcdir)/vidbase.cpp $(MMEDIALIB_ODEP)
-       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/vidbase.cpp
 
 
 # Include dependency info, if present: