makedep: Make the spec file optional for data-only dlls.

dlls/activeds.tlb/activeds.tlb.spec

-# no exported entry points

dlls/apisetschema/Makefile.in

 MODULE    = apisetschema.dll
 
 EXTRADLLFLAGS = -Wb,--data-only
+
+SOURCES = apisetschema.spec

dlls/icmp/Makefile.in

 MODULE    = icmp.dll
 
 EXTRADLLFLAGS = -Wb,--data-only
+
+SOURCES = icmp.spec

dlls/light.msstyles/light.msstyles.spec

-# no exported entry points

dlls/lz32/Makefile.in

@@ -3,4 +3,6 @@ IMPORTLIB = lz32
 
 EXTRADLLFLAGS = -Wb,--data-only
 
-RC_SRCS  = version.rc
+SOURCES = \
+	lz32.spec \
+	version.rc

dlls/mferror/mferror.spec

-# This is resource dll

dlls/mshtml.tlb/mshtml.tlb.spec

-# no exported entry points

dlls/msimsg/msimsg.spec

-# empty

dlls/normaliz/Makefile.in

@@ -2,3 +2,5 @@ MODULE    = normaliz.dll
 IMPORTLIB = normaliz
 
 EXTRADLLFLAGS = -Wb,--data-only
+
+SOURCES = normaliz.spec

dlls/security/Makefile.in

@@ -2,3 +2,5 @@ MODULE    = security.dll
 IMPORTS   = secur32
 
 EXTRADLLFLAGS = -Wb,--data-only
+
+SOURCES = security.spec

dlls/sfc/Makefile.in

@@ -2,3 +2,5 @@ MODULE    = sfc.dll
 IMPORTLIB = sfc
 
 EXTRADLLFLAGS = -Wb,--data-only -Wb,--prefer-native
+
+SOURCES = sfc.spec

dlls/shdoclc/shdoclc.spec

-# no exported functions

dlls/stdole2.tlb/stdole2.tlb.spec

-# no exported entry points

dlls/stdole32.tlb/stdole32.tlb.spec

-# no exported entry points

dlls/tzres/tzres.spec

-# nothing exported

dlls/usp10/Makefile.in

@@ -2,3 +2,5 @@ MODULE    = usp10.dll
 IMPORTLIB = usp10
 
 EXTRADLLFLAGS = -Wb,--data-only
+
+SOURCES = usp10.spec

dlls/wmi/Makefile.in

@@ -2,3 +2,5 @@ MODULE    = wmi.dll
 IMPORTS   = advapi32
 
 EXTRADLLFLAGS = -Wb,--data-only
+
+SOURCES = wmi.spec

tools/make_makefiles

@@ -381,7 +381,8 @@ sub assign_sources_to_makefiles(@)
         }
         elsif ($name =~ /\.spec$/)
         {
-            next unless defined ${$make}{"TESTDLL"};
+            my $dllflags = ${$make}{"EXTRADLLFLAGS"} || "";
+            next unless defined ${$make}{"TESTDLL"} || ($dllflags =~ /-Wb,--data-only/);
         }
         elsif ($name =~ /\.nls$/)
         {

tools/makedep.c

@@ -3351,7 +3351,16 @@ static void output_module( struct makefile *make, unsigned int arch )
 
     if (make->disabled[arch]) return;
 
-    if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" ));
+    if (!make->is_exe)
+    {
+        if (make->data_only)
+        {
+            /* spec file is optional */
+            struct incl_file *spec = find_src_file( make, replace_extension( make->module, ".dll", ".spec" ));
+            if (spec) spec_file = spec->filename;
+        }
+        else spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" ));
+    }
 
     if (!make->data_only)
     {
@@ -3394,11 +3403,8 @@ static void output_module( struct makefile *make, unsigned int arch )
     output( "\n" );
     output_winegcc_command( make, arch );
     if (arch) output_filename( "-Wl,--wine-builtin" );
-    if (spec_file)
-    {
-        output_filename( "-shared" );
-        output_filename( spec_file );
-    }
+    if (!make->is_exe) output_filename( "-shared" );
+    if (spec_file) output_filename( spec_file );
     output_filenames( make->extradllflags );
     if (arch) output_filenames( get_expanded_arch_var_array( make, "EXTRADLLFLAGS", arch ));
     output_filenames_obj_dir( make, make->object_files[arch] );