Module: wine Branch: master Commit: bf84c6120ae0c76eebed3f31884547cfdda0be1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf84c6120ae0c76eebed3f3188...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Feb 8 20:54:05 2010 +0100
makefiles: Move the CROSSOBJS dependency to the generated default dependencies.
Get rid of a remaining C_SRCS16 reference.
---
configure | 2 +- configure.ac | 2 +- dlls/Maketest.rules.in | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configure b/configure index 9edb711..a0935bd 100755 --- a/configure +++ b/configure @@ -13644,7 +13644,7 @@ DEPENDENCIES="### Dependencies: Makefile: dummy -$(MAKEDEP) $(MAKEDEPFLAGS) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(DEPEND_SRCS)
-$(OBJS) $(C_SRCS16:.c=.o): $(IDL_GEN_HEADERS) +$(OBJS) $(CROSSOBJS): $(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS:.c=.o): $(IDL_GEN_C_SRCS) $(RC_SRCS:.rc=.res): $(IDL_TLB_SRCS:.idl=.tlb) $(LEX_SRCS:.l=.yy.o): $(LEX_SRCS:.l=.yy.c) diff --git a/configure.ac b/configure.ac index 0549119..3c651be 100644 --- a/configure.ac +++ b/configure.ac @@ -2088,7 +2088,7 @@ AC_SUBST(DEPENDENCIES,["### Dependencies: Makefile: dummy -$(MAKEDEP) $(MAKEDEPFLAGS) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(DEPEND_SRCS)
-$(OBJS) $(C_SRCS16:.c=.o): $(IDL_GEN_HEADERS) +$(OBJS) $(CROSSOBJS): $(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS:.c=.o): $(IDL_GEN_C_SRCS) $(RC_SRCS:.rc=.res): $(IDL_TLB_SRCS:.idl=.tlb) $(LEX_SRCS:.l=.yy.o): $(LEX_SRCS:.l=.yy.c) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 446ae72..2cd642b 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -51,8 +51,6 @@ crosstest:: @CROSSTEST@ $(CROSSTEST): $(CROSSOBJS) Makefile.in $(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(ALL_LIBS)
-$(CROSSOBJS): $(IDL_GEN_HEADERS) - # Rules for cleaning
testclean::