x11drv: Renamed the x11drv directory to winex11.drv.
diff --git a/configure b/configure
index 7f2ef1e..c605667 100755
--- a/configure
+++ b/configure
@@ -21221,7 +21221,7 @@
MAKE_PROG_RULES=programs/Makeprog.rules
-ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/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/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/hlink/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/rasapi32/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile dlls/wineps.drv/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/tests/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winecoreaudio/Makefile dlls/winmm/wineesd/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile dlls/x11drv/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile"
+ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/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/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/hlink/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/rasapi32/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile dlls/wineps.drv/Makefile dlls/winex11.drv/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/tests/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winecoreaudio/Makefile dlls/winmm/wineesd/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile"
cat >confcache <<\_ACEOF
@@ -21991,6 +21991,7 @@
"dlls/winedos/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winedos/Makefile" ;;
"dlls/winemp3.acm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winemp3.acm/Makefile" ;;
"dlls/wineps.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wineps.drv/Makefile" ;;
+ "dlls/winex11.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winex11.drv/Makefile" ;;
"dlls/wininet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/Makefile" ;;
"dlls/wininet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/tests/Makefile" ;;
"dlls/winmm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/Makefile" ;;
@@ -22016,7 +22017,6 @@
"dlls/ws2_32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ws2_32/tests/Makefile" ;;
"dlls/wsock32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wsock32/Makefile" ;;
"dlls/wtsapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wtsapi32/Makefile" ;;
- "dlls/x11drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/x11drv/Makefile" ;;
"documentation/Makefile") CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;;
"fonts/Makefile") CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index d6295b1..86374b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1740,6 +1740,7 @@
dlls/winedos/Makefile
dlls/winemp3.acm/Makefile
dlls/wineps.drv/Makefile
+dlls/winex11.drv/Makefile
dlls/wininet/Makefile
dlls/wininet/tests/Makefile
dlls/winmm/Makefile
@@ -1765,7 +1766,6 @@
dlls/ws2_32/tests/Makefile
dlls/wsock32/Makefile
dlls/wtsapi32/Makefile
-dlls/x11drv/Makefile
documentation/Makefile
fonts/Makefile
include/Makefile
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 0462978..289fc5b 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -10,7 +10,7 @@
GLU32FILES = glu32
GLUT32FILES = glut32
OPENGLFILES = opengl32 wined3d
-XFILES = x11drv
+XFILES = winex11.drv
EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@
# Subdir list
@@ -207,7 +207,7 @@
glut32 \
opengl32 \
wined3d \
- x11drv
+ winex11.drv
BUILDSUBDIRS = $(BASEDIRS) $(EXTRADIRS)
@@ -269,7 +269,6 @@
wprocs.dll16
SYMLINKS_SO = \
- $(XFILES:%=%.dll.so) \
@WIN16_FILES@ \
gdi32.dll.so \
joystick.drv.so \
@@ -294,9 +293,6 @@
symlinks: $(BUILDSUBDIRS)
-x11drv.dll.so: winex11.drv.so
- $(RM) $@ && $(LN_S) winex11.drv.so $@
-
# Map symlink name to the corresponding library
gdi32.dll.so: gdi/gdi32.dll.so
@@ -335,9 +331,6 @@
wineoss.drv.so: winmm/wineoss/wineoss.drv.so
$(RM) $@ && $(LN_S) winmm/wineoss/wineoss.drv.so $@
-winex11.drv.so: x11drv/winex11.drv.so
- $(RM) $@ && $(LN_S) x11drv/winex11.drv.so $@
-
# Placeholders for 16-bit libraries
avifile.dll16:
@@ -927,7 +920,6 @@
winmm/winejack/winejack.drv.so: winmm/winejack
winmm/winenas/winenas.drv.so: winmm/winenas
winmm/wineoss/wineoss.drv.so: winmm/wineoss
-x11drv/winex11.drv.so: x11drv
dxerr8/libdxerr8.a: dxerr8
dxerr9/libdxerr9.a: dxerr9
dxguid/libdxguid.a: dxguid
diff --git a/dlls/make_dlls b/dlls/make_dlls
index 1295235..3f60d94 100755
--- a/dlls/make_dlls
+++ b/dlls/make_dlls
@@ -37,7 +37,7 @@
"glut32" => "GLUT32FILES",
"opengl32" => "OPENGLFILES",
"wined3d" => "OPENGLFILES",
- "x11drv" => "XFILES"
+ "winex11.drv" => "XFILES"
);
sub needs_symlink($)
@@ -190,7 +190,6 @@
print NEWMAKE <<EOF;
SYMLINKS_SO = \\
- \$(XFILES:%=%.dll.so) \\
\@WIN16_FILES\@ \\
EOF
printf NEWMAKE "\t%s\n", join( " \\\n\t", sort keys %targets );
@@ -207,9 +206,6 @@
symlinks: \$(BUILDSUBDIRS)
-x11drv.dll.so: winex11.drv.so
- \$(RM) \$@ && \$(LN_S) winex11.drv.so \$@
-
EOF
################################################################
diff --git a/dlls/x11drv/.gitignore b/dlls/winex11.drv/.gitignore
similarity index 100%
rename from dlls/x11drv/.gitignore
rename to dlls/winex11.drv/.gitignore
diff --git a/dlls/x11drv/Makefile.in b/dlls/winex11.drv/Makefile.in
similarity index 100%
rename from dlls/x11drv/Makefile.in
rename to dlls/winex11.drv/Makefile.in
diff --git a/dlls/x11drv/bitblt.c b/dlls/winex11.drv/bitblt.c
similarity index 100%
rename from dlls/x11drv/bitblt.c
rename to dlls/winex11.drv/bitblt.c
diff --git a/dlls/x11drv/bitmap.c b/dlls/winex11.drv/bitmap.c
similarity index 100%
rename from dlls/x11drv/bitmap.c
rename to dlls/winex11.drv/bitmap.c
diff --git a/dlls/x11drv/brush.c b/dlls/winex11.drv/brush.c
similarity index 100%
rename from dlls/x11drv/brush.c
rename to dlls/winex11.drv/brush.c
diff --git a/dlls/x11drv/clipboard.c b/dlls/winex11.drv/clipboard.c
similarity index 100%
rename from dlls/x11drv/clipboard.c
rename to dlls/winex11.drv/clipboard.c
diff --git a/dlls/x11drv/clipping.c b/dlls/winex11.drv/clipping.c
similarity index 100%
rename from dlls/x11drv/clipping.c
rename to dlls/winex11.drv/clipping.c
diff --git a/dlls/x11drv/codepage.c b/dlls/winex11.drv/codepage.c
similarity index 100%
rename from dlls/x11drv/codepage.c
rename to dlls/winex11.drv/codepage.c
diff --git a/dlls/x11drv/dce.c b/dlls/winex11.drv/dce.c
similarity index 100%
rename from dlls/x11drv/dce.c
rename to dlls/winex11.drv/dce.c
diff --git a/dlls/x11drv/desktop.c b/dlls/winex11.drv/desktop.c
similarity index 100%
rename from dlls/x11drv/desktop.c
rename to dlls/winex11.drv/desktop.c
diff --git a/dlls/x11drv/dga2.c b/dlls/winex11.drv/dga2.c
similarity index 100%
rename from dlls/x11drv/dga2.c
rename to dlls/winex11.drv/dga2.c
diff --git a/dlls/x11drv/dga2.h b/dlls/winex11.drv/dga2.h
similarity index 100%
rename from dlls/x11drv/dga2.h
rename to dlls/winex11.drv/dga2.h
diff --git a/dlls/x11drv/dib.c b/dlls/winex11.drv/dib.c
similarity index 100%
rename from dlls/x11drv/dib.c
rename to dlls/winex11.drv/dib.c
diff --git a/dlls/x11drv/dib_convert.c b/dlls/winex11.drv/dib_convert.c
similarity index 100%
rename from dlls/x11drv/dib_convert.c
rename to dlls/winex11.drv/dib_convert.c
diff --git a/dlls/x11drv/dib_dst_swap.c b/dlls/winex11.drv/dib_dst_swap.c
similarity index 100%
rename from dlls/x11drv/dib_dst_swap.c
rename to dlls/winex11.drv/dib_dst_swap.c
diff --git a/dlls/x11drv/dib_src_swap.c b/dlls/winex11.drv/dib_src_swap.c
similarity index 100%
rename from dlls/x11drv/dib_src_swap.c
rename to dlls/winex11.drv/dib_src_swap.c
diff --git a/dlls/x11drv/event.c b/dlls/winex11.drv/event.c
similarity index 100%
rename from dlls/x11drv/event.c
rename to dlls/winex11.drv/event.c
diff --git a/dlls/x11drv/graphics.c b/dlls/winex11.drv/graphics.c
similarity index 100%
rename from dlls/x11drv/graphics.c
rename to dlls/winex11.drv/graphics.c
diff --git a/dlls/x11drv/init.c b/dlls/winex11.drv/init.c
similarity index 100%
rename from dlls/x11drv/init.c
rename to dlls/winex11.drv/init.c
diff --git a/dlls/x11drv/keyboard.c b/dlls/winex11.drv/keyboard.c
similarity index 100%
rename from dlls/x11drv/keyboard.c
rename to dlls/winex11.drv/keyboard.c
diff --git a/dlls/x11drv/mouse.c b/dlls/winex11.drv/mouse.c
similarity index 100%
rename from dlls/x11drv/mouse.c
rename to dlls/winex11.drv/mouse.c
diff --git a/dlls/x11drv/mwm.h b/dlls/winex11.drv/mwm.h
similarity index 100%
rename from dlls/x11drv/mwm.h
rename to dlls/winex11.drv/mwm.h
diff --git a/dlls/x11drv/opengl.c b/dlls/winex11.drv/opengl.c
similarity index 100%
rename from dlls/x11drv/opengl.c
rename to dlls/winex11.drv/opengl.c
diff --git a/dlls/x11drv/palette.c b/dlls/winex11.drv/palette.c
similarity index 100%
rename from dlls/x11drv/palette.c
rename to dlls/winex11.drv/palette.c
diff --git a/dlls/x11drv/pen.c b/dlls/winex11.drv/pen.c
similarity index 100%
rename from dlls/x11drv/pen.c
rename to dlls/winex11.drv/pen.c
diff --git a/dlls/x11drv/scroll.c b/dlls/winex11.drv/scroll.c
similarity index 100%
rename from dlls/x11drv/scroll.c
rename to dlls/winex11.drv/scroll.c
diff --git a/dlls/x11drv/settings.c b/dlls/winex11.drv/settings.c
similarity index 100%
rename from dlls/x11drv/settings.c
rename to dlls/winex11.drv/settings.c
diff --git a/dlls/x11drv/text.c b/dlls/winex11.drv/text.c
similarity index 100%
rename from dlls/x11drv/text.c
rename to dlls/winex11.drv/text.c
diff --git a/dlls/x11drv/window.c b/dlls/winex11.drv/window.c
similarity index 100%
rename from dlls/x11drv/window.c
rename to dlls/winex11.drv/window.c
diff --git a/dlls/x11drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec
similarity index 100%
rename from dlls/x11drv/winex11.drv.spec
rename to dlls/winex11.drv/winex11.drv.spec
diff --git a/dlls/x11drv/winpos.c b/dlls/winex11.drv/winpos.c
similarity index 100%
rename from dlls/x11drv/winpos.c
rename to dlls/winex11.drv/winpos.c
diff --git a/dlls/x11drv/wintab.c b/dlls/winex11.drv/wintab.c
similarity index 100%
rename from dlls/x11drv/wintab.c
rename to dlls/winex11.drv/wintab.c
diff --git a/dlls/x11drv/x11ddraw.c b/dlls/winex11.drv/x11ddraw.c
similarity index 100%
rename from dlls/x11drv/x11ddraw.c
rename to dlls/winex11.drv/x11ddraw.c
diff --git a/dlls/x11drv/x11ddraw.h b/dlls/winex11.drv/x11ddraw.h
similarity index 100%
rename from dlls/x11drv/x11ddraw.h
rename to dlls/winex11.drv/x11ddraw.h
diff --git a/dlls/x11drv/x11drv.h b/dlls/winex11.drv/x11drv.h
similarity index 100%
rename from dlls/x11drv/x11drv.h
rename to dlls/winex11.drv/x11drv.h
diff --git a/dlls/x11drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
similarity index 100%
rename from dlls/x11drv/x11drv_main.c
rename to dlls/winex11.drv/x11drv_main.c
diff --git a/dlls/x11drv/x11font.h b/dlls/winex11.drv/x11font.h
similarity index 100%
rename from dlls/x11drv/x11font.h
rename to dlls/winex11.drv/x11font.h
diff --git a/dlls/x11drv/xdnd.c b/dlls/winex11.drv/xdnd.c
similarity index 100%
rename from dlls/x11drv/xdnd.c
rename to dlls/winex11.drv/xdnd.c
diff --git a/dlls/x11drv/xfont.c b/dlls/winex11.drv/xfont.c
similarity index 100%
rename from dlls/x11drv/xfont.c
rename to dlls/winex11.drv/xfont.c
diff --git a/dlls/x11drv/xim.c b/dlls/winex11.drv/xim.c
similarity index 100%
rename from dlls/x11drv/xim.c
rename to dlls/winex11.drv/xim.c
diff --git a/dlls/x11drv/xrandr.c b/dlls/winex11.drv/xrandr.c
similarity index 100%
rename from dlls/x11drv/xrandr.c
rename to dlls/winex11.drv/xrandr.c
diff --git a/dlls/x11drv/xrandr.h b/dlls/winex11.drv/xrandr.h
similarity index 100%
rename from dlls/x11drv/xrandr.h
rename to dlls/winex11.drv/xrandr.h
diff --git a/dlls/x11drv/xrender.c b/dlls/winex11.drv/xrender.c
similarity index 100%
rename from dlls/x11drv/xrender.c
rename to dlls/winex11.drv/xrender.c
diff --git a/dlls/x11drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c
similarity index 100%
rename from dlls/x11drv/xvidmode.c
rename to dlls/winex11.drv/xvidmode.c
diff --git a/dlls/x11drv/xvidmode.h b/dlls/winex11.drv/xvidmode.h
similarity index 100%
rename from dlls/x11drv/xvidmode.h
rename to dlls/winex11.drv/xvidmode.h
