x11drv: Renamed the x11drv directory to winex11.drv.
This commit is contained in:
Alexandre Julliard
parent
35b7a813f6
commit
bdb4fab7a7
|
|
@ -1740,6 +1740,7 @@ dlls/wined3d/Makefile
|
||||||
dlls/winedos/Makefile
|
dlls/winedos/Makefile
|
||||||
dlls/winemp3.acm/Makefile
|
dlls/winemp3.acm/Makefile
|
||||||
dlls/wineps.drv/Makefile
|
dlls/wineps.drv/Makefile
|
||||||
|
dlls/winex11.drv/Makefile
|
||||||
dlls/wininet/Makefile
|
dlls/wininet/Makefile
|
||||||
dlls/wininet/tests/Makefile
|
dlls/wininet/tests/Makefile
|
||||||
dlls/winmm/Makefile
|
dlls/winmm/Makefile
|
||||||
|
|
@ -1765,7 +1766,6 @@ dlls/ws2_32/Makefile
|
||||||
dlls/ws2_32/tests/Makefile
|
dlls/ws2_32/tests/Makefile
|
||||||
dlls/wsock32/Makefile
|
dlls/wsock32/Makefile
|
||||||
dlls/wtsapi32/Makefile
|
dlls/wtsapi32/Makefile
|
||||||
dlls/x11drv/Makefile
|
|
||||||
documentation/Makefile
|
documentation/Makefile
|
||||||
fonts/Makefile
|
fonts/Makefile
|
||||||
include/Makefile
|
include/Makefile
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ VPATH = @srcdir@
|
||||||
GLU32FILES = glu32
|
GLU32FILES = glu32
|
||||||
GLUT32FILES = glut32
|
GLUT32FILES = glut32
|
||||||
OPENGLFILES = opengl32 wined3d
|
OPENGLFILES = opengl32 wined3d
|
||||||
XFILES = x11drv
|
XFILES = winex11.drv
|
||||||
EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@
|
EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@
|
||||||
|
|
||||||
# Subdir list
|
# Subdir list
|
||||||
|
|
@ -207,7 +207,7 @@ SUBDIRS = \
|
||||||
glut32 \
|
glut32 \
|
||||||
opengl32 \
|
opengl32 \
|
||||||
wined3d \
|
wined3d \
|
||||||
x11drv
|
winex11.drv
|
||||||
|
|
||||||
BUILDSUBDIRS = $(BASEDIRS) $(EXTRADIRS)
|
BUILDSUBDIRS = $(BASEDIRS) $(EXTRADIRS)
|
||||||
|
|
||||||
|
|
@ -269,7 +269,6 @@ WIN16_FILES = \
|
||||||
wprocs.dll16
|
wprocs.dll16
|
||||||
|
|
||||||
SYMLINKS_SO = \
|
SYMLINKS_SO = \
|
||||||
$(XFILES:%=%.dll.so) \
|
|
||||||
@WIN16_FILES@ \
|
@WIN16_FILES@ \
|
||||||
gdi32.dll.so \
|
gdi32.dll.so \
|
||||||
joystick.drv.so \
|
joystick.drv.so \
|
||||||
|
|
@ -294,9 +293,6 @@ symlinks.so: $(SYMLINKS_SO)
|
||||||
|
|
||||||
symlinks: $(BUILDSUBDIRS)
|
symlinks: $(BUILDSUBDIRS)
|
||||||
|
|
||||||
x11drv.dll.so: winex11.drv.so
|
|
||||||
$(RM) $@ && $(LN_S) winex11.drv.so $@
|
|
||||||
|
|
||||||
# Map symlink name to the corresponding library
|
# Map symlink name to the corresponding library
|
||||||
|
|
||||||
gdi32.dll.so: gdi/gdi32.dll.so
|
gdi32.dll.so: gdi/gdi32.dll.so
|
||||||
|
|
@ -335,9 +331,6 @@ winenas.drv.so: winmm/winenas/winenas.drv.so
|
||||||
wineoss.drv.so: winmm/wineoss/wineoss.drv.so
|
wineoss.drv.so: winmm/wineoss/wineoss.drv.so
|
||||||
$(RM) $@ && $(LN_S) 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
|
# Placeholders for 16-bit libraries
|
||||||
|
|
||||||
avifile.dll16:
|
avifile.dll16:
|
||||||
|
|
@ -927,7 +920,6 @@ winmm/wineesd/wineesd.drv.so: winmm/wineesd
|
||||||
winmm/winejack/winejack.drv.so: winmm/winejack
|
winmm/winejack/winejack.drv.so: winmm/winejack
|
||||||
winmm/winenas/winenas.drv.so: winmm/winenas
|
winmm/winenas/winenas.drv.so: winmm/winenas
|
||||||
winmm/wineoss/wineoss.drv.so: winmm/wineoss
|
winmm/wineoss/wineoss.drv.so: winmm/wineoss
|
||||||
x11drv/winex11.drv.so: x11drv
|
|
||||||
dxerr8/libdxerr8.a: dxerr8
|
dxerr8/libdxerr8.a: dxerr8
|
||||||
dxerr9/libdxerr9.a: dxerr9
|
dxerr9/libdxerr9.a: dxerr9
|
||||||
dxguid/libdxguid.a: dxguid
|
dxguid/libdxguid.a: dxguid
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ my %special_dlls =
|
||||||
"glut32" => "GLUT32FILES",
|
"glut32" => "GLUT32FILES",
|
||||||
"opengl32" => "OPENGLFILES",
|
"opengl32" => "OPENGLFILES",
|
||||||
"wined3d" => "OPENGLFILES",
|
"wined3d" => "OPENGLFILES",
|
||||||
"x11drv" => "XFILES"
|
"winex11.drv" => "XFILES"
|
||||||
);
|
);
|
||||||
|
|
||||||
sub needs_symlink($)
|
sub needs_symlink($)
|
||||||
|
|
@ -190,7 +190,6 @@ printf NEWMAKE "\t%s\n", join( " \\\n\t", sort keys %targets16 );
|
||||||
print NEWMAKE <<EOF;
|
print NEWMAKE <<EOF;
|
||||||
|
|
||||||
SYMLINKS_SO = \\
|
SYMLINKS_SO = \\
|
||||||
\$(XFILES:%=%.dll.so) \\
|
|
||||||
\@WIN16_FILES\@ \\
|
\@WIN16_FILES\@ \\
|
||||||
EOF
|
EOF
|
||||||
printf NEWMAKE "\t%s\n", join( " \\\n\t", sort keys %targets );
|
printf NEWMAKE "\t%s\n", join( " \\\n\t", sort keys %targets );
|
||||||
|
|
@ -207,9 +206,6 @@ symlinks.so: \$(SYMLINKS_SO)
|
||||||
|
|
||||||
symlinks: \$(BUILDSUBDIRS)
|
symlinks: \$(BUILDSUBDIRS)
|
||||||
|
|
||||||
x11drv.dll.so: winex11.drv.so
|
|
||||||
\$(RM) \$@ && \$(LN_S) winex11.drv.so \$@
|
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
################################################################
|
################################################################
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue