diff --git a/.gitignore b/.gitignore
index a188b1f31db..aa64a291839 100644
--- a/.gitignore
+++ b/.gitignore
@@ -325,9 +325,7 @@ tools/winegcc/winegcc
 tools/wmc/mcy.tab.c
 tools/wmc/mcy.tab.h
 tools/wmc/wmc
-tools/wmc/wmc-installed
 tools/wrc/parser.tab.c
 tools/wrc/parser.tab.h
 tools/wrc/parser.yy.c
 tools/wrc/wrc
-tools/wrc/wrc-installed
diff --git a/Make.rules.in b/Make.rules.in
index b53c91077e7..827f4fd0b81 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -63,10 +63,10 @@ filter: dummy
 	$(FLEX) $(LEXFLAGS) -o$@ $<
 
 .mc.res:
-	$(LDPATH) $(WMC) -U -O res -P $(top_srcdir)/po -o $@ $<
+	$(WMC) -U -O res -P $(top_srcdir)/po -o $@ $<
 
 .rc.res:
-	$(LDPATH) $(WRC) $(RCFLAGS) -o $@ $<
+	$(WRC) $(RCFLAGS) -o $@ $<
 
 .idl.h:
 	$(WIDL) $(IDLFLAGS) -h -o $@ $<
@@ -189,10 +189,10 @@ install install-lib install-dev uninstall::
 # Rules for resources
 
 rsrc.pot: $(WRC)
-	$(LDPATH) $(WRC) $(RCFLAGS) -O pot -o $@ $(PO_SRCS)
+	$(WRC) $(RCFLAGS) -O pot -o $@ $(PO_SRCS)
 
 msg.pot: $(WMC)
-	$(LDPATH) $(WMC) -O pot -o $@ $(MC_SRCS)
+	$(WMC) -O pot -o $@ $(MC_SRCS)
 
 $(MC_SRCS:.mc=.res): $(WMC) $(ALL_MO_FILES)
 $(RC_SRCS:.rc=.res): $(WRC)
diff --git a/Make.vars.in b/Make.vars.in
index d10e70e2f70..01498d270a2 100644
--- a/Make.vars.in
+++ b/Make.vars.in
@@ -74,9 +74,9 @@ WRC             = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT)
 LIBPORT         = $(top_builddir)/libs/port/libwine_port.a
 LIBWPP          = $(top_builddir)/libs/wpp/libwpp.a
 LIBWINE         = -L$(top_builddir)/libs/wine -lwine
+LIBWINE_STATIC  = $(top_builddir)/libs/wine/libwine_static.a
 WINEGCC         = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) @UNWINDFLAGS@
 CROSSWINEGCC    = $(TOOLSDIR)/tools/winegcc/winegcc $(CROSSTARGET:%=-b %) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) --lib-suffix=.cross.a
-LDPATH          = @LDPATH@
 LDRPATH_INSTALL = @LDRPATH_INSTALL@
 LDRPATH_LOCAL   = @LDRPATH_LOCAL@
 INSTALL         = @INSTALL@ $(INSTALL_FLAGS)
diff --git a/Maketest.rules.in b/Maketest.rules.in
index df10546be7b..56174d8fba7 100644
--- a/Maketest.rules.in
+++ b/Maketest.rules.in
@@ -35,7 +35,7 @@ $(WINETEST_EXE): $(OBJS) Makefile.in
 	$(WINEGCC) -s -Wb,-F,$(MODULE) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS)
 
 $(WINETEST_RES): $(WINETEST_EXE)
-	echo "$(MODULE) TESTRES \"$(WINETEST_EXE)\"" | $(LDPATH) $(WRC) $(RCFLAGS) -o $@
+	echo "$(MODULE) TESTRES \"$(WINETEST_EXE)\"" | $(WRC) $(RCFLAGS) -o $@
 
 .PHONY: check test testclean crosstest
 
diff --git a/configure b/configure
index cfaf21f81dd..73aabf225c0 100755
--- a/configure
+++ b/configure
@@ -634,7 +634,6 @@ LIBDL
 EXTRA_BINARIES
 MAIN_BINARY
 TOOLSEXT
-LDPATH
 UNWINDFLAGS
 BUILTINFLAG
 EXTRACFLAGS
@@ -13929,19 +13928,9 @@ $as_echo "#define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(name,__AS
 
 
 
-LDPATH=""
-
 case $build_os in
-  cygwin*|mingw32*)
-    TOOLSEXT=".exe"
-
-    LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\""
-    ;;
-  darwin*|macosx*)
-    ;;
-  *)
-    LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\""
-    ;;
+  cygwin*|mingw32*) TOOLSEXT=".exe"
+ ;;
 esac
 
 MAIN_BINARY="wine"
