From e4e99a5dfc01dda08d55eb8f11808d637d0f5b9f Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sat, 29 Jul 2000 11:35:12 +0000 Subject: [PATCH] ole32 now requires linking with kernel32 shell32 now requires linking with kernel32 and shlwapi --- libtest/Makefile.in | 2 +- programs/clock/Makefile.in | 2 +- programs/control/Makefile.in | 2 +- programs/notepad/Makefile.in | 2 +- programs/osversioncheck/Makefile.in | 1 + programs/progman/Makefile.in | 2 +- programs/wcmd/Makefile.in | 1 + programs/winhelp/Makefile.in | 2 +- programs/winver/Makefile.in | 2 +- 9 files changed, 9 insertions(+), 7 deletions(-) diff --git a/libtest/Makefile.in b/libtest/Makefile.in index 11c775f925a..4be60f73fc3 100644 --- a/libtest/Makefile.in +++ b/libtest/Makefile.in @@ -50,7 +50,7 @@ rolex: rolex.o rolex.spec.o $(CC) -o rolex $+ $(DLL_LINK) $(LIBS) vartest: vartest.o vartest.spec.o - $(CC) -o vartest $+ -L$(DLLDIR) -loleaut32 -lcomctl32 -lole32 -lrpcrt4 $(DLL_LINK) $(LIBS) + $(CC) -o vartest $+ -L$(DLLDIR) -lkernel32 -loleaut32 -lcomctl32 -lole32 -lrpcrt4 $(DLL_LINK) $(LIBS) volinfo: volinfo.o volinfo.spec.o $(CC) -o volinfo $+ $(DLL_LINK) $(LIBS) diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index 59271285a33..c2535f81989 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = clock -IMPORTS = shell32 comdlg32 ole32 rpcrt4 winspool.drv +IMPORTS = kernel32 shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv WRCEXTRA = -s -p clock LICENSELANG = En diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in index 6a82068654e..8a22cab0990 100644 --- a/programs/control/Makefile.in +++ b/programs/control/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = control -IMPORTS = shell32 ole32 rpcrt4 +IMPORTS = kernel32 shlwapi shell32 ole32 rpcrt4 C_SRCS = control.c diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index 644430bbce8..2814a882289 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = notepad -IMPORTS = shell32 ole32 rpcrt4 comdlg32 winspool.drv +IMPORTS = kernel32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv WRCEXTRA = -s -p notepad LICENSELANG = En diff --git a/programs/osversioncheck/Makefile.in b/programs/osversioncheck/Makefile.in index 9b2231e0d4b..48aded9c4b3 100644 --- a/programs/osversioncheck/Makefile.in +++ b/programs/osversioncheck/Makefile.in @@ -5,6 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = osversioncheck +IMPORTS = kernel32 C_SRCS = osversioncheck.c diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in index 9f08dea0655..c440185d32f 100644 --- a/programs/progman/Makefile.in +++ b/programs/progman/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = progman -IMPORTS = shell32 comdlg32 ole32 rpcrt4 winspool.drv +IMPORTS = kernel32 shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv WRCEXTRA = -s -p progman LICENSELANG = En diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in index 1fbacc85922..5385ffe0015 100644 --- a/programs/wcmd/Makefile.in +++ b/programs/wcmd/Makefile.in @@ -5,6 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = wcmd +IMPORTS = kernel32 WRCEXTRA = -s -p wcmd C_SRCS = \ diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in index cac5dc47fd5..25e7566ee14 100644 --- a/programs/winhelp/Makefile.in +++ b/programs/winhelp/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = winhelp hlp2sgml -IMPORTS = shell32 ole32 rpcrt4 comdlg32 winspool.drv +IMPORTS = kernel32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv WRCEXTRA = -s -p winhelp C_SRCS = \ diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in index 5a1fbb37fe3..5a916d72834 100644 --- a/programs/winver/Makefile.in +++ b/programs/winver/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = winver -IMPORTS = shell32 ole32 rpcrt4 +IMPORTS = kernel32 shlwapi shell32 ole32 rpcrt4 C_SRCS = winver.c