From 6fb39dfe4a98423aa86b07f3fad20e7ba5442e44 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 21 Jul 2010 13:18:52 +0200 Subject: [PATCH] programs: Remove explicit imports of kernel32 and ntdll. --- programs/attrib/Makefile.in | 1 - programs/cacls/Makefile.in | 1 - programs/clock/Makefile.in | 2 +- programs/cmd/Makefile.in | 2 +- programs/cmd/tests/Makefile.in | 1 - programs/cmdlgtst/Makefile.in | 2 +- programs/control/Makefile.in | 2 +- programs/dxdiag/Makefile.in | 1 - programs/eject/Makefile.in | 1 - programs/expand/Makefile.in | 2 +- programs/explorer/Makefile.in | 2 +- programs/extrac32/Makefile.in | 2 +- programs/hh/Makefile.in | 1 - programs/icinfo/Makefile.in | 2 +- programs/iexplore/Makefile.in | 2 +- programs/lodctr/Makefile.in | 2 +- programs/mshta/Makefile.in | 1 - programs/msiexec/Makefile.in | 2 +- programs/net/Makefile.in | 2 +- programs/ngen/Makefile.in | 1 - programs/notepad/Makefile.in | 2 +- programs/oleview/Makefile.in | 2 +- programs/ping/Makefile.in | 1 - programs/progman/Makefile.in | 2 +- programs/reg/Makefile.in | 2 +- programs/regedit/Makefile.in | 2 +- programs/regsvr32/Makefile.in | 2 +- programs/rpcss/Makefile.in | 2 +- programs/rundll.exe16/Makefile.in | 3 +-- programs/rundll32/Makefile.in | 2 +- programs/sc/Makefile.in | 2 +- programs/secedit/Makefile.in | 1 - programs/services/Makefile.in | 3 +-- programs/spoolsv/Makefile.in | 2 +- programs/start/Makefile.in | 2 +- programs/svchost/Makefile.in | 2 +- programs/taskmgr/Makefile.in | 2 +- programs/termsv/Makefile.in | 2 +- programs/uninstaller/Makefile.in | 2 +- programs/unlodctr/Makefile.in | 2 +- programs/view/Makefile.in | 2 +- programs/wineboot/Makefile.in | 2 +- programs/winebrowser/Makefile.in | 2 +- programs/winecfg/Makefile.in | 2 +- programs/wineconsole/Makefile.in | 2 +- programs/winedbg/Makefile.in | 2 +- programs/winedevice/Makefile.in | 2 +- programs/winefile/Makefile.in | 2 +- programs/winemenubuilder/Makefile.in | 2 +- programs/winemine/Makefile.in | 2 +- programs/winepath/Makefile.in | 1 - programs/winetest/Makefile.in | 2 +- programs/winevdm/Makefile.in | 2 +- programs/winhelp.exe16/Makefile.in | 3 +-- programs/winhlp32/Makefile.in | 2 +- programs/winoldap.mod16/Makefile.in | 3 +-- programs/winver/Makefile.in | 2 +- programs/wordpad/Makefile.in | 2 +- programs/write/Makefile.in | 2 +- programs/xcopy/Makefile.in | 2 +- 60 files changed, 49 insertions(+), 64 deletions(-) diff --git a/programs/attrib/Makefile.in b/programs/attrib/Makefile.in index 3696b934340..9cf9bcfc55f 100644 --- a/programs/attrib/Makefile.in +++ b/programs/attrib/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = attrib.exe APPMODE = -mconsole -municode -IMPORTS = kernel32 C_SRCS = attrib.c diff --git a/programs/cacls/Makefile.in b/programs/cacls/Makefile.in index ecb6f156690..cd239ce33d6 100644 --- a/programs/cacls/Makefile.in +++ b/programs/cacls/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cacls.exe APPMODE = -mconsole -IMPORTS = kernel32 C_SRCS = \ cacls_main.c diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index c372100e12d..2c5f01a61ec 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = clock.exe APPMODE = -mwindows -IMPORTS = comdlg32 shell32 user32 gdi32 kernel32 +IMPORTS = comdlg32 shell32 user32 gdi32 EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = \ diff --git a/programs/cmd/Makefile.in b/programs/cmd/Makefile.in index d5c88c6aad7..46f10845bdd 100644 --- a/programs/cmd/Makefile.in +++ b/programs/cmd/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = cmd.exe APPMODE = -mconsole -municode EXTRADEFS = -DWINE_NO_UNICODE_MACROS -IMPORTS = shell32 user32 advapi32 kernel32 +IMPORTS = shell32 user32 advapi32 C_SRCS = \ batch.c \ diff --git a/programs/cmd/tests/Makefile.in b/programs/cmd/tests/Makefile.in index 7bce73908ef..658efde7025 100644 --- a/programs/cmd/tests/Makefile.in +++ b/programs/cmd/tests/Makefile.in @@ -3,7 +3,6 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = cmd.exe -IMPORTS = kernel32 C_SRCS = \ batch.c diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in index 8453e814a9a..ad5006743ce 100644 --- a/programs/cmdlgtst/Makefile.in +++ b/programs/cmdlgtst/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cmdlgtst.exe APPMODE = -mwindows -IMPORTS = comdlg32 user32 gdi32 kernel32 +IMPORTS = comdlg32 user32 gdi32 C_SRCS = \ cmdlgtst.c diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in index 291836b6303..dcdea6f3ec8 100644 --- a/programs/control/Makefile.in +++ b/programs/control/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = control.exe APPMODE = -mwindows -municode -IMPORTS = shell32 user32 kernel32 +IMPORTS = shell32 user32 C_SRCS = control.c diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in index 9fac9ae3c9e..65dc091505a 100644 --- a/programs/dxdiag/Makefile.in +++ b/programs/dxdiag/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dxdiag.exe APPMODE = -mwindows -municode -IMPORTS = kernel32 C_SRCS = \ main.c diff --git a/programs/eject/Makefile.in b/programs/eject/Makefile.in index 7f7c117dca4..4eb1c302f95 100644 --- a/programs/eject/Makefile.in +++ b/programs/eject/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = eject.exe APPMODE = -mconsole -IMPORTS = kernel32 C_SRCS = eject.c diff --git a/programs/expand/Makefile.in b/programs/expand/Makefile.in index be456fbf917..832abd85238 100644 --- a/programs/expand/Makefile.in +++ b/programs/expand/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = expand.exe APPMODE = -mconsole -IMPORTS = setupapi kernel32 +IMPORTS = setupapi C_SRCS = expand.c diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in index b53191c02c0..b61d32de4cd 100644 --- a/programs/explorer/Makefile.in +++ b/programs/explorer/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = explorer.exe APPMODE = -mwindows -municode -IMPORTS = rpcrt4 user32 gdi32 advapi32 kernel32 ntdll +IMPORTS = rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 C_SRCS = \ diff --git a/programs/extrac32/Makefile.in b/programs/extrac32/Makefile.in index 7505e39a35e..353e56dff72 100644 --- a/programs/extrac32/Makefile.in +++ b/programs/extrac32/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = extrac32.exe APPMODE = -mwindows -municode EXTRADEFS = -DWINE_NO_UNICODE -IMPORTS = shell32 setupapi shlwapi user32 kernel32 +IMPORTS = shell32 setupapi shlwapi user32 C_SRCS = \ extrac32.c diff --git a/programs/hh/Makefile.in b/programs/hh/Makefile.in index 7c06bc5af9c..152d129e05d 100644 --- a/programs/hh/Makefile.in +++ b/programs/hh/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = hh.exe APPMODE = -mwindows -IMPORTS = kernel32 C_SRCS = \ main.c diff --git a/programs/icinfo/Makefile.in b/programs/icinfo/Makefile.in index 64a7785c9d8..52eda386e5d 100644 --- a/programs/icinfo/Makefile.in +++ b/programs/icinfo/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = icinfo.exe APPMODE = -mwindows -IMPORTS = msvfw32 kernel32 +IMPORTS = msvfw32 C_SRCS = icinfo.c diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 0d12f9083c1..e657dab1aea 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = iexplore.exe APPMODE = -mwindows -IMPORTS = shdocvw user32 gdi32 kernel32 +IMPORTS = shdocvw user32 gdi32 C_SRCS = \ main.c diff --git a/programs/lodctr/Makefile.in b/programs/lodctr/Makefile.in index eb8242aac64..68ee755592d 100644 --- a/programs/lodctr/Makefile.in +++ b/programs/lodctr/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = lodctr.exe APPMODE = -mconsole -IMPORTS = loadperf kernel32 +IMPORTS = loadperf C_SRCS = lodctr_main.c diff --git a/programs/mshta/Makefile.in b/programs/mshta/Makefile.in index 662406ca3c2..e2810d7978c 100644 --- a/programs/mshta/Makefile.in +++ b/programs/mshta/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mshta.exe APPMODE = -mwindows -municode -IMPORTS = kernel32 C_SRCS = \ main.c diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index ab7bd1c4f2d..353e0bea26e 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msiexec.exe APPMODE = -mwindows -IMPORTS = msi ole32 advapi32 user32 kernel32 +IMPORTS = msi ole32 advapi32 user32 C_SRCS = \ msiexec.c \ diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in index 695abad6e23..742c7cf8ccf 100644 --- a/programs/net/Makefile.in +++ b/programs/net/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = net.exe APPMODE = -mconsole -IMPORTS = netapi32 user32 advapi32 kernel32 +IMPORTS = netapi32 user32 advapi32 EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = net.c diff --git a/programs/ngen/Makefile.in b/programs/ngen/Makefile.in index bfdb1240fca..a3529f19ea5 100644 --- a/programs/ngen/Makefile.in +++ b/programs/ngen/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ngen.exe APPMODE = -mconsole -municode -IMPORTS = kernel32 C_SRCS = \ ngen_main.c diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index 79c84160a68..a5bf841084a 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = notepad.exe APPMODE = -mwindows -mno-cygwin -IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32 kernel32 +IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt MODCFLAGS = @BUILTINFLAG@ EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in index ca8ed0ce610..4cd00db3775 100644 --- a/programs/oleview/Makefile.in +++ b/programs/oleview/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = oleview.exe APPMODE = -mwindows -IMPORTS = uuid comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32 kernel32 +IMPORTS = uuid comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32 EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = \ diff --git a/programs/ping/Makefile.in b/programs/ping/Makefile.in index b67e318f92f..248a628013d 100644 --- a/programs/ping/Makefile.in +++ b/programs/ping/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ping.exe APPMODE = -mconsole -IMPORTS = kernel32 C_SRCS = \ ping_main.c diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in index ed4cbc3de09..e30aabcf575 100644 --- a/programs/progman/Makefile.in +++ b/programs/progman/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = progman.exe APPMODE = -mwindows -IMPORTS = shell32 comdlg32 user32 gdi32 kernel32 +IMPORTS = shell32 comdlg32 user32 gdi32 C_SRCS = \ dialog.c \ diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 08d96e7fbe1..0bb09f8ca6c 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = reg.exe APPMODE = -mconsole -municode -IMPORTS = advapi32 kernel32 +IMPORTS = advapi32 DELAYIMPORTS = user32 C_SRCS = reg.c diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index c84d7a4934f..04c8c53b2b3 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = regedit.exe APPMODE = -mwindows -mno-cygwin -IMPORTS = advapi32 kernel32 +IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt EXTRADEFS = -DNO_LIBWINE_PORT diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in index 958fad4fb12..f6808c5f0af 100644 --- a/programs/regsvr32/Makefile.in +++ b/programs/regsvr32/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = regsvr32.exe APPMODE = -mconsole -IMPORTS = ole32 kernel32 +IMPORTS = ole32 C_SRCS = \ regsvr32.c diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in index 3edd4bd7610..4beea7f640c 100644 --- a/programs/rpcss/Makefile.in +++ b/programs/rpcss/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = rpcss.exe APPMODE = -mconsole -IMPORTS = rpcrt4 kernel32 ntdll +IMPORTS = rpcrt4 C_SRCS = \ epmp.c \ diff --git a/programs/rundll.exe16/Makefile.in b/programs/rundll.exe16/Makefile.in index 9e5df3eaeb9..625c744494f 100644 --- a/programs/rundll.exe16/Makefile.in +++ b/programs/rundll.exe16/Makefile.in @@ -3,8 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = rundll.exe16 -APPMODE = -mwindows -Wb,--subsystem,win16 -IMPORTS = kernel32 kernel +APPMODE = -m16 C_SRCS = rundll.c diff --git a/programs/rundll32/Makefile.in b/programs/rundll32/Makefile.in index 6e2eddb0d85..80e004e8b43 100644 --- a/programs/rundll32/Makefile.in +++ b/programs/rundll32/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = rundll32.exe APPMODE = -mwindows -municode -IMPORTS = user32 kernel32 +IMPORTS = user32 EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = \ diff --git a/programs/sc/Makefile.in b/programs/sc/Makefile.in index 4d34f5a81b8..f78bbaaf62d 100644 --- a/programs/sc/Makefile.in +++ b/programs/sc/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = sc.exe APPMODE = -mconsole -municode -IMPORTS = advapi32 kernel32 +IMPORTS = advapi32 EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = sc.c diff --git a/programs/secedit/Makefile.in b/programs/secedit/Makefile.in index fb6c420a97f..2906036b363 100644 --- a/programs/secedit/Makefile.in +++ b/programs/secedit/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = secedit.exe APPMODE = -mconsole -IMPORTS = kernel32 C_SRCS = \ main.c diff --git a/programs/services/Makefile.in b/programs/services/Makefile.in index b2d62678c00..08b38f034f0 100644 --- a/programs/services/Makefile.in +++ b/programs/services/Makefile.in @@ -5,8 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = services.exe APPMODE = -mconsole -IMPORTS = kernel32 -IMPORTS = rpcrt4 advapi32 kernel32 ntdll +IMPORTS = rpcrt4 advapi32 C_SRCS = \ rpc.c \ diff --git a/programs/spoolsv/Makefile.in b/programs/spoolsv/Makefile.in index a08e5ec320e..975287dc163 100644 --- a/programs/spoolsv/Makefile.in +++ b/programs/spoolsv/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = spoolsv.exe APPMODE = -mconsole -IMPORTS = advapi32 kernel32 +IMPORTS = advapi32 C_SRCS = \ main.c diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index ae92b042368..e3ceade7b57 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = start.exe APPMODE = -mconsole -municode -IMPORTS = shell32 user32 kernel32 +IMPORTS = shell32 user32 C_SRCS = start.c diff --git a/programs/svchost/Makefile.in b/programs/svchost/Makefile.in index a05a8b0a8fa..3f75cd66001 100644 --- a/programs/svchost/Makefile.in +++ b/programs/svchost/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = svchost.exe APPMODE = -municode -IMPORTS = advapi32 kernel32 +IMPORTS = advapi32 C_SRCS = \ svchost.c diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 463ca75fa69..6146d12281c 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = taskmgr.exe APPMODE = -mwindows -mno-cygwin -IMPORTS = psapi shell32 comctl32 user32 gdi32 advapi32 kernel32 +IMPORTS = psapi shell32 comctl32 user32 gdi32 advapi32 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt EXTRADEFS = -DNO_LIBWINE_PORT MODCFLAGS = @BUILTINFLAG@ diff --git a/programs/termsv/Makefile.in b/programs/termsv/Makefile.in index ad118562d6e..0181484fd86 100644 --- a/programs/termsv/Makefile.in +++ b/programs/termsv/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = termsv.exe APPMODE = -mconsole -municode -IMPORTS = advapi32 kernel32 +IMPORTS = advapi32 C_SRCS = \ main.c diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index 4d8638b3189..2446b30347b 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = uninstaller.exe APPMODE = -mconsole -municode -IMPORTS = advapi32 kernel32 +IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 user32 gdi32 C_SRCS = \ diff --git a/programs/unlodctr/Makefile.in b/programs/unlodctr/Makefile.in index 553df2e2aba..bdb23ece0a6 100644 --- a/programs/unlodctr/Makefile.in +++ b/programs/unlodctr/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = unlodctr.exe APPMODE = -mconsole -IMPORTS = loadperf kernel32 +IMPORTS = loadperf C_SRCS = unlodctr_main.c diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in index 23f950a5d7b..2d786250a0b 100644 --- a/programs/view/Makefile.in +++ b/programs/view/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = view.exe APPMODE = -mwindows -IMPORTS = comdlg32 user32 gdi32 kernel32 +IMPORTS = comdlg32 user32 gdi32 C_SRCS = \ init.c \ diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 45e9ed0eef0..843b1972a92 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wineboot.exe APPMODE = -mconsole -IMPORTS = uuid advapi32 kernel32 ntdll +IMPORTS = uuid advapi32 DELAYIMPORTS = shell32 shlwapi version user32 C_SRCS = \ diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in index 514a8a670e7..d4ff00a93eb 100644 --- a/programs/winebrowser/Makefile.in +++ b/programs/winebrowser/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winebrowser.exe APPMODE = -mwindows -municode -IMPORTS = shlwapi user32 advapi32 kernel32 +IMPORTS = shlwapi user32 advapi32 C_SRCS = \ main.c diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 92c757008fe..95907859c7f 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winecfg.exe APPMODE = -mwindows -IMPORTS = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 kernel32 +IMPORTS = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 C_SRCS = \ about.c \ diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index 887f8a59d28..f925a10816a 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wineconsole.exe APPMODE = -mwindows -IMPORTS = advapi32 kernel32 ntdll +IMPORTS = advapi32 DELAYIMPORTS = comctl32 user32 gdi32 C_SRCS = \ diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 27918e148d9..6fad9d74836 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winedbg.exe APPMODE = -mconsole -IMPORTS = psapi dbghelp advapi32 kernel32 ntdll +IMPORTS = psapi dbghelp advapi32 DELAYIMPORTS = user32 gdi32 EXTRALIBS = @LIBPOLL@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS diff --git a/programs/winedevice/Makefile.in b/programs/winedevice/Makefile.in index abecb85f14f..c5b0bc6c4a6 100644 --- a/programs/winedevice/Makefile.in +++ b/programs/winedevice/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winedevice.exe APPMODE = -mwindows -municode -IMPORTS = advapi32 ntoskrnl.exe kernel32 ntdll +IMPORTS = advapi32 ntoskrnl.exe C_SRCS = \ device.c diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in index 9c5abf84d5b..92f39165648 100644 --- a/programs/winefile/Makefile.in +++ b/programs/winefile/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winefile.exe APPMODE = -mwindows -IMPORTS = uuid shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32 kernel32 +IMPORTS = uuid shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32 C_SRCS = \ splitpath.c \ diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in index beb29ee5a3d..dd8ba553f03 100644 --- a/programs/winemenubuilder/Makefile.in +++ b/programs/winemenubuilder/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winemenubuilder.exe APPMODE = -mwindows -municode -IMPORTS = uuid shell32 shlwapi ole32 user32 advapi32 kernel32 +IMPORTS = uuid shell32 shlwapi ole32 user32 advapi32 EXTRAINCL = @PNGINCL@ C_SRCS = \ diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index 059f137b59a..95031caad0b 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winemine.exe APPMODE = -mwindows -IMPORTS = user32 gdi32 advapi32 kernel32 +IMPORTS = user32 gdi32 advapi32 DELAYIMPORTS = shell32 C_SRCS = \ diff --git a/programs/winepath/Makefile.in b/programs/winepath/Makefile.in index f487c069393..8ee66492b70 100644 --- a/programs/winepath/Makefile.in +++ b/programs/winepath/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winepath.exe APPMODE = -mconsole -municode -IMPORTS = kernel32 C_SRCS = winepath.c diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 699113cf054..ab11876cf01 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winetest.exe APPMODE = -mconsole -IMPORTS = uuid comctl32 version user32 gdi32 advapi32 wsock32 kernel32 +IMPORTS = uuid comctl32 version user32 gdi32 advapi32 wsock32 DELAYIMPORTS = ole32 C_SRCS = \ diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in index 38c66e4057a..2919725493a 100644 --- a/programs/winevdm/Makefile.in +++ b/programs/winevdm/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winevdm.exe APPMODE = -mconsole -IMPORTS = user32 kernel32 kernel +IMPORTS = user32 kernel C_SRCS = \ winevdm.c diff --git a/programs/winhelp.exe16/Makefile.in b/programs/winhelp.exe16/Makefile.in index 999188a4335..d6daf220efd 100644 --- a/programs/winhelp.exe16/Makefile.in +++ b/programs/winhelp.exe16/Makefile.in @@ -3,8 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winhelp.exe16 -APPMODE = -mwindows -Wb,--subsystem,win16 -IMPORTS = kernel32 kernel +APPMODE = -m16 C_SRCS = winhelp.c diff --git a/programs/winhlp32/Makefile.in b/programs/winhlp32/Makefile.in index 48e96bf84c0..c889017e02e 100644 --- a/programs/winhlp32/Makefile.in +++ b/programs/winhlp32/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winhlp32.exe APPMODE = -mwindows -IMPORTS = user32 gdi32 kernel32 +IMPORTS = user32 gdi32 DELAYIMPORTS = shell32 comctl32 comdlg32 C_SRCS = \ diff --git a/programs/winoldap.mod16/Makefile.in b/programs/winoldap.mod16/Makefile.in index c80c89c316e..f35978ac787 100644 --- a/programs/winoldap.mod16/Makefile.in +++ b/programs/winoldap.mod16/Makefile.in @@ -3,8 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winoldap.mod16 -APPMODE = -mwindows -Wb,--subsystem,win16 -IMPORTS = kernel32 kernel ntdll +APPMODE = -m16 C_SRCS = winoldap.c diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in index ab276df2714..7d08d9ae303 100644 --- a/programs/winver/Makefile.in +++ b/programs/winver/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winver.exe APPMODE = -mwindows -IMPORTS = shell32 kernel32 +IMPORTS = shell32 C_SRCS = winver.c diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index 1e05b6760e5..9cc678541b9 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wordpad.exe APPMODE = -mwindows -mno-cygwin -IMPORTS = comdlg32 shell32 user32 gdi32 advapi32 kernel32 comctl32 +IMPORTS = comdlg32 shell32 user32 gdi32 advapi32 comctl32 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt EXTRADEFS = -DNO_LIBWINE_PORT MODCFLAGS = @BUILTINFLAG@ diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index 5ac2c78905c..25ede26593e 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = write.exe APPMODE = -mwindows -IMPORTS = user32 gdi32 kernel32 +IMPORTS = user32 gdi32 C_SRCS = write.c diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index 8d8e9e7f79e..42bbb1af060 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = xcopy.exe APPMODE = -mconsole -municode -mno-cygwin -IMPORTS = shell32 user32 kernel32 +IMPORTS = shell32 user32 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt MODCFLAGS = @BUILTINFLAG@