From c95b1aa37fa2eed3b49bb053d63d883d795ffb1b Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 16 Nov 2000 04:15:08 +0000 Subject: [PATCH] Avoid linking with ntdll where possible. --- dlls/Makefile.in | 14 +++++++------- dlls/avifil32/Makefile.in | 1 - dlls/dplayx/Makefile.in | 1 - dlls/imagehlp/Makefile.in | 1 - dlls/msacm/Makefile.in | 1 - dlls/msacm/msacm32.spec | 1 + dlls/oleaut32/oleaut32.spec | 1 + dlls/olecli/Makefile.in | 1 - dlls/olecli/olecli32.spec | 1 + dlls/olesvr/Makefile.in | 1 - dlls/olesvr/olesvr32.spec | 1 + dlls/rasapi32/Makefile.in | 1 - dlls/rasapi32/rasapi32.spec | 1 + dlls/version/Makefile.in | 1 - dlls/wininet/Makefile.in | 1 - dlls/winmm/mciseq/Makefile.in | 2 -- 16 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 7ab144323d1..9bdb628b0b9 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -389,7 +389,7 @@ libx11drv.@LIBEXT@: x11drv/libx11drv.@LIBEXT@ advapi32/libadvapi32.so: libkernel32.so libntdll.so avifil32/libavifil32.so: libmsvfw32.so libkernel32.so libntdll.so comctl32/libcomctl32.so: libuser32.so libgdi32.so libadvapi32.so libkernel32.so libntdll.so -commdlg/libcomdlg32.so: libshell32.so libshlwapi.so libcomctl32.so libuser32.so libwinspool.drv.so libgdi32.so libkernel32.so libntdll.so +commdlg/libcomdlg32.so: libshell32.so libshlwapi.so libcomctl32.so libwinspool.drv.so libuser32.so libgdi32.so libkernel32.so libntdll.so crtdll/libcrtdll.so: libkernel32.so libntdll.so dciman32/libdciman32.so: libntdll.so ddraw/libddraw.so: libole32.so libuser32.so libx11drv.so libgdi32.so libkernel32.so @@ -404,24 +404,24 @@ imm32/libimm32.so: libkernel32.so libntdll.so kernel/libkernel32.so: libntdll.so lzexpand/liblz32.so: libkernel32.so libntdll.so mpr/libmpr.so: libkernel32.so libntdll.so -msacm/libmsacm32.so: libwinmm.so libuser32.so libkernel32.so libntdll.so +msacm/libmsacm32.so: libwinmm.so libuser32.so libadvapi32.so libkernel32.so libntdll.so msnet32/libmsnet32.so: libntdll.so msvideo/libmsvfw32.so: libwinmm.so libuser32.so libgdi32.so libkernel32.so libntdll.so odbc32/libodbc32.so: libntdll.so ole32/libole32.so: libadvapi32.so libuser32.so libgdi32.so librpcrt4.so libkernel32.so libntdll.so -oleaut32/liboleaut32.so: libole32.so libuser32.so libgdi32.so libkernel32.so libntdll.so -olecli/libolecli32.so: libole32.so libolesvr32.so libgdi32.so libntdll.so +oleaut32/liboleaut32.so: libole32.so libuser32.so libgdi32.so libadvapi32.so libkernel32.so libntdll.so +olecli/libolecli32.so: libole32.so libolesvr32.so libgdi32.so libkernel32.so libntdll.so oledlg/liboledlg.so: libntdll.so olepro32/libolepro32.so: liboleaut32.so libntdll.so -olesvr/libolesvr32.so: libntdll.so +olesvr/libolesvr32.so: libkernel32.so libntdll.so opengl32/libopengl32.so: libx11drv.so libkernel32.so psapi/libpsapi.so: libkernel32.so libntdll.so -rasapi32/librasapi32.so: libntdll.so +rasapi32/librasapi32.so: libkernel32.so libntdll.so richedit/libriched32.so: libuser32.so libkernel32.so libntdll.so rpcrt4/librpcrt4.so: libkernel32.so libntdll.so serialui/libserialui.so: libuser32.so libadvapi32.so libkernel32.so libntdll.so setupapi/libsetupapi.so: libadvapi32.so libkernel32.so libntdll.so -shell32/libshell32.so: libole32.so libshlwapi.so libcomctl32.so libadvapi32.so libuser32.so libgdi32.so libkernel32.so libntdll.so +shell32/libshell32.so: libole32.so libshlwapi.so libcomctl32.so libuser32.so libgdi32.so libadvapi32.so libkernel32.so libntdll.so shfolder/libshfolder.so: libshell32.so shlwapi/libshlwapi.so: libadvapi32.so libuser32.so libgdi32.so libkernel32.so libntdll.so tapi32/libtapi32.so: libkernel32.so libntdll.so diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index 8b414583439..4a97b8a457f 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = avifil32 ALTNAMES = avifile -IMPORTS = ntdll LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in index 61ce0f2cc5f..951860fe3c2 100644 --- a/dlls/dplayx/Makefile.in +++ b/dlls/dplayx/Makefile.in @@ -3,7 +3,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dplayx -IMPORTS = ntdll LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in index badc3639aa9..a33be7f5818 100644 --- a/dlls/imagehlp/Makefile.in +++ b/dlls/imagehlp/Makefile.in @@ -3,7 +3,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = imagehlp -IMPORTS = ntdll LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/msacm/Makefile.in b/dlls/msacm/Makefile.in index 8677a7d82c8..e7df77b141c 100644 --- a/dlls/msacm/Makefile.in +++ b/dlls/msacm/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msacm32 ALTNAMES = msacm -IMPORTS = ntdll LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/msacm/msacm32.spec b/dlls/msacm/msacm32.spec index 51184d504ee..6094701bd95 100644 --- a/dlls/msacm/msacm32.spec +++ b/dlls/msacm/msacm32.spec @@ -5,6 +5,7 @@ rsrc msacm.res import winmm.dll import user32.dll +import advapi32.dll import kernel32.dll import ntdll.dll diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index a99c9325a55..e9b475c7243 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -4,6 +4,7 @@ type win32 import ole32.dll import user32.dll import gdi32.dll +import advapi32.dll import kernel32.dll import ntdll.dll diff --git a/dlls/olecli/Makefile.in b/dlls/olecli/Makefile.in index 11b653610a5..50fa196058a 100644 --- a/dlls/olecli/Makefile.in +++ b/dlls/olecli/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = olecli32 ALTNAMES = olecli -IMPORTS = ntdll LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/olecli/olecli32.spec b/dlls/olecli/olecli32.spec index 40985a8b175..1ca7ec6dfc3 100644 --- a/dlls/olecli/olecli32.spec +++ b/dlls/olecli/olecli32.spec @@ -4,6 +4,7 @@ type win32 import ole32.dll import olesvr32.dll import gdi32.dll +import kernel32.dll import ntdll.dll debug_channels (ole) diff --git a/dlls/olesvr/Makefile.in b/dlls/olesvr/Makefile.in index 188452d02d5..840980a4be6 100644 --- a/dlls/olesvr/Makefile.in +++ b/dlls/olesvr/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = olesvr32 ALTNAMES = olesvr -IMPORTS = ntdll LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/olesvr/olesvr32.spec b/dlls/olesvr/olesvr32.spec index aca7656f43c..07525466b56 100644 --- a/dlls/olesvr/olesvr32.spec +++ b/dlls/olesvr/olesvr32.spec @@ -1,6 +1,7 @@ name olesvr32 type win32 +import kernel32.dll import ntdll.dll debug_channels (ole) diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in index 58beb5db5b1..ea72b8f1909 100644 --- a/dlls/rasapi32/Makefile.in +++ b/dlls/rasapi32/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = rasapi32 ALTNAMES = rasapi16 -IMPORTS = ntdll LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index eb402d7dc4c..810e23075fd 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -1,6 +1,7 @@ name rasapi32 type win32 +import kernel32.dll import ntdll.dll debug_channels (ras) diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in index a9e4ab5904b..96951f091c4 100644 --- a/dlls/version/Makefile.in +++ b/dlls/version/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = version ALTNAMES = ver EXTRALIBS = -lwine_unicode -IMPORTS = ntdll LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index cb0ccec2e47..115acffff12 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -3,7 +3,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wininet -IMPORTS = ntdll LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/winmm/mciseq/Makefile.in b/dlls/winmm/mciseq/Makefile.in index 7de805d04d0..e55a1e7e2ad 100644 --- a/dlls/winmm/mciseq/Makefile.in +++ b/dlls/winmm/mciseq/Makefile.in @@ -3,8 +3,6 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mciseq.drv -SOVERSION = 1.0 -IMPORTS = ntdll LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o