From f21cb01aa4f61660d5bc9f8843e25ed957c5eaec Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 14 Jun 2016 14:04:20 +0900
Subject: [PATCH] makefiles: Don't allow import libraries to have an extension.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 configure                       | 4 ++--
 configure.ac                    | 4 ++--
 dlls/hidclass.sys/Makefile.in   | 2 +-
 dlls/mountmgr.sys/Makefile.in   | 2 +-
 dlls/ntoskrnl.exe/Makefile.in   | 2 +-
 dlls/scsiport.sys/Makefile.in   | 2 +-
 dlls/usbd.sys/Makefile.in       | 4 ++--
 programs/winedevice/Makefile.in | 2 +-
 tools/make_makefiles            | 1 +
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index 5901f605625..6151ef893d7 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.ac b/configure.ac
index 6f0cd70c2fd..a2b17053697 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in
index 6e79486c7d4..e9422173994 100644
--- a/dlls/hidclass.sys/Makefile.in
+++ b/dlls/hidclass.sys/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = hidclass.sys
 IMPORTLIB = hidclass
-IMPORTS   = ntoskrnl.exe
+IMPORTS   = ntoskrnl
 DELAYIMPORTS = setupapi hid
 
 C_SRCS = \
diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in
index 1195b5e3113..bd1c2ee365b 100644
--- a/dlls/mountmgr.sys/Makefile.in
+++ b/dlls/mountmgr.sys/Makefile.in
@@ -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)
diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in
index adb13270fb6..875be8e86a8 100644
--- a/dlls/ntoskrnl.exe/Makefile.in
+++ b/dlls/ntoskrnl.exe/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = ntoskrnl.exe
-IMPORTLIB = ntoskrnl.exe
+IMPORTLIB = ntoskrnl
 
 C_SRCS = \
 	instr.c \
diff --git a/dlls/scsiport.sys/Makefile.in b/dlls/scsiport.sys/Makefile.in
index c5bc40197f3..5219c3e751d 100644
--- a/dlls/scsiport.sys/Makefile.in
+++ b/dlls/scsiport.sys/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = scsiport.sys
-IMPORTS   = ntoskrnl.exe
+IMPORTS   = ntoskrnl
 EXTRADLLFLAGS = -Wb,--subsystem,native
 
 C_SRCS = \
diff --git a/dlls/usbd.sys/Makefile.in b/dlls/usbd.sys/Makefile.in
index 81a157b9c0c..32e7e715994 100644
--- a/dlls/usbd.sys/Makefile.in
+++ b/dlls/usbd.sys/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = usbd.sys
-IMPORTLIB = usbd.sys
-IMPORTS   = ntoskrnl.exe
+IMPORTLIB = usbd
+IMPORTS   = ntoskrnl
 EXTRADLLFLAGS = -Wb,--subsystem,native
 
 C_SRCS = \
diff --git a/programs/winedevice/Makefile.in b/programs/winedevice/Makefile.in
index fc1ffff9f7e..a0a4450cafb 100644
--- a/programs/winedevice/Makefile.in
+++ b/programs/winedevice/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = winedevice.exe
 APPMODE   = -mwindows -municode
-IMPORTS   = advapi32 ntoskrnl.exe
+IMPORTS   = advapi32 ntoskrnl
 
 C_SRCS = \
 	device.c
diff --git a/tools/make_makefiles b/tools/make_makefiles
index a5e8a05e35e..1a016667fc5 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -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;