Skip to content

W
wine-winehq
Commit d0893548 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Moved remaining files in windows/x11drv to dlls/x11drv.

parent 2f0d85c2
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 44 deletions
configure
View file @ d0893548
...@@ -12398,7 +12398,7 @@ MAKE_DLL_RULES=dlls/Makedll.rules ...@@ -12398,7 +12398,7 @@ MAKE_DLL_RULES=dlls/Makedll.rules
MAKE_PROG_RULES=programs/Makeprog.rules MAKE_PROG_RULES=programs/Makeprog.rules
ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules programs/Makeprog.rules Makefile controls/Makefile debugger/Makefile dlls/Makefile dlls/advapi32/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/gdi/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msg711/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/netapi32/Makefile dlls/ntdll/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/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/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/user/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/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/wavemap/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winspool/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile files/Makefile graphics/Makefile graphics/x11drv/Makefile if1632/Makefile include/Makefile library/Makefile libtest/Makefile loader/Makefile loader/ne/Makefile memory/Makefile misc/Makefile miscemu/Makefile msdos/Makefile objects/Makefile ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile programs/winemine/Makefile programs/winetest/Makefile programs/winhelp/Makefile programs/winver/Makefile relay32/Makefile scheduler/Makefile server/Makefile tools/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wrc/Makefile tsx11/Makefile unicode/Makefile win32/Makefile windows/Makefile windows/x11drv/Makefile" ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules programs/Makeprog.rules Makefile controls/Makefile debugger/Makefile dlls/Makefile dlls/advapi32/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/gdi/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msg711/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/netapi32/Makefile dlls/ntdll/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/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/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/user/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/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/wavemap/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winspool/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile files/Makefile graphics/Makefile graphics/x11drv/Makefile if1632/Makefile include/Makefile library/Makefile libtest/Makefile loader/Makefile loader/ne/Makefile memory/Makefile misc/Makefile miscemu/Makefile msdos/Makefile objects/Makefile ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile programs/winemine/Makefile programs/winetest/Makefile programs/winhelp/Makefile programs/winver/Makefile relay32/Makefile scheduler/Makefile server/Makefile tools/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wrc/Makefile tsx11/Makefile unicode/Makefile win32/Makefile windows/Makefile"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
...@@ -13019,7 +13019,6 @@ do ...@@ -13019,7 +13019,6 @@ do
"unicode/Makefile" ) CONFIG_FILES="$CONFIG_FILES unicode/Makefile" ;; "unicode/Makefile" ) CONFIG_FILES="$CONFIG_FILES unicode/Makefile" ;;
"win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;; "win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
"windows/Makefile" ) CONFIG_FILES="$CONFIG_FILES windows/Makefile" ;; "windows/Makefile" ) CONFIG_FILES="$CONFIG_FILES windows/Makefile" ;;
"windows/x11drv/Makefile" ) CONFIG_FILES="$CONFIG_FILES windows/x11drv/Makefile" ;;
"dlls/ddraw/d3ddevice" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/d3ddevice" ;; "dlls/ddraw/d3ddevice" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/d3ddevice" ;;
"dlls/ddraw/dclipper" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/dclipper" ;; "dlls/ddraw/dclipper" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/dclipper" ;;
"dlls/ddraw/ddraw" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/ddraw" ;; "dlls/ddraw/ddraw" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/ddraw" ;;
......
configure.ac
View file @ d0893548
...@@ -1385,8 +1385,7 @@ tools/wrc/Makefile ...@@ -1385,8 +1385,7 @@ tools/wrc/Makefile
tsx11/Makefile tsx11/Makefile
unicode/Makefile unicode/Makefile
win32/Makefile win32/Makefile
windows/Makefile windows/Makefile])
windows/x11drv/Makefile ])
AC_OUTPUT AC_OUTPUT
......
dlls/x11drv/.cvsignore
View file @ d0893548
Makefile Makefile
wineclipsrv
x11drv.spec.c x11drv.spec.c
dlls/x11drv/Makefile.in
View file @ d0893548
EXTRADEFS = -DBINDIR="\"$(bindir)\""
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
...@@ -8,7 +9,10 @@ IMPORTS = user32.dll gdi32.dll kernel32.dll ...@@ -8,7 +9,10 @@ IMPORTS = user32.dll gdi32.dll kernel32.dll
C_SRCS = \ C_SRCS = \
desktop.c \ desktop.c \
clipboard.c \
dga2.c \ dga2.c \
event.c \
keyboard.c \
mouse.c \ mouse.c \
scroll.c \ scroll.c \
window.c \ window.c \
...@@ -18,29 +22,29 @@ C_SRCS = \ ...@@ -18,29 +22,29 @@ C_SRCS = \
xrender.c \ xrender.c \
xvidmode.c xvidmode.c
PROGRAMS = \ PROGRAMS = wineclipsrv
$(TOPOBJDIR)/windows/x11drv/wineclipsrv
EXTRA_OBJS = \ EXTRA_OBJS = \
$(TOPOBJDIR)/graphics/x11drv/x11drv.o \ $(TOPOBJDIR)/graphics/x11drv/x11drv.o
$(TOPOBJDIR)/windows/x11drv/x11drv.o
SUBDIRS = \ SUBDIRS = \
$(TOPOBJDIR)/graphics/x11drv \ $(TOPOBJDIR)/graphics/x11drv
$(TOPOBJDIR)/windows/x11drv
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
all: $(PROGRAMS) all: $(PROGRAMS)
$(EXTRA_OBJS) $(PROGRAMS): dummy wineclipsrv: wineclipsrv.c
$(CC) $(ALLCFLAGS) -o wineclipsrv $(SRCDIR)/wineclipsrv.c $(X_LIBS) $(XLIB) $(LIBS)
$(EXTRA_OBJS): dummy
@cd `dirname $@` && $(MAKE) `basename $@` @cd `dirname $@` && $(MAKE) `basename $@`
install:: $(PROGRAMS) install_libdir install:: $(PROGRAMS) install_libdir
[ -d $(bindir) ] || $(MKDIR) $(bindir) [ -d $(bindir) ] || $(MKDIR) $(bindir)
$(INSTALL_PROGRAM) $(TOPOBJDIR)/windows/x11drv/wineclipsrv $(bindir)/wineclipsrv $(INSTALL_PROGRAM) wineclipsrv $(bindir)/wineclipsrv
uninstall:: uninstall_libdir uninstall:: uninstall_libdir
cd $(bindir) && $(RM) wineclipsrv $(RM) $(bindir)/wineclipsrv
### Dependencies: ### Dependencies:
documentation/configuring.sgml
View file @ d0893548
...@@ -1879,7 +1879,7 @@ OPTIONAL: ...@@ -1879,7 +1879,7 @@ OPTIONAL:
</para> </para>
<para> <para>
To do this, open the file To do this, open the file
<filename>windows/x11drv/keyboard.c</filename> and take a look <filename>dlls/x11drv/keyboard.c</filename> and take a look
at the existing tables. Make a backup copy of it, especially at the existing tables. Make a backup copy of it, especially
if you don't use CVS. if you don't use CVS.
</para> </para>
...@@ -2005,7 +2005,7 @@ wine --debugmsg +key,+keyboard >& key.log ...@@ -2005,7 +2005,7 @@ wine --debugmsg +key,+keyboard >& key.log
you will just have to do you will just have to do
</para> </para>
<screen> <screen>
cvs -z3 diff -u windows/x11drv/keyboard.c > layout.diff cvs -z3 diff -u dlls/x11drv/keyboard.c > layout.diff
</screen> </screen>
<para> <para>
from your main Wine directory, then submit from your main Wine directory, then submit
...@@ -2017,7 +2017,7 @@ cvs -z3 diff -u windows/x11drv/keyboard.c > layout.diff ...@@ -2017,7 +2017,7 @@ cvs -z3 diff -u windows/x11drv/keyboard.c > layout.diff
If you don't use CVS, you need to do If you don't use CVS, you need to do
</para> </para>
<screen> <screen>
diff -u the_backup_file_you_made windows/x11drv/keyboard.c > layout.diff diff -u the_backup_file_you_made dlls/x11drv/keyboard.c > layout.diff
</screen> </screen>
<para> <para>
and submit it as explained above. and submit it as explained above.
......
documentation/packaging.sgml
View file @ d0893548
...@@ -1307,7 +1307,7 @@ install -d $BR/usr/X11R6/lib/wine ...@@ -1307,7 +1307,7 @@ install -d $BR/usr/X11R6/lib/wine
mv $BR/usr/X11R6/lib/lib* $BR/usr/X11R6/lib/wine/ mv $BR/usr/X11R6/lib/lib* $BR/usr/X11R6/lib/wine/
# the clipboard server is started on demand. # the clipboard server is started on demand.
install -m 755 windows/x11drv/wineclipsrv $BR/usr/X11R6/bin/ install -m 755 dlls/x11drv/wineclipsrv $BR/usr/X11R6/bin/
# The WINE server is needed. # The WINE server is needed.
install -m 755 server/wineserver $BR/usr/X11R6/bin/ install -m 755 server/wineserver $BR/usr/X11R6/bin/
......
windows/x11drv/Makefile.in deleted 100644 → 0
View file @ 2f0d85c2
DEFS = @DLLFLAGS@ -D__WINE__ -DBINDIR="\"$(bindir)\""
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = x11drv
C_SRCS = \
clipboard.c \
event.c \
keyboard.c
PROGRAMS = wineclipsrv
all: $(MODULE).o $(PROGRAMS)
wineclipsrv: wineclipsrv.c
$(CC) $(ALLCFLAGS) -o wineclipsrv $(SRCDIR)/wineclipsrv.c $(X_LIBS) $(XLIB) $(LIBS)
@MAKE_RULES@
$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
$(LDCOMBINE) $(OBJS) -o $@
### Dependencies:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment