Skip to content
Snippets Groups Projects
Commit e048adab authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

List 16-bit spec files explicitly to avoid problems with some versions

of make.
parent 9e4fc4c9
No related branches found
No related tags found
No related merge requests found
Showing
with 80 additions and 30 deletions
......@@ -10,7 +10,6 @@
# C_SRCS : C sources for the module
# C_SRCS16 : 16-bit C sources for the module
# RC_SRCS : resource source files
# SPEC_SRCS : interface definition files
# EXTRA_SRCS : extra source files for make depend
# EXTRA_OBJS : extra object files
# IMPORTS : dlls to import
......@@ -154,7 +153,7 @@ $(MODULE).dbg.c: $(C_SRCS) $(C_SRCS16) $(WINEBUILD)
# Rule to rebuild the tools
$(MAKEDEP) $(WIDL) $(WINEBUILD) $(WMC) $(WRC):
$(MAKEDEP):
cd $(TOOLSDIR)/tools && $(MAKE) `basename $@`
# Rules for makefile
......@@ -163,28 +162,6 @@ Makefile: Makefile.in $(TOPSRCDIR)/configure
@echo Makefile is older than $?, please rerun $(TOPSRCDIR)/configure
@exit 1
# Rules for auto documentation
$(SUBDIRS:%=%/__man__): dummy
cd `dirname $@` && $(MAKE) man
man: $(C_SRCS) $(SUBDIRS:%=%/__man__)
$(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/man$(api_manext) && $(C2MAN) -o $(TOPOBJDIR)/documentation/man$(api_manext) -R$(TOPOBJDIR) -S$(api_manext) $(DIVINCL) $(MAINSPEC:%=-w %) $(SPEC_SRCS:%=-w %) $(C_SRCS) $(C_SRCS16)
$(SUBDIRS:%=%/__doc_html__): dummy
cd `dirname $@` && $(MAKE) doc-html
doc-html: $(C_SRCS) $(SUBDIRS:%=%/__doc_html__)
$(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/html && $(C2MAN) -o $(TOPOBJDIR)/documentation/html -R$(TOPOBJDIR) $(DIVINCL) -Th $(MAINSPEC:%=-w %) $(SPEC_SRCS:%=-w %) $(C_SRCS) $(C_SRCS16)
$(SUBDIRS:%=%/__doc_sgml__): dummy
cd `dirname $@` && $(MAKE) doc-sgml
doc-sgml: $(C_SRCS) $(SUBDIRS:%=%/__doc_sgml__)
$(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/api-guide && $(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide -R$(TOPOBJDIR) $(DIVINCL) -Ts $(MAINSPEC:%=-w %) $(SPEC_SRCS:%=-w %) $(C_SRCS) $(C_SRCS16)
.PHONY: man doc-html doc-sgml $(SUBDIRS:%=%/__man__) $(SUBDIRS:%=%/__doc_html__) $(SUBDIRS:%=%/__doc_sgml__)
# Rule for linting
$(MODULE).ln : $(LINTS)
......@@ -274,8 +251,6 @@ $(SUBDIRS:%=%/__crosstest__): dummy
# Misc. rules
$(SPEC_SRCS:.spec=.spec.c): $(WINEBUILD)
$(RC_SRCS:.rc=.res): $(WRC)
$(RC_SRCS16:.rc=.res): $(WRC)
......
......@@ -133,7 +133,7 @@ tags ctags:
manpages:
$(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/man3w
for i in $(SUBDIRS); do (cd $$i && $(MAKE) man); done
cd dlls && $(MAKE) man
htmlpages:
$(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/html
......
......@@ -4,17 +4,16 @@
# MODULE : name of the main module being built
# ALTNAMES : alternate names for this dll (optional)
# EXTRALIBS : extra libraries to link in (optional)
# SPEC_SRCS16 : interface definition files for 16-bit dlls (optional)
#
# plus all variables required by the global Make.rules.in
#
DEFS = @DLLFLAGS@ -D__WINESRC__ $(EXTRADEFS)
DLLEXT = @DLLEXT@
ALTSPECS = $(ALTNAMES:%.dll=%)
SPEC_SRCS = $(ALTSPECS:%=%.spec)
MAINSPEC = $(MODULE:%.dll=%).spec
SPEC_DEF = $(MAINSPEC).def
WIN16_FILES = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16)
WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16)
ALL_OBJS = @WIN16_FILES@ $(OBJS) $(MODULE).dbg.o
ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBPORT) $(LIBS)
IMPORTLIBS = $(DELAYIMPORTS:%=$(DLLDIR)/lib%.$(IMPLIBEXT)) $(IMPORTS:%=$(DLLDIR)/lib%.$(IMPLIBEXT))
......@@ -66,6 +65,28 @@ check test:: $(SUBDIRS:%=%/__test__)
crosstest:: $(SUBDIRS:%=%/__crosstest__)
# Rules for auto documentation
$(SUBDIRS:%=%/__man__): dummy
cd `dirname $@` && $(MAKE) man
man: $(C_SRCS) $(SUBDIRS:%=%/__man__)
$(C2MAN) -o $(TOPOBJDIR)/documentation/man$(api_manext) -R$(TOPOBJDIR) -S$(api_manext) $(DIVINCL) $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16)
$(SUBDIRS:%=%/__doc_html__): dummy
cd `dirname $@` && $(MAKE) doc-html
doc-html: $(C_SRCS) $(SUBDIRS:%=%/__doc_html__)
$(C2MAN) -o $(TOPOBJDIR)/documentation/html -R$(TOPOBJDIR) $(DIVINCL) -Th $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16)
$(SUBDIRS:%=%/__doc_sgml__): dummy
cd `dirname $@` && $(MAKE) doc-sgml
doc-sgml: $(C_SRCS) $(SUBDIRS:%=%/__doc_sgml__)
$(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide -R$(TOPOBJDIR) $(DIVINCL) -Ts $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16)
.PHONY: man doc-html doc-sgml $(SUBDIRS:%=%/__man__) $(SUBDIRS:%=%/__doc_html__) $(SUBDIRS:%=%/__doc_sgml__)
# Sanity check
Makedll.rules: $(TOPSRCDIR)/dlls/Makedll.rules.in $(TOPSRCDIR)/configure
......@@ -90,4 +111,8 @@ install:: install_lib @WIN16_INSTALL@
uninstall::
$(RM) $(dlldir)/$(MODULE)$(DLLEXT) $(ALTNAMES:%=$(dlldir)/%$(DLLEXT))
# Misc. rules
$(SPEC_SRCS16:.spec=.spec.c): $(WINEBUILD)
# End of global dll rules
......@@ -10,6 +10,8 @@ EXTRALIBS = $(LIBUUID)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = \
acmstream.c \
api.c \
......
......@@ -10,6 +10,8 @@ EXTRALIBS = $(LIBUUID)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = \
cdlg32.c \
colordlg.c \
......
......@@ -9,6 +9,8 @@ ALTNAMES = ctl3d.dll ctl3dv2.dll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = ctl3d32.c
C_SRCS16 = ctl3d.c
......
......@@ -12,6 +12,11 @@ EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = \
dispdib.spec \
gdi.exe.spec \
wing.spec
C_SRCS = \
$(TOPOBJDIR)/graphics/bitblt.c \
$(TOPOBJDIR)/graphics/dispdib.c \
......
......@@ -9,6 +9,8 @@ ALTNAMES = imm.dll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = \
imm.c
......
......@@ -9,6 +9,16 @@ ALTNAMES = krnl386.exe comm.dll stress.dll system.dll toolhelp.dll windebug.dll
LDIMPORTS = ntdll.dll
DLLMAIN = MAIN_KernelInit
SPEC_SRCS16 = \
comm.spec \
krnl386.exe.spec \
stress.spec \
system.spec \
toolhelp.spec \
win87em.spec \
windebug.spec \
wprocs.spec
C_SRCS = \
$(TOPOBJDIR)/ole/ole2nls.c \
comm.c \
......
......@@ -10,6 +10,8 @@ EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = lzexpand_main.c
C_SRCS16 = lzexpand16.c
......
......@@ -9,6 +9,8 @@ ALTNAMES = msacm.dll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = \
driver.c \
filter.c \
......
......@@ -9,6 +9,8 @@ ALTNAMES = msvideo.dll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = \
mciwnd.c \
msvideo_main.c \
......
......@@ -11,6 +11,8 @@ EXTRALIBS = $(LIBUUID)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = \
antimoniker.c \
bindctx.c \
......
......@@ -12,6 +12,8 @@ EXTRALIBS = $(LIBUNICODE) $(LIBUUID) @GIFLIB@ @JPEGLIB@
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = \
connpt.c \
dispatch.c \
......
......@@ -9,6 +9,8 @@ ALTNAMES = olecli.dll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = \
olecli_main.c
......
......@@ -9,6 +9,8 @@ ALTNAMES = olesvr.dll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = \
olesvr_main.c
......
......@@ -9,6 +9,8 @@ ALTNAMES = rasapi16.dll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = rasapi.c
@MAKE_DLL_RULES@
......
......@@ -11,6 +11,8 @@ EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = \
devinst.c \
dirid.c \
......
......@@ -12,6 +12,8 @@ EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = \
brsfolder.c \
changenotify.c \
......
......@@ -12,6 +12,13 @@ DLLMAIN = UserClientDllInitialize
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
SPEC_SRCS16 = \
ddeml.spec \
display.spec \
keyboard.spec \
mouse.spec \
user.exe.spec
C_SRCS = \
$(TOPOBJDIR)/controls/button.c \
$(TOPOBJDIR)/controls/combo.c \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment