=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/compat.c,v retrieving revision 1.6 retrieving revision 1.7 diff -c -r1.6 -r1.7 *** src/usr.bin/make/compat.c 1997/04/20 22:28:25 1.6 --- src/usr.bin/make/compat.c 1997/04/21 08:37:49 1.7 *************** *** 1,4 **** ! /* $OpenBSD: compat.c,v 1.6 1997/04/20 22:28:25 millert Exp $ */ /* $NetBSD: compat.c,v 1.18 1997/03/28 22:31:22 christos Exp $ */ /* --- 1,4 ---- ! /* $OpenBSD: compat.c,v 1.7 1997/04/21 08:37:49 deraadt Exp $ */ /* $NetBSD: compat.c,v 1.18 1997/03/28 22:31:22 christos Exp $ */ /* *************** *** 43,49 **** #if 0 static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94"; #else ! static char rcsid[] = "$OpenBSD: compat.c,v 1.6 1997/04/20 22:28:25 millert Exp $"; #endif #endif /* not lint */ --- 43,49 ---- #if 0 static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94"; #else ! static char rcsid[] = "$OpenBSD: compat.c,v 1.7 1997/04/21 08:37:49 deraadt Exp $"; #endif #endif /* not lint */ *************** *** 367,375 **** GNode *gn = (GNode *) gnp; GNode *pgn = (GNode *) pgnp; ! if (gn->type & OP_USE) { ! Make_HandleUse(gn, pgn); ! } else if (gn->made == UNMADE) { /* * First mark ourselves to be made, then apply whatever transformations * the suffix module thinks are necessary. Once that's done, we can --- 367,378 ---- GNode *gn = (GNode *) gnp; GNode *pgn = (GNode *) pgnp; ! if (pgn->type & OP_MADE) { ! (void) Dir_MTime(gn); ! gn->made = UPTODATE; ! } ! ! if (gn->made == UNMADE) { /* * First mark ourselves to be made, then apply whatever transformations * the suffix module thinks are necessary. Once that's done, we can *************** *** 627,632 **** --- 630,641 ---- } } } + + /* + * Expand .USE nodes right now, because they can modify the structure + * of the tree. + */ + Lst_Destroy(Make_ExpandUse(targs), NOFREE); /* * For each entry in the list of targets to create, call CompatMake on