diff --git a/Make.rules.in b/Make.rules.in
index 7da0e29a0f..6cbf7a79bd 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -68,6 +68,7 @@ WIDL = $(TOOLSDIR)/tools/widl/widl
WRCFLAGS = --nostdinc $(INCLUDES) $(EXTRAWRCFLAGS)
LDPATH = @LDPATH@
DLLDIR = $(TOPOBJDIR)/dlls
+LIBDIR = $(TOPOBJDIR)/libs
LIBPORT = -L$(TOPOBJDIR)/libs/port -lwine_port
LIBUNICODE = -L$(TOPOBJDIR)/libs/unicode -lwine_unicode
LIBUUID = -L$(TOPOBJDIR)/libs/uuid -lwine_uuid
diff --git a/configure b/configure
index d052d5ff75..0b988e33ed 100755
--- a/configure
+++ b/configure
@@ -16076,7 +16076,7 @@ MAKE_LIB_RULES=libs/Makelib.rules
MAKE_PROG_RULES=programs/Makeprog.rules
- ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrtd/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/winejack/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/uuid/Makefile libs/wine/Makefile miscemu/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile"
+ ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrtd/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/winejack/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/uuid/Makefile libs/wine/Makefile libs/wpp/Makefile miscemu/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wrc/Makefile"
cat >confcache <<\_ACEOF
@@ -16750,6 +16750,7 @@ do
"libs/unicode/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/unicode/Makefile" ;;
"libs/uuid/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/uuid/Makefile" ;;
"libs/wine/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/wine/Makefile" ;;
+ "libs/wpp/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/wpp/Makefile" ;;
"miscemu/Makefile" ) CONFIG_FILES="$CONFIG_FILES miscemu/Makefile" ;;
"programs/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/Makefile" ;;
"programs/avitools/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/avitools/Makefile" ;;
@@ -16787,7 +16788,6 @@ do
"tools/winebuild/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/winebuild/Makefile" ;;
"tools/winedump/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/winedump/Makefile" ;;
"tools/wmc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wmc/Makefile" ;;
- "tools/wpp/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wpp/Makefile" ;;
"tools/wrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wrc/Makefile" ;;
"controls" ) CONFIG_COMMANDS="$CONFIG_COMMANDS controls" ;;
"dlls/ddraw/d3ddevice" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/d3ddevice" ;;
diff --git a/configure.ac b/configure.ac
index a24e6dd0f8..f6012e90d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1500,6 +1500,7 @@ libs/port/Makefile
libs/unicode/Makefile
libs/uuid/Makefile
libs/wine/Makefile
+libs/wpp/Makefile
miscemu/Makefile
programs/Makefile
programs/avitools/Makefile
@@ -1537,7 +1538,6 @@ tools/winapi/Makefile
tools/winebuild/Makefile
tools/winedump/Makefile
tools/wmc/Makefile
-tools/wpp/Makefile
tools/wrc/Makefile])
AC_OUTPUT
diff --git a/tools/wpp/wpp.h b/include/wine/wpp.h
similarity index 100%
rename from tools/wpp/wpp.h
rename to include/wine/wpp.h
diff --git a/libs/Makefile.in b/libs/Makefile.in
index 16c30ea68d..fde696549c 100644
--- a/libs/Makefile.in
+++ b/libs/Makefile.in
@@ -8,22 +8,58 @@ SUBDIRS = \
port \
unicode \
uuid \
- wine
+ wine \
+ wpp
INSTALLSUBDIRS = \
unicode \
uuid \
wine
+SYMLINKS = \
+ libwine.$(LIBEXT) \
+ libwine_port.a \
+ libwine_unicode.$(LIBEXT) \
+ libwine_uuid.a \
+ libwpp.a
+
@MAKE_RULES@
-all: $(SUBDIRS)
+ALL_SYMLINKS = $(SYMLINKS) $(SYMLINKS:.so=.so.1) $(SYMLINKS:.dll=.a)
+
+all: $(SUBDIRS) $(ALL_SYMLINKS)
install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__)
install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__)
-# Inter-dll dependencies
+clean::
+ $(RM) $(ALL_SYMLINKS)
-wine wine/__install__ wine/__install-lib__: port
+# Symlinks
+
+libwine.so libwine.so.1 libwine.dll libwine.a: wine/libwine.$(LIBEXT)
+ $(RM) $@ && $(LN_S) wine/$@ $@
+
+libwine_unicode.so libwine_unicode.so.1 libwine_unicode.dll libwine_unicode.a: unicode/libwine_unicode.$(LIBEXT)
+ $(RM) $@ && $(LN_S) unicode/$@ $@
+
+libwine_port.a: port/libwine_port.a
+ $(RM) $@ && $(LN_S) port/$@ $@
+
+libwine_uuid.a: uuid/libwine_uuid.a
+ $(RM) $@ && $(LN_S) uuid/$@ $@
+
+libwpp.a: wpp/libwpp.a
+ $(RM) $@ && $(LN_S) wpp/$@ $@
+
+# Directory dependencies
+
+wine/libwine.$(LIBEXT): wine
+unicode/libwine_unicode.$(LIBEXT): unicode
+port/libwine_port.a: port
+uuid/libwine_uuid.a: uuid
+wpp/libwpp.a: wpp
+
+wine wine/__install__ wine/__install-lib__: libwine_port.a
### Dependencies:
diff --git a/tools/wpp/.cvsignore b/libs/wpp/.cvsignore
similarity index 100%
rename from tools/wpp/.cvsignore
rename to libs/wpp/.cvsignore
diff --git a/tools/wpp/Makefile.in b/libs/wpp/Makefile.in
similarity index 90%
rename from tools/wpp/Makefile.in
rename to libs/wpp/Makefile.in
index 311ac22e77..09ffbe122d 100644
--- a/tools/wpp/Makefile.in
+++ b/libs/wpp/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
LEXOPT = -Cf #-w -b
YACCOPT = #-v
-MODULE = none
+MODULE = libwpp.a
C_SRCS = \
preproc.c \
@@ -13,11 +13,11 @@ C_SRCS = \
EXTRA_SRCS = ppy.y ppl.l
EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o
-all: libwpp.a
+all: $(MODULE)
@MAKE_RULES@
-libwpp.a: $(OBJS)
+$(MODULE): $(OBJS)
$(RM) $@
$(AR) $@ $(OBJS)
$(RANLIB) $@
diff --git a/tools/wpp/ppl.l b/libs/wpp/ppl.l
similarity index 100%
rename from tools/wpp/ppl.l
rename to libs/wpp/ppl.l
diff --git a/tools/wpp/ppy.y b/libs/wpp/ppy.y
similarity index 100%
rename from tools/wpp/ppy.y
rename to libs/wpp/ppy.y
diff --git a/tools/wpp/preproc.c b/libs/wpp/preproc.c
similarity index 100%
rename from tools/wpp/preproc.c
rename to libs/wpp/preproc.c
diff --git a/tools/wpp/wpp.c b/libs/wpp/wpp.c
similarity index 99%
rename from tools/wpp/wpp.c
rename to libs/wpp/wpp.c
index 04a98ab3a1..0cbc538b09 100644
--- a/tools/wpp/wpp.c
+++ b/libs/wpp/wpp.c
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include "wpp_private.h"
-#include "wpp.h"
+#include "wine/wpp.h"
int ppdebug;
diff --git a/tools/wpp/wpp_private.h b/libs/wpp/wpp_private.h
similarity index 100%
rename from tools/wpp/wpp_private.h
rename to libs/wpp/wpp_private.h
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 2839048139..c608f986e3 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -24,7 +24,6 @@ SUBDIRS = \
winebuild \
winedump \
wmc \
- wpp \
wrc
INSTALLSUBDIRS = $(SUBDIRS)
@@ -37,8 +36,6 @@ all: $(PROGRAMS) $(SUBDIRS)
@MAKE_RULES@
-widl wrc: wpp
-
makedep: makedep.o
$(CC) $(CFLAGS) -o makedep makedep.o
diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
index 262f264caa..ea9c150ff4 100644
--- a/tools/widl/Makefile.in
+++ b/tools/widl/Makefile.in
@@ -5,7 +5,6 @@ VPATH = @srcdir@
LEXOPT = -Cf #-w -b
YACCOPT = #-v
EXEEXT = @EXEEXT@
-EXTRALIBS = -L$(TOPOBJDIR)/tools/wpp -lwpp
PROGRAMS = widl$(EXEEXT)
MODULE = none
@@ -23,8 +22,8 @@ all: $(PROGRAMS)
@MAKE_RULES@
-widl$(EXEEXT): $(OBJS) $(TOPOBJDIR)/tools/wpp/libwpp.a
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(LIBPORT) $(LEXLIB) $(LDFLAGS)
+widl$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a
+ $(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_port $(LEXLIB) $(LDFLAGS)
y.tab.c y.tab.h: parser.y
$(YACC) $(YACCOPT) -d -t $(SRCDIR)/parser.y
diff --git a/tools/widl/parser.l b/tools/widl/parser.l
index 5e9217a1ef..09167a2268 100644
--- a/tools/widl/parser.l
+++ b/tools/widl/parser.l
@@ -48,7 +48,7 @@ uuid {hexd}{8}-{hexd}{4}-{hexd}{4}-{hexd}{4}-{hexd}{12}
#include "widl.h"
#include "utils.h"
#include "parser.h"
-#include "../wpp/wpp.h"
+#include "wine/wpp.h"
#include "y.tab.h"
diff --git a/tools/widl/widl.c b/tools/widl/widl.c
index 718bb609a4..ccf849da96 100644
--- a/tools/widl/widl.c
+++ b/tools/widl/widl.c
@@ -37,7 +37,7 @@
#include "utils.h"
#include "parser.h"
#include "proxy.h"
-#include "../wpp/wpp.h"
+#include "wine/wpp.h"
/* future options to reserve characters for: */
/* a = alignment of structures */
diff --git a/tools/winewrapper b/tools/winewrapper
index 8cda5b2201..1ac2dd6555 100755
--- a/tools/winewrapper
+++ b/tools/winewrapper
@@ -64,9 +64,9 @@ topdir=`cd "$topdir" && pwd`
if [ -n "$LD_LIBRARY_PATH" ]
then
- LD_LIBRARY_PATH="$topdir/dlls:$topdir/libs/wine:$topdir/libs/unicode:$LD_LIBRARY_PATH"
+ LD_LIBRARY_PATH="$topdir/dlls:$topdir/libs:$LD_LIBRARY_PATH"
else
- LD_LIBRARY_PATH="$topdir/dlls:$topdir/libs/wine:$topdir/libs/unicode"
+ LD_LIBRARY_PATH="$topdir/dlls:$topdir/libs"
fi
WINEDLLPATH="$topdir/dlls:$topdir/programs"
WINESERVER="$topdir/server/wineserver"
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index e7b9f4eee6..9f2c46ef13 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -6,7 +6,6 @@ VPATH = @srcdir@
LEXOPT = -Cf #-w -b
YACCOPT = #-v
EXEEXT = @EXEEXT@
-EXTRALIBS = -L$(TOPOBJDIR)/tools/wpp -lwpp
PROGRAMS = wrc$(EXEEXT)
MODULE = none
@@ -27,8 +26,8 @@ all: $(PROGRAMS)
@MAKE_RULES@
-wrc$(EXEEXT): $(OBJS) $(TOPOBJDIR)/tools/wpp/libwpp.a
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(LIBUNICODE) $(LIBPORT) $(LEXLIB) $(LDFLAGS)
+wrc$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a
+ $(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_unicode -lwine_port $(LEXLIB) $(LDFLAGS)
y.tab.c y.tab.h: parser.y
$(YACC) $(YACCOPT) -d -t $(SRCDIR)/parser.y
diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index 1103e86496..87f3499079 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -136,7 +136,7 @@
#include "utils.h"
#include "newstruc.h"
#include "dumpres.h"
-#include "../wpp/wpp.h"
+#include "wine/wpp.h"
#include "parser.h"
#include "windef.h"
#include "winbase.h"
diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c
index 358854e61f..dde18d947e 100644
--- a/tools/wrc/wrc.c
+++ b/tools/wrc/wrc.c
@@ -42,7 +42,7 @@
#include "genres.h"
#include "newstruc.h"
#include "parser.h"
-#include "../wpp/wpp.h"
+#include "wine/wpp.h"
#ifndef INCLUDEDIR
#define INCLUDEDIR "/usr/local/include/wine"