From bf84c6120ae0c76eebed3f31884547cfdda0be1f Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 8 Feb 2010 20:54:05 +0100 Subject: [PATCH] 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 9edb711482b..a0935bd4e79 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 0549119ee6b..3c651be128f 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 446ae724793..2cd642b4683 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::