Alexandre Julliard : winebus.sys: Move winebus.inf into the module resources.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4650dff5c4a3998181e4516e1cc987852b0c3c57
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4650dff5c4a3998181e4516e1cc987852b0c3c57

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Nov 11 11:04:06 2020 +0100

winebus.sys: Move winebus.inf into the module resources.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winebus.sys/Makefile.in                         |  2 ++
 .../winebus.inf.in => dlls/winebus.sys/winebus.inf   |  0
 dlls/winebus.sys/winebus.rc                          | 20 ++++++++++++++++++++
 loader/Makefile.in                                   |  1 -
 loader/wine.inf.in                                   |  2 +-
 tools/make_makefiles                                 | 10 ++--------
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in
index 3bdc1a5d58a..9011bbb6075 100644
--- a/dlls/winebus.sys/Makefile.in
+++ b/dlls/winebus.sys/Makefile.in
@@ -9,3 +9,5 @@ C_SRCS = \
 	bus_sdl.c \
 	bus_udev.c \
 	main.c
+
+RC_SRCS = winebus.rc
diff --git a/loader/winebus.inf.in b/dlls/winebus.sys/winebus.inf
similarity index 100%
rename from loader/winebus.inf.in
rename to dlls/winebus.sys/winebus.inf
diff --git a/dlls/winebus.sys/winebus.rc b/dlls/winebus.sys/winebus.rc
new file mode 100644
index 00000000000..4af55fb6f40
--- /dev/null
+++ b/dlls/winebus.sys/winebus.rc
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* @makedep: winebus.inf */
+1 WINE_DATA_FILE winebus.inf
diff --git a/loader/Makefile.in b/loader/Makefile.in
index e8c271f15d3..83aefa00861 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -9,7 +9,6 @@ SOURCES = \
 	wine.man.in \
 	wine.pl.UTF-8.man.in \
 	wine_info.plist.in \
-	winebus.inf.in \
 	winehid.inf.in \
 	wineusb.inf.in
 
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 15f0634ca5c..e593117c83d 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -4059,7 +4059,7 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGa
 HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001
 
 [InfFiles]
-winebus.inf
+winebus.inf,"@winebus.sys,-1"
 winehid.inf
 wineusb.inf
 
diff --git a/tools/make_makefiles b/tools/make_makefiles
index a92987c2ab5..2d3c14cb2ec 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -73,7 +73,6 @@ my @source_vars = (
 );
 
 my (@makefiles, %makefiles);
-my @inf_files;
 my @nls_files;
 
 sub dirname($)
@@ -382,10 +381,6 @@ sub assign_sources_to_makefiles(@)
         {
             push @{${$make}{"=MANPAGES"}}, $name;
         }
-        elsif ($name =~ /\.inf\.in$/)
-        {
-            push @inf_files, $name unless $name eq "wine.inf.in";
-        }
         elsif ($name =~ /\.in$/)
         {
             push @{${$make}{"=IN_SRCS"}}, $name;
@@ -492,11 +487,10 @@ sub update_makefiles(@)
 sub update_wine_inf()
 {
     my @lines;
-    push @lines, "[InfFiles]", sort grep { s/\.in$//; } @inf_files;
-    push @lines, "\n[NlsFiles]", sort grep(!/^sort/, @nls_files);
+    push @lines, "[NlsFiles]", sort grep(!/^sort/, @nls_files);
     push @lines, "\n[SortFiles]", sort grep(/^sort/, @nls_files);
     push @lines, "\n[WineSourceDirs]\n";
-    replace_in_file "loader/wine.inf.in", '^\[InfFiles\]', '^\[WineSourceDirs\]', join( "\n", @lines );
+    replace_in_file "loader/wine.inf.in", '^\[NlsFiles\]', '^\[WineSourceDirs\]', join( "\n", @lines );
 }
 
 my $git_dir = $ENV{GIT_DIR} || ".git";