makefiles: Don't allow import libraries to have an extension.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-06-14 14:04:20 +09:00
parent 509b1eb162
commit f21cb01aa4
9 changed files with 12 additions and 11 deletions

4
configure vendored
View File

@ -17901,7 +17901,7 @@ wine_fn_config_dll ntdll enable_ntdll implib
wine_fn_config_test dlls/ntdll/tests ntdll_test
wine_fn_config_dll ntdsapi enable_ntdsapi implib
wine_fn_config_test dlls/ntdsapi/tests ntdsapi_test
wine_fn_config_dll ntoskrnl.exe enable_ntoskrnl_exe implib
wine_fn_config_dll ntoskrnl.exe enable_ntoskrnl_exe implib ntoskrnl
wine_fn_config_dll ntprint enable_ntprint
wine_fn_config_test dlls/ntprint/tests ntprint_test
wine_fn_config_dll objsel enable_objsel clean
@ -18047,7 +18047,7 @@ wine_fn_config_dll updspapi enable_updspapi
wine_fn_config_dll url enable_url implib
wine_fn_config_dll urlmon enable_urlmon clean,implib
wine_fn_config_test dlls/urlmon/tests urlmon_test
wine_fn_config_dll usbd.sys enable_usbd_sys implib
wine_fn_config_dll usbd.sys enable_usbd_sys implib usbd
wine_fn_config_dll user.exe16 enable_win16
wine_fn_config_dll user32 enable_user32 clean,implib
wine_fn_config_test dlls/user32/tests user32_test

View File

@ -3147,7 +3147,7 @@ WINE_CONFIG_DLL(ntdll,,[implib])
WINE_CONFIG_TEST(dlls/ntdll/tests)
WINE_CONFIG_DLL(ntdsapi,,[implib])
WINE_CONFIG_TEST(dlls/ntdsapi/tests)
WINE_CONFIG_DLL(ntoskrnl.exe,,[implib])
WINE_CONFIG_DLL(ntoskrnl.exe,,[implib],[ntoskrnl])
WINE_CONFIG_DLL(ntprint)
WINE_CONFIG_TEST(dlls/ntprint/tests)
WINE_CONFIG_DLL(objsel,,[clean])
@ -3293,7 +3293,7 @@ WINE_CONFIG_DLL(updspapi)
WINE_CONFIG_DLL(url,,[implib])
WINE_CONFIG_DLL(urlmon,,[clean,implib])
WINE_CONFIG_TEST(dlls/urlmon/tests)
WINE_CONFIG_DLL(usbd.sys,,[implib])
WINE_CONFIG_DLL(usbd.sys,,[implib],[usbd])
WINE_CONFIG_DLL(user.exe16,enable_win16)
WINE_CONFIG_DLL(user32,,[clean,implib])
WINE_CONFIG_TEST(dlls/user32/tests)

View File

@ -1,6 +1,6 @@
MODULE = hidclass.sys
IMPORTLIB = hidclass
IMPORTS = ntoskrnl.exe
IMPORTS = ntoskrnl
DELAYIMPORTS = setupapi hid
C_SRCS = \

View File

@ -1,5 +1,5 @@
MODULE = mountmgr.sys
IMPORTS = uuid advapi32 ntoskrnl.exe
IMPORTS = uuid advapi32 ntoskrnl
DELAYIMPORTS = user32
EXTRADLLFLAGS = -Wb,--subsystem,native
EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS)

View File

@ -1,5 +1,5 @@
MODULE = ntoskrnl.exe
IMPORTLIB = ntoskrnl.exe
IMPORTLIB = ntoskrnl
C_SRCS = \
instr.c \

View File

@ -1,5 +1,5 @@
MODULE = scsiport.sys
IMPORTS = ntoskrnl.exe
IMPORTS = ntoskrnl
EXTRADLLFLAGS = -Wb,--subsystem,native
C_SRCS = \

View File

@ -1,6 +1,6 @@
MODULE = usbd.sys
IMPORTLIB = usbd.sys
IMPORTS = ntoskrnl.exe
IMPORTLIB = usbd
IMPORTS = ntoskrnl
EXTRADLLFLAGS = -Wb,--subsystem,native
C_SRCS = \

View File

@ -1,6 +1,6 @@
MODULE = winedevice.exe
APPMODE = -mwindows -municode
IMPORTS = advapi32 ntoskrnl.exe
IMPORTS = advapi32 ntoskrnl
C_SRCS = \
device.c

View File

@ -485,6 +485,7 @@ sub update_makefiles(@)
die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.dll";
}
my $implib = $make{"IMPORTLIB"} || "";
die "Invalid IMPORTLIB name in $file" if $implib =~ /\./;
$args .= "," if $is_win16 || defined $make{"=flags"};
$args .= "enable_win16" if $is_win16;
$args .= $flag_args;