diff --git a/configure.ac b/configure.ac
index d362611974e..5bbb5bf91d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1976,17 +1976,8 @@ AC_DEFINE([__ASM_STDCALL_FUNC(name,args,code)],[__ASM_DEFINE_FUNC(name,__ASM_STD
 
 dnl **** Platform-specific checks ****
 
-AC_SUBST(LDPATH,"")
 case $build_os in
-  cygwin*|mingw32*)
-    AC_SUBST(TOOLSEXT,".exe")
-    LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\""
-    ;;
-  darwin*|macosx*)
-    ;;
-  *)
-    LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\""
-    ;;
+  cygwin*|mingw32*) AC_SUBST(TOOLSEXT,".exe") ;;
 esac
 
 AC_SUBST(MAIN_BINARY,"wine")
diff --git a/fonts/Makefile.in b/fonts/Makefile.in
index 556ed0cdb10..07177caf3de 100644
--- a/fonts/Makefile.in
+++ b/fonts/Makefile.in
@@ -66,154 +66,154 @@ all: $(FONTS)
 @MAKE_RULES@
 
 coure.fon: courier.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1252,8
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1252,8
 
 couree.fon: courier.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1250,8
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1250,8
 
 courer.fon: courier.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1251,8
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1251,8
 
 coureg.fon: courier.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1253,8
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1253,8
 
 couret.fon: courier.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1254,8
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1254,8
 
 coue1255.fon: courier.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1255,8
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1255,8
 
 coue1256.fon: courier.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1256,8
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1256,8
 
 coue1257.fon: courier.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1257,8
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1257,8
 
 vgafix.fon: fixedsys.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/fixedsys.ttf 15,1252,8
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/fixedsys.ttf 15,1252,8
 
 jvgafix.fon: fixedsys_jp.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 160 $(srcdir)/fixedsys_jp.ttf 18,932,8
+	$(SFNT2FNT) -o $@ -d 160 $(srcdir)/fixedsys_jp.ttf 18,932,8
 
 sserife.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8
+	$(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8
 
 sseriff.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1252,7 20,1252,8
+	$(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1252,7 20,1252,8
 
 sserifee.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1250,5 16,1250,7
+	$(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1250,5 16,1250,7
 
 sseriffe.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1250,7
+	$(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1250,7
 
 sserifer.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1251,5 16,1251,7 20,1251,8
+	$(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1251,5 16,1251,7 20,1251,8
 
 sseriffr.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1251,7 20,1251,8
+	$(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1251,7 20,1251,8
 
 sserifeg.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1253,5 16,1253,7 20,1253,8
+	$(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1253,5 16,1253,7 20,1253,8
 
 sseriffg.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1253,7 20,1253,8
+	$(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1253,7 20,1253,8
 
 sserifet.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1254,5 16,1254,7 20,1254,8
+	$(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1254,5 16,1254,7 20,1254,8
 
 sserifft.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1254,7 20,1254,8
+	$(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1254,7 20,1254,8
 
 ssee1255.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1255,5 16,1255,7 20,1255,8
+	$(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1255,5 16,1255,7 20,1255,8
 
 ssef1255.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1255,7 20,1255,8
+	$(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1255,7 20,1255,8
 
 ssee1256.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1256,5 16,1256,7 20,1256,8
+	$(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1256,5 16,1256,7 20,1256,8
 
 ssef1256.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1256,7 20,1256,8
+	$(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1256,7 20,1256,8
 
 ssee1257.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1257,5 16,1257,7 20,1257,8
+	$(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1257,5 16,1257,7 20,1257,8
 
 ssef1257.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1257,7 20,1257,8
+	$(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1257,7 20,1257,8
 
 ssee874.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,874,5 16,874,7 20,874,8
+	$(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,874,5 16,874,7 20,874,8
 
 ssef874.fon: ms_sans_serif.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,874,7 20,874,8
+	$(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,874,7 20,874,8
 
 smalle.fon: small_fonts.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1252,5
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1252,5
 
 smallee.fon: small_fonts.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1250,5
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1250,5
 
 smaller.fon: small_fonts.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1251,5
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1251,5
 
 smalleg.fon: small_fonts.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1253,5
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1253,5
 
 smallet.fon: small_fonts.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1254,5
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1254,5
 
 smae1255.fon: small_fonts.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1255,5
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1255,5
 
 smae1256.fon: small_fonts.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1256,5
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1256,5
 
 smae1257.fon: small_fonts.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1257,5
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1257,5
 
 jsmalle.fon: small_fonts_jp.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts_jp.ttf 11,932,7
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts_jp.ttf 11,932,7
 
 vgasys.fon: system.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1252,7
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1252,7
 
 vgasyse.fon: system.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1250,7
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1250,7
 
 vgasysr.fon: system.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1251,7
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1251,7
 
 vgasysg.fon: system.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1253,7
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1253,7
 
 vgasyst.fon: system.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1254,7
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1254,7
 
 vgas1255.fon: system.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1255,7
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1255,7
 
 vgas1256.fon: system.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1256,7
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1256,7
 
 vgas1257.fon: system.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1257,7
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1257,7
 
 vgas874.fon: system.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,874,7
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,874,7
 
 jvgasys.fon: system.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 18,932,8
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 18,932,8
 
 svgasys.fon: system.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,936,7 16,1252,7
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,936,7 16,1252,7
 
 hvgasys.fon: system.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,949,7
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,949,7
 
 cvgasys.fon: system.ttf
-	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,950,7 16,1252,7
+	$(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,950,7 16,1252,7
 
 $(BITMAP_FONTS): $(SFNT2FNT)
 
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index 57bea4316c2..be5351e3030 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -122,6 +122,11 @@ version.c: dummy
 $(RELPATH):
 	@cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT)
 
+all: libwine_static.a
+
+libwine_static.a: $(OBJS) Makefile.in
+	$(AR) $(ARFLAGS) $@ $(OBJS)
+
 # Make sure that make_makefiles sees the generated rules
 install install-lib::
 install install-dev::
diff --git a/tools/Makefile.in b/tools/Makefile.in
index d9aad04a08f..91446d62bd7 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,4 +1,4 @@
-DEFS      = -D__WINESRC__ $(EXTRADEFS)
+DEFS      = -D__WINESRC__ -DWINE_UNICODE_API=""
 EXTRAINCL = @FREETYPE_CFLAGS@
 FREETYPELIBS = @FREETYPE_LIBS@
 
@@ -57,7 +57,7 @@ relpath$(EXEEXT): relpath.o
 	$(CC) $(CFLAGS) -o $@ relpath.o $(LIBPORT) $(LDFLAGS)
 
 sfnt2fnt$(EXEEXT): sfnt2fnt.o relpath$(EXEEXT)
-	$(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS) $(LDRPATH_LOCAL)
+	$(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE_STATIC) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS)
 
 wine.inf: wine.inf.in
 	LC_ALL=C sed -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(srcdir)/wine.inf.in >$@ || ($(RM) $@ && false)
diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in
index fc079f7cada..324ab5154f8 100644
--- a/tools/wmc/Makefile.in
+++ b/tools/wmc/Makefile.in
@@ -1,7 +1,7 @@
-DEFS     = -D__WINESRC__ $(EXTRADEFS)
-PROGRAMS = wmc$(EXEEXT) wmc-installed
+DEFS     = -D__WINESRC__ -DWINE_UNICODE_API=""
+PROGRAMS = wmc$(EXEEXT)
 MANPAGE  = wmc.man
-ALL_LIBS = @LIBGETTEXTPO@ $(LIBWINE) $(LIBPORT)
+ALL_LIBS = @LIBGETTEXTPO@ $(LIBWINE_STATIC) $(LIBPORT)
 
 C_SRCS = \
 	lang.c \
@@ -20,13 +20,10 @@ all: $(PROGRAMS)
 @MAKE_RULES@
 
 wmc$(EXEEXT): $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_LOCAL)
+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS)
 
-wmc-installed: $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_INSTALL)
-
-install install-dev:: wmc-installed $(DESTDIR)$(bindir) install-man-pages
-	$(INSTALL_PROGRAM) wmc-installed $(DESTDIR)$(bindir)/wmc$(EXEEXT)
+install install-dev:: wmc$(EXEEXT) $(DESTDIR)$(bindir) install-man-pages
+	$(INSTALL_PROGRAM) wmc$(EXEEXT) $(DESTDIR)$(bindir)/wmc$(EXEEXT)
 
 uninstall::
 	$(RM) $(DESTDIR)$(bindir)/wmc$(EXEEXT)
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index 6347dc1145a..2ed045359f7 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -1,7 +1,7 @@
-DEFS      = -D__WINESRC__ -DINCLUDEDIR="\"$(includedir)\"" $(EXTRADEFS)
-PROGRAMS = wrc$(EXEEXT) wrc-installed
+DEFS     = -D__WINESRC__ -DINCLUDEDIR="\"$(includedir)\"" -DWINE_UNICODE_API=""
+PROGRAMS = wrc$(EXEEXT)
 MANPAGE  = wrc.man
-ALL_LIBS = @LIBGETTEXTPO@ $(LIBWPP) $(LIBWINE) $(LIBPORT)
+ALL_LIBS = @LIBGETTEXTPO@ $(LIBWPP) $(LIBWINE_STATIC) $(LIBPORT)
 
 C_SRCS = \
 	dumpres.c \
@@ -24,13 +24,10 @@ all: $(PROGRAMS)
 @MAKE_RULES@
 
 wrc$(EXEEXT): $(OBJS) $(LIBWPP)
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_LOCAL)
+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS)
 
-wrc-installed: $(OBJS) $(LIBWPP)
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_INSTALL)
-
-install install-dev:: wrc-installed $(DESTDIR)$(bindir) install-man-pages
-	$(INSTALL_PROGRAM) wrc-installed $(DESTDIR)$(bindir)/wrc$(EXEEXT)
+install install-dev:: wrc$(EXEEXT) $(DESTDIR)$(bindir) install-man-pages
+	$(INSTALL_PROGRAM) wrc$(EXEEXT) $(DESTDIR)$(bindir)/wrc$(EXEEXT)
 
 uninstall::
 	$(RM) $(DESTDIR)$(bindir)/wrc$(EXEEXT)