Commit 67371bcc authored by Alexandre Julliard's avatar Alexandre Julliard

Added -res option to specify resources on winebuild command-line.

Added -exe mode to generate a .spec.c for an exe without having to provide a .spec. Removed some no longer needed spec files. Removed .dll extension in makefiles import specifications.
parent 8be2e3d4
...@@ -68,7 +68,6 @@ WRC = $(TOPOBJDIR)/tools/wrc/wrc ...@@ -68,7 +68,6 @@ WRC = $(TOPOBJDIR)/tools/wrc/wrc
WMC = $(TOPOBJDIR)/tools/wmc/wmc WMC = $(TOPOBJDIR)/tools/wmc/wmc
LDPATH = @LDPATH@ LDPATH = @LDPATH@
DLLDIR = $(TOPOBJDIR)/dlls DLLDIR = $(TOPOBJDIR)/dlls
MAINSPEC = $(MODULE:%.dll=%).spec
LIBWINE = -L$(TOPOBJDIR)/library -lwine LIBWINE = -L$(TOPOBJDIR)/library -lwine
LIBTSX11 = -L$(TOPOBJDIR)/tsx11 -lwine_tsx11 LIBTSX11 = -L$(TOPOBJDIR)/tsx11 -lwine_tsx11
LIBUNICODE= -L$(TOPOBJDIR)/unicode -lwine_unicode LIBUNICODE= -L$(TOPOBJDIR)/unicode -lwine_unicode
...@@ -104,7 +103,7 @@ includedir = @includedir@/wine ...@@ -104,7 +103,7 @@ includedir = @includedir@/wine
CLEAN_FILES = *.o *.a *.so *.ln \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ CLEAN_FILES = *.o *.a *.so *.ln \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
*.flc *.spec.c *.spec.def *.glue.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core *.flc *.spec.c *.spec.def *.glue.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
OBJS = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \ OBJS = $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \
$(ASM_SRCS:.S=.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS) $(ASM_SRCS:.S=.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS)
LINTS = $(C_SRCS:.c=.ln) LINTS = $(C_SRCS:.c=.ln)
...@@ -157,15 +156,10 @@ filter: ...@@ -157,15 +156,10 @@ filter:
# Rule for main module intermediate object # Rule for main module intermediate object
$(MODULE).tmp.o: $(OBJS) Makefile.in $(MODULE).tmp.o: $(SPEC_SRCS:.spec=.spec.o) $(OBJS) Makefile.in
$(LDCOMBINE) $(OBJS) -o $@ $(LDCOMBINE) $(SPEC_SRCS:.spec=.spec.o) $(OBJS) -o $@
-strip --strip-unneeded $@ -strip --strip-unneeded $@
# Rule for main module spec file
$(MAINSPEC).c: $(MAINSPEC) $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(WINEBUILD)
$(LDPATH) $(WINEBUILD) @DLLFLAGS@ $(SYMBOLFILE:%=-sym %) -o $@ -spec $(SRCDIR)/$(MAINSPEC) -L$(DLLDIR) $(DELAYIMPORTS:%=-dl%) $(IMPORTS:%=-l%)
# Rule to rebuild the resource compiler # Rule to rebuild the resource compiler
$(WRC): $(WRC):
...@@ -283,15 +277,13 @@ $(TESTPROGRAM).tmp.o: $(TESTOBJS) ...@@ -283,15 +277,13 @@ $(TESTPROGRAM).tmp.o: $(TESTOBJS)
$(LDCOMBINE) $(TESTOBJS) -o $@ $(LDCOMBINE) $(TESTOBJS) -o $@
-strip --strip-unneeded $@ -strip --strip-unneeded $@
$(TESTPROGRAM).spec.c: $(TESTPROGRAM).spec $(TESTPROGRAM).tmp.o $(WINEBUILD) $(TESTPROGRAM).spec.c: $(TESTPROGRAM).tmp.o $(WINEBUILD)
$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym $(TESTPROGRAM).tmp.o -o $@ -spec $(SRCDIR)/$(TESTPROGRAM).spec -L$(DLLDIR) $(TESTIMPORTS:%=-l%) $(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym $(TESTPROGRAM).tmp.o -o $@ -exe $(TESTPROGRAM) -mcui -L$(DLLDIR) $(TESTIMPORTS:%=-l%)
# Misc. rules # Misc. rules
$(SPEC_SRCS:.spec=.spec.c): $(WINEBUILD) $(SPEC_SRCS:.spec=.spec.c): $(WINEBUILD)
$(SPEC_SRCS:.spec=.spec.def): $(WINEBUILD)
$(GLUE:.c=.glue.c): $(WINEBUILD) $(GLUE:.c=.glue.c): $(WINEBUILD)
$(RC_SRCS:.rc=.res): $(WRC) $(RC_SRCS:.rc=.res): $(WRC)
......
...@@ -4,8 +4,9 @@ TOPOBJDIR = .. ...@@ -4,8 +4,9 @@ TOPOBJDIR = ..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = winedbg MODULE = winedbg
IMPORTS = advapi32.dll kernel32.dll ntdll.dll APPMODE = cui
DELAYIMPORTS = user32.dll IMPORTS = advapi32 kernel32 ntdll
DELAYIMPORTS = user32
C_SRCS = \ C_SRCS = \
break.c \ break.c \
......
...@@ -961,7 +961,7 @@ static void DEBUG_InitConsole(void) ...@@ -961,7 +961,7 @@ static void DEBUG_InitConsole(void)
SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), mode | WINE_ENABLE_LINE_INPUT_EMACS); SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), mode | WINE_ENABLE_LINE_INPUT_EMACS);
} }
int DEBUG_main(int argc, char** argv) int main(int argc, char** argv)
{ {
DWORD retv = 0; DWORD retv = 0;
......
name winedbg
mode cuiexe
type win32
init DEBUG_main
...@@ -12,15 +12,21 @@ DEFS = @DLLFLAGS@ -D__WINE__ $(EXTRADEFS) ...@@ -12,15 +12,21 @@ DEFS = @DLLFLAGS@ -D__WINE__ $(EXTRADEFS)
DLLEXT = @DLLEXT@ DLLEXT = @DLLEXT@
ALTSPECS = $(ALTNAMES:%.dll=%) ALTSPECS = $(ALTNAMES:%.dll=%)
SPEC_SRCS = $(ALTSPECS:%=%.spec) SPEC_SRCS = $(ALTSPECS:%=%.spec)
ALL_OBJS = $(MODULE:%.dll=%).spec.o $(OBJS) MAINSPEC = $(MODULE:%.dll=%).spec
SPEC_DEF = $(MAINSPEC).def
ALL_OBJS = $(MAINSPEC).o $(SPEC_SRCS:.spec=.spec.o) $(OBJS)
ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBS) ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBS)
SPEC_DEF = $(MODULE:%.dll=%).spec.def
TESTIMPORTS = $(MODULE) $(DELAYIMPORTS) $(IMPORTS) TESTIMPORTS = $(MODULE) $(DELAYIMPORTS) $(IMPORTS)
all: $(MODULE)$(DLLEXT) all: $(MODULE)$(DLLEXT)
@MAKE_RULES@ @MAKE_RULES@
# Rule for main module spec file
$(MAINSPEC).c: $(MAINSPEC) $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(WINEBUILD)
$(LDPATH) $(WINEBUILD) @DLLFLAGS@ $(SYMBOLFILE:%=-sym %) -o $@ -spec $(SRCDIR)/$(MAINSPEC) $(RC_SRCS:%.rc=-res %.res) -L$(DLLDIR) $(DELAYIMPORTS:%=-dl%) $(IMPORTS:%=-l%)
# Rules for .so files # Rules for .so files
$(MODULE).so: $(ALL_OBJS) Makefile.in $(MODULE).so: $(ALL_OBJS) Makefile.in
...@@ -28,8 +34,10 @@ $(MODULE).so: $(ALL_OBJS) Makefile.in ...@@ -28,8 +34,10 @@ $(MODULE).so: $(ALL_OBJS) Makefile.in
# Rules for .dll files # Rules for .dll files
$(MODULE): $(ALL_OBJS) $(SPEC_DEF) Makefile.in $(MODULE): $(OBJS) $(SPEC_DEF) Makefile.in
$(DLLWRAP) $(DLLWRAPFLAGS) --def $(SPEC_DEF) --implib $(MODULE:.dll=.a) -o $(MODULE) $(ALL_OBJS) -L$(DLLDIR) $(LDIMPORTS:%=-l%) $(ALL_LIBS) $(DLLWRAP) $(DLLWRAPFLAGS) --def $(SPEC_DEF) --implib $(MODULE:.dll=.a) -o $(MODULE) $(OBJS) -L$(DLLDIR) $(IMPORTS:%=-l%) $(ALL_LIBS)
$(SPEC_DEF): $(WINEBUILD)
# Rules for checking that no imports are missing # Rules for checking that no imports are missing
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = advapi32.dll MODULE = advapi32.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = avicap32.dll MODULE = avicap32.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = avifil32.dll MODULE = avifil32.dll
IMPORTS = msvfw32.dll kernel32.dll ntdll.dll IMPORTS = msvfw32 kernel32 ntdll
ALTNAMES = avifile.dll ALTNAMES = avifile.dll
EXTRALIBS = $(LIBUUID) EXTRALIBS = $(LIBUUID)
......
...@@ -4,8 +4,8 @@ TOPOBJDIR = ../.. ...@@ -4,8 +4,8 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = comctl32.dll MODULE = comctl32.dll
IMPORTS = user32.dll gdi32.dll advapi32.dll kernel32.dll ntdll.dll IMPORTS = user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = winmm.dll DELAYIMPORTS = winmm
EXTRALIBS = $(LIBUNICODE) EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
...@@ -39,8 +39,7 @@ C_SRCS = \ ...@@ -39,8 +39,7 @@ C_SRCS = \
treeview.c \ treeview.c \
updown.c updown.c
RC_SRCS= \ RC_SRCS= rsrc.rc
rsrc.rc
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
......
name comctl32 name comctl32
type win32 type win32
init COMCTL32_LibMain init COMCTL32_LibMain
rsrc rsrc.res
debug_channels (animate comboex commctrl datetime header hotkey imagelist ipaddress debug_channels (animate comboex commctrl datetime header hotkey imagelist ipaddress
listview message monthcal nativefont pager progress propsheet listview message monthcal nativefont pager progress propsheet
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = comdlg32.dll MODULE = comdlg32.dll
IMPORTS = shell32.dll shlwapi.dll comctl32.dll winspool.drv user32.dll gdi32.dll kernel32.dll ntdll.dll IMPORTS = shell32 shlwapi comctl32 winspool.drv user32 gdi32 kernel32 ntdll
ALTNAMES = commdlg.dll ALTNAMES = commdlg.dll
EXTRALIBS = $(LIBUUID) EXTRALIBS = $(LIBUUID)
...@@ -23,8 +23,7 @@ C_SRCS = \ ...@@ -23,8 +23,7 @@ C_SRCS = \
generic.c \ generic.c \
printdlg.c printdlg.c
RC_SRCS= \ RC_SRCS= rsrc.rc
rsrc.rc
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
......
name comdlg32 name comdlg32
type win32 type win32
init COMDLG32_DllEntryPoint init COMDLG32_DllEntryPoint
rsrc rsrc.res
debug_channels (commdlg) debug_channels (commdlg)
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = crtdll.dll MODULE = crtdll.dll
IMPORTS = msvcrt.dll kernel32.dll ntdll.dll IMPORTS = msvcrt kernel32 ntdll
EXTRALIBS = $(LIBUNICODE) EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = crypt32.dll MODULE = crypt32.dll
IMPORTS = advapi32.dll kernel32.dll ntdll.dll IMPORTS = advapi32 kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = dciman32.dll MODULE = dciman32.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = ddraw.dll MODULE = ddraw.dll
IMPORTS = user32.dll gdi32.dll kernel32.dll ntdll.dll IMPORTS = user32 gdi32 kernel32 ntdll
EXTRALIBS = $(LIBUUID) $(LIBTSX11) $(X_LIBS) $(XLIB) EXTRALIBS = $(LIBUUID) $(LIBTSX11) $(X_LIBS) $(XLIB)
LDIMPORTS = user32.dll gdi32.dll kernel32.dll ntdll.dll LDIMPORTS = user32.dll gdi32.dll kernel32.dll ntdll.dll
...@@ -42,8 +42,7 @@ C_SRCS = \ ...@@ -42,8 +42,7 @@ C_SRCS = \
main.c \ main.c \
struct_convert.c struct_convert.c
RC_SRCS = \ RC_SRCS = version.rc
version.rc
EXTRASUBDIRS = \ EXTRASUBDIRS = \
d3ddevice \ d3ddevice \
......
name ddraw name ddraw
type win32 type win32
init DDRAW_DllMain init DDRAW_DllMain
rsrc version.res
debug_channels (ddraw) debug_channels (ddraw)
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = devenum.dll MODULE = devenum.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = dinput.dll MODULE = dinput.dll
IMPORTS = user32.dll kernel32.dll ntdll.dll IMPORTS = user32 kernel32 ntdll
EXTRALIBS = $(LIBUUID) EXTRALIBS = $(LIBUUID)
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = dplay.dll MODULE = dplay.dll
IMPORTS = dplayx.dll IMPORTS = dplayx
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = dplayx.dll MODULE = dplayx.dll
IMPORTS = winmm.dll ole32.dll user32.dll advapi32.dll kernel32.dll ntdll.dll IMPORTS = winmm ole32 user32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUUID) EXTRALIBS = $(LIBUUID)
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
...@@ -20,8 +20,7 @@ C_SRCS = \ ...@@ -20,8 +20,7 @@ C_SRCS = \
lobbysp.c \ lobbysp.c \
name_server.c name_server.c
RC_SRCS = \ RC_SRCS = version.rc
version.rc
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
......
name dplayx name dplayx
type win32 type win32
init DPLAYX_LibMain init DPLAYX_LibMain
rsrc version.res
debug_channels (dplay) debug_channels (dplay)
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = dsound.dll MODULE = dsound.dll
IMPORTS = winmm.dll kernel32.dll ntdll.dll IMPORTS = winmm advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUUID) EXTRALIBS = $(LIBUUID)
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = gdi32.dll MODULE = gdi32.dll
IMPORTS = advapi32.dll kernel32.dll ntdll.dll IMPORTS = advapi32 kernel32 ntdll
ALTNAMES = gdi.exe dispdib.dll wing.dll ALTNAMES = gdi.exe dispdib.dll wing.dll
LDIMPORTS = kernel32.dll ntdll.dll LDIMPORTS = kernel32.dll ntdll.dll
EXTRAINCL = @FREETYPEINCL@ EXTRAINCL = @FREETYPEINCL@
...@@ -35,11 +35,8 @@ C_SRCS = \ ...@@ -35,11 +35,8 @@ C_SRCS = \
win16drv/text.c \ win16drv/text.c \
wing.c wing.c
RC_SRCS= \ RC_SRCS = version.rc
version.rc RC_SRCS16 = version16.rc
RC_SRCS16= \
version16.rc
GLUE = \ GLUE = \
printdrv.c \ printdrv.c \
......
name gdi32 name gdi32
type win32 type win32
init MAIN_GdiInit init MAIN_GdiInit
rsrc version.res
debug_channels (bitblt bitmap clipping dc ddraw driver enhmetafile font gdi debug_channels (bitblt bitmap clipping dc ddraw driver enhmetafile font gdi
metafile palette print region text win16drv wing) metafile palette print region text win16drv wing)
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = icmp.dll MODULE = icmp.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = imagehlp.dll MODULE = imagehlp.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = imm32.dll MODULE = imm32.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
ALTNAMES = imm.dll ALTNAMES = imm.dll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = kernel32.dll MODULE = kernel32.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
ALTNAMES = krnl386.exe comm.dll stress.dll system.dll toolhelp.dll windebug.dll win87em.dll wprocs.dll ALTNAMES = krnl386.exe comm.dll stress.dll system.dll toolhelp.dll windebug.dll win87em.dll wprocs.dll
LDIMPORTS = ntdll.dll LDIMPORTS = ntdll.dll
...@@ -24,8 +24,7 @@ C_SRCS = \ ...@@ -24,8 +24,7 @@ C_SRCS = \
windebug.c \ windebug.c \
wowthunk.c wowthunk.c
RC_SRCS = \ RC_SRCS = kernel.rc
kernel.rc
RC_SRCS16 = \ RC_SRCS16 = \
version16.rc version16.rc
......
name kernel32 name kernel32
type win32 type win32
init MAIN_KernelInit init MAIN_KernelInit
rsrc kernel.res
debug_channels (comm console debugstr dll int resource stress thunk toolhelp debug_channels (comm console debugstr dll int resource stress thunk toolhelp
win32) win32)
......
name kernel32_test
type win32
mode cuiexe
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = lz32.dll MODULE = lz32.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
ALTNAMES = lzexpand.dll ALTNAMES = lzexpand.dll
EXTRALIBS = $(LIBUNICODE) EXTRALIBS = $(LIBUNICODE)
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = mapi32.dll MODULE = mapi32.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = mpr.dll MODULE = mpr.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = msacm32.dll MODULE = msacm32.dll
IMPORTS = winmm.dll user32.dll advapi32.dll kernel32.dll ntdll.dll IMPORTS = winmm user32 advapi32 kernel32 ntdll
ALTNAMES = msacm.dll ALTNAMES = msacm.dll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
...@@ -19,8 +19,7 @@ C_SRCS = \ ...@@ -19,8 +19,7 @@ C_SRCS = \
pcmconverter.c \ pcmconverter.c \
stream.c stream.c
RC_SRCS = \ RC_SRCS = msacm.rc
msacm.rc
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
......
name msacm32 name msacm32
type win32 type win32
init MSACM32_LibMain init MSACM32_LibMain
rsrc msacm.res
debug_channels (msacm) debug_channels (msacm)
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = msg711.drv MODULE = msg711.drv
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = msdmo.dll MODULE = msdmo.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = msimg32.dll MODULE = msimg32.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = msisys.ocx MODULE = msisys.ocx
IMPORTS = ntdll.dll IMPORTS = ntdll
EXTRALIBS = $(LIBUUID) EXTRALIBS = $(LIBUUID)
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = msnet32.dll MODULE = msnet32.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = msrle32.dll MODULE = msrle32.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = msvcrt.dll MODULE = msvcrt.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
EXTRALIBS = $(LIBUNICODE) EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = msvcrt20.dll MODULE = msvcrt20.dll
IMPORTS = msvcrt.dll ntdll.dll IMPORTS = msvcrt ntdll
EXTRALIBS = $(LIBUNICODE) EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = msvfw32.dll MODULE = msvfw32.dll
IMPORTS = winmm.dll comctl32.dll version.dll user32.dll gdi32.dll kernel32.dll ntdll.dll IMPORTS = winmm comctl32 version user32 gdi32 kernel32 ntdll
ALTNAMES = msvideo.dll ALTNAMES = msvideo.dll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = netapi32.dll MODULE = netapi32.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = odbc32.dll MODULE = odbc32.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = ole32.dll MODULE = ole32.dll
IMPORTS = advapi32.dll user32.dll gdi32.dll rpcrt4.dll kernel32.dll ntdll.dll IMPORTS = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
ALTNAMES = ole2.dll ole2nls.dll ole2conv.dll ole2prox.dll ole2thk.dll storage.dll compobj.dll ALTNAMES = ole2.dll ole2nls.dll ole2conv.dll ole2prox.dll ole2thk.dll storage.dll compobj.dll
EXTRALIBS = $(LIBUUID) EXTRALIBS = $(LIBUUID)
...@@ -40,8 +40,7 @@ C_SRCS = \ ...@@ -40,8 +40,7 @@ C_SRCS = \
storage.c \ storage.c \
storage32.c storage32.c
RC_SRCS = \ RC_SRCS = ole32res.rc
ole32res.rc
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
......
name ole32 name ole32
type win32 type win32
init OLE32_DllEntryPoint init OLE32_DllEntryPoint
rsrc ole32res.res
debug_channels (accel ole relay storage) debug_channels (accel ole relay storage)
......
...@@ -3,8 +3,8 @@ TOPOBJDIR = ../.. ...@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = oleaut32.dll MODULE = oleaut32.dll
IMPORTS = ole32.dll user32.dll gdi32.dll advapi32.dll kernel32.dll ntdll.dll IMPORTS = ole32 user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = comctl32.dll DELAYIMPORTS = comctl32
ALTNAMES = ole2disp.dll typelib.dll ALTNAMES = ole2disp.dll typelib.dll
EXTRALIBS = $(LIBUUID) @JPEGLIB@ EXTRALIBS = $(LIBUUID) @JPEGLIB@
...@@ -26,8 +26,7 @@ C_SRCS = \ ...@@ -26,8 +26,7 @@ C_SRCS = \
typelib.c \ typelib.c \
variant.c variant.c
RC_SRCS = \ RC_SRCS = version.rc
version.rc
CTESTS = tests/vartest.c CTESTS = tests/vartest.c
......
name oleaut32 name oleaut32
type win32 type win32
rsrc version.res
debug_channels (ole olerelay typelib) debug_channels (ole olerelay typelib)
......
name oleaut32_tests
mode cuiexe
type win32
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = olecli32.dll MODULE = olecli32.dll
IMPORTS = ole32.dll gdi32.dll kernel32.dll ntdll.dll IMPORTS = ole32 gdi32 kernel32 ntdll
ALTNAMES = olecli.dll ALTNAMES = olecli.dll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = oledlg.dll MODULE = oledlg.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = olepro32.dll MODULE = olepro32.dll
IMPORTS = oleaut32.dll ntdll.dll IMPORTS = oleaut32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = olesvr32.dll MODULE = olesvr32.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
ALTNAMES = olesvr.dll ALTNAMES = olesvr.dll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = opengl32.dll MODULE = opengl32.dll
IMPORTS = user32.dll gdi32.dll kernel32.dll ntdll.dll IMPORTS = user32 gdi32 kernel32 ntdll
EXTRALIBS = $(LIBTSX11) $(X_LIBS) $(XLIB) EXTRALIBS = $(LIBTSX11) $(X_LIBS) $(XLIB)
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = psapi.dll MODULE = psapi.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = qcap.dll MODULE = qcap.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = quartz.dll MODULE = quartz.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = rasapi32.dll MODULE = rasapi32.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
ALTNAMES = rasapi16.dll ALTNAMES = rasapi16.dll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = riched32.dll MODULE = riched32.dll
IMPORTS = user32.dll kernel32.dll ntdll.dll IMPORTS = user32 kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = rpcrt4.dll MODULE = rpcrt4.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = serialui.dll MODULE = serialui.dll
IMPORTS = user32.dll advapi32.dll kernel32.dll ntdll.dll IMPORTS = user32 advapi32 kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
...@@ -11,8 +11,7 @@ SYMBOLFILE = $(MODULE).tmp.o ...@@ -11,8 +11,7 @@ SYMBOLFILE = $(MODULE).tmp.o
C_SRCS = \ C_SRCS = \
confdlg.c confdlg.c
RC_SRCS= \ RC_SRCS= serialui_rc.rc
serialui_rc.rc
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
......
name serialui name serialui
type win32 type win32
init SERIALUI_LibMain init SERIALUI_LibMain
rsrc serialui_rc.res
debug_channels (comm) debug_channels (comm)
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = setupapi.dll MODULE = setupapi.dll
IMPORTS = user32.dll advapi32.dll kernel32.dll ntdll.dll IMPORTS = user32 advapi32 kernel32 ntdll
ALTNAMES = setupx.dll ALTNAMES = setupx.dll
EXTRALIBS = $(LIBUNICODE) EXTRALIBS = $(LIBUNICODE)
...@@ -25,8 +25,7 @@ C_SRCS = \ ...@@ -25,8 +25,7 @@ C_SRCS = \
GLUE = \ GLUE = \
virtcopy.c virtcopy.c
RC_SRCS= \ RC_SRCS= setupapi.rc
setupapi.rc
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
......
name setupapi name setupapi
type win32 type win32
rsrc setupapi.res
debug_channels (setupapi) debug_channels (setupapi)
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = shdocvw.dll MODULE = shdocvw.dll
IMPORTS = ole32.dll kernel32.dll ntdll.dll IMPORTS = ole32 kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -5,7 +5,7 @@ SRCDIR = @srcdir@ ...@@ -5,7 +5,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = shell32.dll MODULE = shell32.dll
# fixme: avoid ole32.dll import # fixme: avoid ole32.dll import
IMPORTS = ole32.dll shlwapi.dll comctl32.dll user32.dll gdi32.dll advapi32.dll kernel32.dll ntdll.dll IMPORTS = ole32 shlwapi comctl32 user32 gdi32 advapi32 kernel32 ntdll
ALTNAMES = shell.dll ALTNAMES = shell.dll
EXTRALIBS = $(LIBUUID) $(LIBUNICODE) EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
...@@ -44,8 +44,7 @@ C_SRCS = \ ...@@ -44,8 +44,7 @@ C_SRCS = \
shv_item_cmenu.c \ shv_item_cmenu.c \
systray.c systray.c
RC_SRCS= \ RC_SRCS= shres.rc
shres.rc
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
......
name shell32 name shell32
type win32 type win32
init Shell32LibMain init Shell32LibMain
rsrc shres.res
debug_channels (exec pidl shell shlctrl) debug_channels (exec pidl shell shlctrl)
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = shfolder.dll MODULE = shfolder.dll
IMPORTS = shell32.dll IMPORTS = shell32
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = shlwapi.dll MODULE = shlwapi.dll
IMPORTS = user32.dll gdi32.dll advapi32.dll kernel32.dll ntdll.dll IMPORTS = user32 gdi32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUUID) $(LIBUNICODE) EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
name shlwapi_test
type win32
mode cuiexe
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = snmpapi.dll MODULE = snmpapi.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = sti.dll MODULE = sti.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = tapi32.dll MODULE = tapi32.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = ttydrv.dll MODULE = ttydrv.dll
IMPORTS = user32.dll gdi32.dll kernel32.dll ntdll.dll IMPORTS = user32 gdi32 kernel32 ntdll
LDIMPORTS = user32.dll gdi32.dll kernel32.dll ntdll.dll LDIMPORTS = user32.dll gdi32.dll kernel32.dll ntdll.dll
EXTRALIBS = @CURSESLIBS@ EXTRALIBS = @CURSESLIBS@
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = twain_32.dll MODULE = twain_32.dll
IMPORTS = user32.dll gdi32.dll kernel32.dll ntdll.dll IMPORTS = user32 gdi32 kernel32 ntdll
EXTRALIBS = @SANELIBS@ EXTRALIBS = @SANELIBS@
EXTRAINCL = @SANEINCL@ EXTRAINCL = @SANEINCL@
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = url.dll MODULE = url.dll
IMPORTS = ntdll.dll IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = urlmon.dll MODULE = urlmon.dll
IMPORTS = ole32.dll ntdll.dll IMPORTS = ole32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = user32.dll MODULE = user32.dll
IMPORTS = gdi32.dll advapi32.dll kernel32.dll ntdll.dll IMPORTS = gdi32 advapi32 kernel32 ntdll
ALTNAMES = user.exe keyboard.dll ddeml.dll display.dll mouse.dll ALTNAMES = user.exe keyboard.dll ddeml.dll display.dll mouse.dll
LDIMPORTS = gdi32.dll kernel32.dll ntdll.dll LDIMPORTS = gdi32.dll kernel32.dll ntdll.dll
...@@ -32,8 +32,7 @@ C_SRCS = \ ...@@ -32,8 +32,7 @@ C_SRCS = \
wnd16.c \ wnd16.c \
wsprintf.c wsprintf.c
RC_SRCS = \ RC_SRCS = resources/user32.rc
resources/user32.rc
RC_SRCS16 = \ RC_SRCS16 = \
resources/display.rc \ resources/display.rc \
......
name user32_test
type win32
mode cuiexe
name user32 name user32
type win32 type win32
init UserClientDllInitialize init UserClientDllInitialize
rsrc resources/user32.res
debug_channels (accel caret class clipboard combo comm cursor dc ddeml dialog debug_channels (accel caret class clipboard combo comm cursor dc ddeml dialog
driver edit event graphics hook icon key keyboard listbox local driver edit event graphics hook icon key keyboard listbox local
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = version.dll MODULE = version.dll
IMPORTS = lz32.dll kernel32.dll ntdll.dll IMPORTS = lz32 kernel32 ntdll
ALTNAMES = ver.dll ALTNAMES = ver.dll
EXTRALIBS = $(LIBUNICODE) EXTRALIBS = $(LIBUNICODE)
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = w32skrnl.dll MODULE = w32skrnl.dll
IMPORTS = kernel32.dll ntdll.dll IMPORTS = kernel32 ntdll
ALTNAMES = w32sys.dll win32s16.dll ALTNAMES = w32sys.dll win32s16.dll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = wnaspi32.dll MODULE = wnaspi32.dll
IMPORTS = advapi32.dll kernel32.dll ntdll.dll IMPORTS = advapi32 kernel32 ntdll
ALTNAMES = winaspi.dll ALTNAMES = winaspi.dll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = winedos.dll MODULE = winedos.dll
IMPORTS = user32.dll kernel32.dll ntdll.dll IMPORTS = user32 kernel32 ntdll
LDIMPORTS = user32.dll kernel32.dll ntdll.dll LDIMPORTS = user32.dll kernel32.dll ntdll.dll
C_SRCS = \ C_SRCS = \
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = wineps.dll MODULE = wineps.dll
IMPORTS = user32.dll gdi32.dll winspool.drv advapi32.dll kernel32.dll ntdll.dll IMPORTS = user32 gdi32 winspool.drv advapi32 kernel32 ntdll
ALTNAMES = wineps16.dll ALTNAMES = wineps16.dll
EXTRALIBS = @CUPSLIBS@ EXTRALIBS = @CUPSLIBS@
EXTRAINCL = @FREETYPEINCL@ EXTRAINCL = @FREETYPEINCL@
...@@ -74,8 +74,7 @@ C_SRCS = \ ...@@ -74,8 +74,7 @@ C_SRCS = \
type1afm.c \ type1afm.c \
$(DATA_C_SRCS) $(DATA_C_SRCS)
RC_SRCS= \ RC_SRCS= rsrc.rc
rsrc.rc
EXTRASUBDIRS = data EXTRASUBDIRS = data
......
name wineps name wineps
type win32 type win32
init PSDRV_Init init PSDRV_Init
rsrc rsrc.res
debug_channels (psdrv) debug_channels (psdrv)
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = wininet.dll MODULE = wininet.dll
IMPORTS = shlwapi.dll user32.dll kernel32.dll ntdll.dll IMPORTS = shlwapi user32 kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -4,7 +4,7 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = winmm.dll MODULE = winmm.dll
IMPORTS = user32.dll advapi32.dll kernel32.dll ntdll.dll IMPORTS = user32 advapi32 kernel32 ntdll
ALTNAMES = mmsystem.dll sound.dll ALTNAMES = mmsystem.dll sound.dll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
...@@ -25,8 +25,7 @@ GLUE = \ ...@@ -25,8 +25,7 @@ GLUE = \
mmsystem.c \ mmsystem.c \
time.c time.c
RC_SRCS = \ RC_SRCS = winmm_res.rc
winmm_res.rc
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = joystick.drv MODULE = joystick.drv
IMPORTS = winmm.dll user32.dll ntdll.dll IMPORTS = winmm user32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = mcianim.drv MODULE = mcianim.drv
IMPORTS = winmm.dll user32.dll kernel32.dll ntdll.dll IMPORTS = winmm user32 kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = mciavi.drv MODULE = mciavi.drv
IMPORTS = msvfw32.dll winmm.dll user32.dll gdi32.dll kernel32.dll ntdll.dll IMPORTS = msvfw32 winmm user32 gdi32 kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
...@@ -14,8 +14,7 @@ C_SRCS = \ ...@@ -14,8 +14,7 @@ C_SRCS = \
mmoutput.c \ mmoutput.c \
wnd.c wnd.c
RC_SRCS = \ RC_SRCS = mciavi_res.rc
mciavi_res.rc
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
......
...@@ -2,7 +2,6 @@ name mciavi ...@@ -2,7 +2,6 @@ name mciavi
file mciavi.drv file mciavi.drv
type win32 type win32
init MCIAVI_LibMain init MCIAVI_LibMain
rsrc mciavi_res.res
debug_channels (mciavi) debug_channels (mciavi)
......
...@@ -3,8 +3,8 @@ TOPOBJDIR = ../../.. ...@@ -3,8 +3,8 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = mcicda.drv MODULE = mcicda.drv
IMPORTS = winmm.dll kernel32.dll ntdll.dll IMPORTS = winmm kernel32 ntdll
DELAYIMPORTS = user32.dll DELAYIMPORTS = user32
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,8 +3,8 @@ TOPOBJDIR = ../../.. ...@@ -3,8 +3,8 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = mciseq.drv MODULE = mciseq.drv
IMPORTS = winmm.dll kernel32.dll ntdll.dll IMPORTS = winmm kernel32 ntdll
DELAYIMPORTS = user32.dll DELAYIMPORTS = user32
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,8 +3,8 @@ TOPOBJDIR = ../../.. ...@@ -3,8 +3,8 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = mciwave.drv MODULE = mciwave.drv
IMPORTS = winmm.dll kernel32.dll ntdll.dll IMPORTS = winmm kernel32 ntdll
DELAYIMPORTS = user32.dll DELAYIMPORTS = user32
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = midimap.drv MODULE = midimap.drv
IMPORTS = winmm.dll user32.dll advapi32.dll kernel32.dll ntdll.dll IMPORTS = winmm user32 advapi32 kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
...@@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. ...@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = msacm.drv MODULE = msacm.drv
IMPORTS = msacm32.dll winmm.dll user32.dll kernel32.dll ntdll.dll IMPORTS = msacm32 winmm user32 kernel32 ntdll
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment