Renamed some 16-bit spec files to match the dll name.
This commit is contained in:
parent
1c9733c924
commit
a05e448d90
|
@ -11,7 +11,8 @@
|
||||||
|
|
||||||
DEFS = @DLLFLAGS@ -D__WINE__ $(EXTRADEFS)
|
DEFS = @DLLFLAGS@ -D__WINE__ $(EXTRADEFS)
|
||||||
DLLEXT = @DLLEXT@
|
DLLEXT = @DLLEXT@
|
||||||
SPEC_SRCS = $(ALTNAMES:.dll=.spec)
|
ALTSPECS = $(ALTNAMES:%.dll=%)
|
||||||
|
SPEC_SRCS = $(ALTSPECS:%=%.spec)
|
||||||
ALL_OBJS = $(MODULE:%.dll=%).spec.o $(OBJS)
|
ALL_OBJS = $(MODULE:%.dll=%).spec.o $(OBJS)
|
||||||
ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBS)
|
ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBS)
|
||||||
|
|
||||||
|
|
|
@ -125,7 +125,7 @@ all: \
|
||||||
dplay.dll$(DLLEXT) \
|
dplay.dll$(DLLEXT) \
|
||||||
dplayx.dll$(DLLEXT) \
|
dplayx.dll$(DLLEXT) \
|
||||||
dsound.dll$(DLLEXT) \
|
dsound.dll$(DLLEXT) \
|
||||||
gdi.dll$(DLLEXT) \
|
gdi.exe$(DLLEXT) \
|
||||||
gdi32.dll$(DLLEXT) \
|
gdi32.dll$(DLLEXT) \
|
||||||
icmp.dll$(DLLEXT) \
|
icmp.dll$(DLLEXT) \
|
||||||
imaadp32.acm$(DLLEXT) \
|
imaadp32.acm$(DLLEXT) \
|
||||||
|
@ -133,9 +133,9 @@ all: \
|
||||||
imm.dll$(DLLEXT) \
|
imm.dll$(DLLEXT) \
|
||||||
imm32.dll$(DLLEXT) \
|
imm32.dll$(DLLEXT) \
|
||||||
joystick.drv$(DLLEXT) \
|
joystick.drv$(DLLEXT) \
|
||||||
kernel.dll$(DLLEXT) \
|
|
||||||
kernel32.dll$(DLLEXT) \
|
kernel32.dll$(DLLEXT) \
|
||||||
keyboard.dll$(DLLEXT) \
|
keyboard.dll$(DLLEXT) \
|
||||||
|
krnl386.exe$(DLLEXT) \
|
||||||
lz32.dll$(DLLEXT) \
|
lz32.dll$(DLLEXT) \
|
||||||
lzexpand.dll$(DLLEXT) \
|
lzexpand.dll$(DLLEXT) \
|
||||||
mapi32.dll$(DLLEXT) \
|
mapi32.dll$(DLLEXT) \
|
||||||
|
@ -204,7 +204,7 @@ all: \
|
||||||
typelib.dll$(DLLEXT) \
|
typelib.dll$(DLLEXT) \
|
||||||
url.dll$(DLLEXT) \
|
url.dll$(DLLEXT) \
|
||||||
urlmon.dll$(DLLEXT) \
|
urlmon.dll$(DLLEXT) \
|
||||||
user.dll$(DLLEXT) \
|
user.exe$(DLLEXT) \
|
||||||
user32.dll$(DLLEXT) \
|
user32.dll$(DLLEXT) \
|
||||||
ver.dll$(DLLEXT) \
|
ver.dll$(DLLEXT) \
|
||||||
version.dll$(DLLEXT) \
|
version.dll$(DLLEXT) \
|
||||||
|
@ -277,7 +277,7 @@ dplayx.dll$(DLLEXT): dplayx/dplayx.dll$(DLLEXT)
|
||||||
dsound.dll$(DLLEXT): dsound/dsound.dll$(DLLEXT)
|
dsound.dll$(DLLEXT): dsound/dsound.dll$(DLLEXT)
|
||||||
$(RM) $@ && $(LN_S) dsound/dsound.dll$(DLLEXT) $@
|
$(RM) $@ && $(LN_S) dsound/dsound.dll$(DLLEXT) $@
|
||||||
|
|
||||||
gdi32.dll$(DLLEXT) dispdib.dll$(DLLEXT) gdi.dll$(DLLEXT) \
|
gdi32.dll$(DLLEXT) dispdib.dll$(DLLEXT) gdi.exe$(DLLEXT) \
|
||||||
wing.dll$(DLLEXT): gdi/gdi32.dll$(DLLEXT)
|
wing.dll$(DLLEXT): gdi/gdi32.dll$(DLLEXT)
|
||||||
$(RM) $@ && $(LN_S) gdi/gdi32.dll$(DLLEXT) $@
|
$(RM) $@ && $(LN_S) gdi/gdi32.dll$(DLLEXT) $@
|
||||||
|
|
||||||
|
@ -299,7 +299,7 @@ imm32.dll$(DLLEXT) imm.dll$(DLLEXT): imm32/imm32.dll$(DLLEXT)
|
||||||
joystick.drv$(DLLEXT): winmm/joystick/joystick.drv$(DLLEXT)
|
joystick.drv$(DLLEXT): winmm/joystick/joystick.drv$(DLLEXT)
|
||||||
$(RM) $@ && $(LN_S) winmm/joystick/joystick.drv$(DLLEXT) $@
|
$(RM) $@ && $(LN_S) winmm/joystick/joystick.drv$(DLLEXT) $@
|
||||||
|
|
||||||
kernel32.dll$(DLLEXT) comm.dll$(DLLEXT) kernel.dll$(DLLEXT) \
|
kernel32.dll$(DLLEXT) comm.dll$(DLLEXT) krnl386.exe$(DLLEXT) \
|
||||||
stress.dll$(DLLEXT) system.dll$(DLLEXT) toolhelp.dll$(DLLEXT) \
|
stress.dll$(DLLEXT) system.dll$(DLLEXT) toolhelp.dll$(DLLEXT) \
|
||||||
win87em.dll$(DLLEXT) windebug.dll$(DLLEXT) wprocs.dll$(DLLEXT): kernel/kernel32.dll$(DLLEXT)
|
win87em.dll$(DLLEXT) windebug.dll$(DLLEXT) wprocs.dll$(DLLEXT): kernel/kernel32.dll$(DLLEXT)
|
||||||
$(RM) $@ && $(LN_S) kernel/kernel32.dll$(DLLEXT) $@
|
$(RM) $@ && $(LN_S) kernel/kernel32.dll$(DLLEXT) $@
|
||||||
|
@ -448,7 +448,7 @@ urlmon.dll$(DLLEXT): urlmon/urlmon.dll$(DLLEXT)
|
||||||
$(RM) $@ && $(LN_S) urlmon/urlmon.dll$(DLLEXT) $@
|
$(RM) $@ && $(LN_S) urlmon/urlmon.dll$(DLLEXT) $@
|
||||||
|
|
||||||
user32.dll$(DLLEXT) ddeml.dll$(DLLEXT) display.dll$(DLLEXT) \
|
user32.dll$(DLLEXT) ddeml.dll$(DLLEXT) display.dll$(DLLEXT) \
|
||||||
keyboard.dll$(DLLEXT) mouse.dll$(DLLEXT) user.dll$(DLLEXT): user/user32.dll$(DLLEXT)
|
keyboard.dll$(DLLEXT) mouse.dll$(DLLEXT) user.exe$(DLLEXT): user/user32.dll$(DLLEXT)
|
||||||
$(RM) $@ && $(LN_S) user/user32.dll$(DLLEXT) $@
|
$(RM) $@ && $(LN_S) user/user32.dll$(DLLEXT) $@
|
||||||
|
|
||||||
version.dll$(DLLEXT) ver.dll$(DLLEXT): version/version.dll$(DLLEXT)
|
version.dll$(DLLEXT) ver.dll$(DLLEXT): version/version.dll$(DLLEXT)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
Makefile
|
Makefile
|
||||||
dispdib.spec.c
|
dispdib.spec.c
|
||||||
gdi.spec.c
|
gdi.exe.spec.c
|
||||||
gdi32.spec.c
|
gdi32.spec.c
|
||||||
printdrv.glue.c
|
printdrv.glue.c
|
||||||
version.res
|
version.res
|
||||||
|
|
|
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
MODULE = gdi32.dll
|
MODULE = gdi32.dll
|
||||||
ALTNAMES = gdi.dll dispdib.dll wing.dll
|
ALTNAMES = gdi.exe dispdib.dll wing.dll
|
||||||
IMPORTS = kernel32.dll ntdll.dll
|
IMPORTS = kernel32.dll ntdll.dll
|
||||||
EXTRALIBS = @FREETYPELIBS@
|
EXTRALIBS = @FREETYPELIBS@
|
||||||
EXTRAINCL = @FREETYPEINCL@
|
EXTRAINCL = @FREETYPEINCL@
|
||||||
|
@ -49,7 +49,7 @@ $(EXTRA_OBJS): dummy
|
||||||
version16.res: version16.rc
|
version16.res: version16.rc
|
||||||
$(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/version16.rc
|
$(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/version16.rc
|
||||||
|
|
||||||
gdi.spec.c: version16.res
|
gdi.exe.spec.c: version16.res
|
||||||
|
|
||||||
install:: install_libdir
|
install:: install_libdir
|
||||||
uninstall:: uninstall_libdir
|
uninstall:: uninstall_libdir
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
Makefile
|
Makefile
|
||||||
comm.spec.c
|
comm.spec.c
|
||||||
kernel.res
|
kernel.res
|
||||||
kernel.spec.c
|
|
||||||
kernel32.spec.c
|
kernel32.spec.c
|
||||||
|
krnl386.exe.spec.c
|
||||||
stress.spec.c
|
stress.spec.c
|
||||||
system.spec.c
|
system.spec.c
|
||||||
toolhelp.spec.c
|
toolhelp.spec.c
|
||||||
|
|
|
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
MODULE = kernel32.dll
|
MODULE = kernel32.dll
|
||||||
ALTNAMES = comm.dll kernel.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
|
||||||
IMPORTS = ntdll.dll
|
IMPORTS = ntdll.dll
|
||||||
|
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
|
@ -54,7 +54,7 @@ kernel.res: $(MC_SRCS:.mc=.mc.rc)
|
||||||
version16.res: version16.rc
|
version16.res: version16.rc
|
||||||
$(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/version16.rc
|
$(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/version16.rc
|
||||||
|
|
||||||
kernel.spec.c: version16.res
|
krnl386.exe.spec.c: version16.res
|
||||||
|
|
||||||
install:: install_libdir
|
install:: install_libdir
|
||||||
uninstall:: uninstall_libdir
|
uninstall:: uninstall_libdir
|
||||||
|
|
|
@ -5,6 +5,6 @@ keyboard.spec.c
|
||||||
mouse.spec.c
|
mouse.spec.c
|
||||||
property.glue.c
|
property.glue.c
|
||||||
text.glue.c
|
text.glue.c
|
||||||
user.spec.c
|
user.exe.spec.c
|
||||||
user32.spec.c
|
user32.spec.c
|
||||||
wnd16.glue.c
|
wnd16.glue.c
|
||||||
|
|
|
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
MODULE = user32.dll
|
MODULE = user32.dll
|
||||||
ALTNAMES = user.dll keyboard.dll ddeml.dll display.dll mouse.dll
|
ALTNAMES = user.exe keyboard.dll ddeml.dll display.dll mouse.dll
|
||||||
IMPORTS = gdi32.dll kernel32.dll ntdll.dll
|
IMPORTS = gdi32.dll kernel32.dll ntdll.dll
|
||||||
|
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
|
@ -81,7 +81,7 @@ display.spec.c: resources/display.res
|
||||||
|
|
||||||
mouse.spec.c: resources/mouse.res
|
mouse.spec.c: resources/mouse.res
|
||||||
|
|
||||||
user.spec.c: resources/version16.res
|
user.exe.spec.c: resources/version16.res
|
||||||
|
|
||||||
install:: install_libdir
|
install:: install_libdir
|
||||||
uninstall:: uninstall_libdir
|
uninstall:: uninstall_libdir
|
||||||
|
|
Loading…
Reference in New Issue