Moved remaining files in windows/x11drv to dlls/x11drv.
This commit is contained in:
Alexandre Julliard
parent
2f0d85c202
commit
d0893548e6
|
|
@ -12398,7 +12398,7 @@ MAKE_DLL_RULES=dlls/Makedll.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
|
||||
|
|
@ -13019,7 +13019,6 @@ do
|
|||
"unicode/Makefile" ) CONFIG_FILES="$CONFIG_FILES unicode/Makefile" ;;
|
||||
"win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/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/dclipper" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/dclipper" ;;
|
||||
"dlls/ddraw/ddraw" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/ddraw" ;;
|
||||
|
|
|
|||
|
|
@ -1385,8 +1385,7 @@ tools/wrc/Makefile
|
|||
tsx11/Makefile
|
||||
unicode/Makefile
|
||||
win32/Makefile
|
||||
windows/Makefile
|
||||
windows/x11drv/Makefile ])
|
||||
windows/Makefile])
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
Makefile
|
||||
wineclipsrv
|
||||
x11drv.spec.c
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
EXTRADEFS = -DBINDIR="\"$(bindir)\""
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ../..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
@ -8,7 +9,10 @@ IMPORTS = user32.dll gdi32.dll kernel32.dll
|
|||
|
||||
C_SRCS = \
|
||||
desktop.c \
|
||||
clipboard.c \
|
||||
dga2.c \
|
||||
event.c \
|
||||
keyboard.c \
|
||||
mouse.c \
|
||||
scroll.c \
|
||||
window.c \
|
||||
|
|
@ -18,29 +22,29 @@ C_SRCS = \
|
|||
xrender.c \
|
||||
xvidmode.c
|
||||
|
||||
PROGRAMS = \
|
||||
$(TOPOBJDIR)/windows/x11drv/wineclipsrv
|
||||
PROGRAMS = wineclipsrv
|
||||
|
||||
EXTRA_OBJS = \
|
||||
$(TOPOBJDIR)/graphics/x11drv/x11drv.o \
|
||||
$(TOPOBJDIR)/windows/x11drv/x11drv.o
|
||||
$(TOPOBJDIR)/graphics/x11drv/x11drv.o
|
||||
|
||||
SUBDIRS = \
|
||||
$(TOPOBJDIR)/graphics/x11drv \
|
||||
$(TOPOBJDIR)/windows/x11drv
|
||||
$(TOPOBJDIR)/graphics/x11drv
|
||||
|
||||
@MAKE_DLL_RULES@
|
||||
|
||||
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 $@`
|
||||
|
||||
install:: $(PROGRAMS) install_libdir
|
||||
[ -d $(bindir) ] || $(MKDIR) $(bindir)
|
||||
$(INSTALL_PROGRAM) $(TOPOBJDIR)/windows/x11drv/wineclipsrv $(bindir)/wineclipsrv
|
||||
$(INSTALL_PROGRAM) wineclipsrv $(bindir)/wineclipsrv
|
||||
|
||||
uninstall:: uninstall_libdir
|
||||
cd $(bindir) && $(RM) wineclipsrv
|
||||
$(RM) $(bindir)/wineclipsrv
|
||||
|
||||
### Dependencies:
|
||||
|
|
|
|||
|
|
@ -1879,7 +1879,7 @@ OPTIONAL:
|
|||
</para>
|
||||
<para>
|
||||
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
|
||||
if you don't use CVS.
|
||||
</para>
|
||||
|
|
@ -2005,7 +2005,7 @@ wine --debugmsg +key,+keyboard >& key.log
|
|||
you will just have to do
|
||||
</para>
|
||||
<screen>
|
||||
cvs -z3 diff -u windows/x11drv/keyboard.c > layout.diff
|
||||
cvs -z3 diff -u dlls/x11drv/keyboard.c > layout.diff
|
||||
</screen>
|
||||
<para>
|
||||
from your main Wine directory, then submit
|
||||
|
|
@ -2017,7 +2017,7 @@ cvs -z3 diff -u windows/x11drv/keyboard.c > layout.diff
|
|||
If you don't use CVS, you need to do
|
||||
</para>
|
||||
<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>
|
||||
<para>
|
||||
and submit it as explained above.
|
||||
|
|
|
|||
|
|
@ -1307,7 +1307,7 @@ install -d $BR/usr/X11R6/lib/wine
|
|||
mv $BR/usr/X11R6/lib/lib* $BR/usr/X11R6/lib/wine/
|
||||
|
||||
# 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.
|
||||
install -m 755 server/wineserver $BR/usr/X11R6/bin/
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
wineclipsrv
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
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:
|
||||
Loading…
Reference in New Issue