Module: wine Branch: master Commit: cfcf5ca2866adca4b65d5a7596dda349a410d7b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfcf5ca2866adca4b65d5a7596dda34...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Sep 5 12:40:29 2023 +0200
makedep: Make the spec file optional for testdll resources.
---
dlls/dinput/tests/Makefile.in | 3 --- dlls/dinput/tests/driver_bus.spec | 1 - dlls/dinput/tests/driver_hid.spec | 1 - dlls/dinput/tests/driver_hid_poll.spec | 1 - dlls/ntoskrnl.exe/tests/Makefile.in | 5 ----- dlls/ntoskrnl.exe/tests/driver.spec | 1 - dlls/ntoskrnl.exe/tests/driver2.spec | 1 - dlls/ntoskrnl.exe/tests/driver3.spec | 1 - dlls/ntoskrnl.exe/tests/driver_netio.spec | 1 - dlls/ntoskrnl.exe/tests/driver_pnp.spec | 1 - tools/makedep.c | 5 +---- 11 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index 0123f86cb04..608b817e0f4 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -12,11 +12,8 @@ SOURCES = \ device8.c \ dinput.c \ driver_bus.c \ - driver_bus.spec \ driver_hid.c \ - driver_hid.spec \ driver_hid_poll.c \ - driver_hid_poll.spec \ force_feedback.c \ hid.c \ hotplug.c \ diff --git a/dlls/dinput/tests/driver_bus.spec b/dlls/dinput/tests/driver_bus.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/dinput/tests/driver_bus.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/dlls/dinput/tests/driver_hid.spec b/dlls/dinput/tests/driver_hid.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/dinput/tests/driver_hid.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/dlls/dinput/tests/driver_hid_poll.spec b/dlls/dinput/tests/driver_hid_poll.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/dinput/tests/driver_hid_poll.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index ab1db85adbb..f610df6a947 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -14,13 +14,8 @@ driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
SOURCES = \ driver.c \ - driver.spec \ driver2.c \ - driver2.spec \ driver3.c \ - driver3.spec \ driver_netio.c \ - driver_netio.spec \ driver_pnp.c \ - driver_pnp.spec \ ntoskrnl.c diff --git a/dlls/ntoskrnl.exe/tests/driver.spec b/dlls/ntoskrnl.exe/tests/driver.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/ntoskrnl.exe/tests/driver.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/driver2.spec b/dlls/ntoskrnl.exe/tests/driver2.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/ntoskrnl.exe/tests/driver2.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/driver3.spec b/dlls/ntoskrnl.exe/tests/driver3.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/ntoskrnl.exe/tests/driver3.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.spec b/dlls/ntoskrnl.exe/tests/driver_netio.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/ntoskrnl.exe/tests/driver_netio.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/driver_pnp.spec b/dlls/ntoskrnl.exe/tests/driver_pnp.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/ntoskrnl.exe/tests/driver_pnp.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/tools/makedep.c b/tools/makedep.c index 85b111941b5..5939e0e6798 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3077,7 +3077,7 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour struct strarray dll_flags = empty_strarray; struct strarray default_imports = empty_strarray; struct strarray all_libs, dep_libs; - const char *dll_name, *obj_name, *res_name, *output_rsrc, *output_file, *debug_file, *ext; + const char *dll_name, *obj_name, *res_name, *output_rsrc, *output_file, *debug_file, *ext = ".dll"; struct incl_file *spec_file = find_src_file( make, strmake( "%.spec", obj )); unsigned int arch;
@@ -3085,10 +3085,7 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour strarray_addall( &dll_flags, make->extradllflags ); strarray_addall( &dll_flags, get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" )); if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); - if (strarray_exists( &dll_flags, "-mconsole" )) ext = ".exe"; - else if (!spec_file) fatal_error( "testdll source %s needs a .spec file\n", source->name ); - else ext = ".dll";
for (arch = 0; arch < archs.count; arch++) {