mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 03:08:19 +00:00
Fixed some dependencies.
This commit is contained in:
parent
f7694794de
commit
309fde7a1a
|
@ -17,13 +17,12 @@ SPEC_DEF = $(MAINSPEC).def
|
|||
WIN16_FILES = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16)
|
||||
ALL_OBJS = @WIN16_FILES@ $(OBJS) $(MODULE).dbg.o
|
||||
ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBS)
|
||||
IMPORTLIBS = $(DELAYIMPORTS:%=$(DLLDIR)/lib%.$(IMPLIBEXT)) $(IMPORTS:%=$(DLLDIR)/lib%.$(IMPLIBEXT))
|
||||
|
||||
all: $(MODULE)$(DLLEXT) $(SUBDIRS)
|
||||
|
||||
@MAKE_RULES@
|
||||
|
||||
IMPORTLIBS = $(DELAYIMPORTS:%=$(DLLDIR)/lib%.$(IMPLIBEXT)) $(IMPORTS:%=$(DLLDIR)/lib%.$(IMPLIBEXT))
|
||||
|
||||
# Rules for .so files
|
||||
|
||||
$(MAINSPEC).c: $(MAINSPEC) $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(IMPORTLIBS) $(WINEBUILD)
|
||||
|
@ -69,7 +68,7 @@ crosstest:: $(SUBDIRS:%=%/__crosstest__)
|
|||
|
||||
# Sanity check
|
||||
|
||||
Makedll.rules: $(TOPSRCDIR)/Makedll.rules.in $(TOPSRCDIR)/configure
|
||||
Makedll.rules: $(TOPSRCDIR)/dlls/Makedll.rules.in $(TOPSRCDIR)/configure
|
||||
@echo $? is newer than 'Makedll.rules', please rerun ./configure!
|
||||
@exit 1
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@ C_SRCS = $(CTESTS)
|
|||
EXTRA_SRCS = $(TESTLIST)
|
||||
EXTRA_OBJS = $(TESTLIST:.c=.o)
|
||||
ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBS)
|
||||
IMPORTLIBS = $(DELAYIMPORTS:%=$(DLLDIR)/lib%.$(IMPLIBEXT)) $(IMPORTS:%=$(DLLDIR)/lib%.$(IMPLIBEXT))
|
||||
|
||||
CROSSTEST = $(TESTDLL:%.dll=%)_crosstest.exe
|
||||
CROSSOBJS = $(C_SRCS:.c=.cross.o) $(TESTLIST:.c=.cross.o)
|
||||
|
@ -32,7 +33,7 @@ all: $(TESTPROGRAM)
|
|||
|
||||
# Rule for main module spec file
|
||||
|
||||
$(MODULE).spec.c: $(RC_SRCS:.rc=.res) $(OBJS) $(WINEBUILD)
|
||||
$(MODULE).spec.c: $(RC_SRCS:.rc=.res) $(OBJS) $(IMPORTLIBS) $(WINEBUILD)
|
||||
$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -exe $(MODULE) -mcui $(RC_SRCS:.rc=.res) $(OBJS) -L$(DLLDIR) -L.. $(DELAYIMPORTS:%=-d%) $(IMPORTS:%=-l%)
|
||||
|
||||
# Rules for .so main module
|
||||
|
@ -42,7 +43,7 @@ $(MODULE).so: $(MODULE).spec.o $(OBJS) Makefile.in
|
|||
|
||||
# Rules for .exe main module
|
||||
|
||||
$(MODULE): $(OBJS) $(RCOBJS) Makefile.in
|
||||
$(MODULE): $(OBJS) $(RCOBJS) $(IMPORTLIBS) Makefile.in
|
||||
$(CC) $(OBJS) $(RCOBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
|
||||
|
||||
# Rules for building test list
|
||||
|
@ -56,7 +57,7 @@ depend: $(TESTLIST)
|
|||
|
||||
check test:: $(TESTRESULTS) $(SUBDIRS:%=%/__test__)
|
||||
|
||||
$(TESTRESULTS): $(MODULE)$(DLLEXT) $(TOPOBJDIR)/dlls/$(TESTDLL)$(DLLEXT)
|
||||
$(TESTRESULTS): $(MODULE)$(DLLEXT) $(DLLDIR)/$(TESTDLL)$(DLLEXT)
|
||||
|
||||
# Rules for cross-compiling tests
|
||||
|
||||
|
|
Loading…
Reference in a new issue