X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=ifchange.go;h=fe1c2a853a64e79192f5a99a1b183adf74fc05aa;hb=6b1228a8f2c83bf1f7c74fe6405a0bf84f885896;hp=a7fe9472372548644cff5c06867bc79b5160ebd9;hpb=e14100898b08c312919f58f712f19f623f602748;p=goredo.git

diff --git a/ifchange.go b/ifchange.go
index a7fe947..fe1c2a8 100644
--- a/ifchange.go
+++ b/ifchange.go
@@ -83,18 +83,25 @@ func buildDependants(tgts []string) map[string]struct{} {
 	trace(CDebug, "collecting deps")
 	seen := map[string]struct{}{}
 	deps := map[string]map[string]struct{}{}
-	for _, tgt := range tgts {
-		for _, tgt := range collectDeps(Cwd, tgt, 0, deps) {
-			seen[tgt] = struct{}{}
+	for _, tgtInitial := range tgts {
+		for _, tgt := range collectDeps(Cwd, tgtInitial, 0, deps) {
+			if tgt != tgtInitial {
+				seen[tgt] = struct{}{}
+			}
 		}
 	}
 	if len(seen) == 0 {
 		return nil
 	}
 
+	levelOrig := Level
+	defer func() {
+		Level = levelOrig
+	}()
+	Level = 1
 	trace(CDebug, "building %d alwayses: %v", len(seen), seen)
 	errs := make(chan error, len(seen))
-	for tgt, _ := range seen {
+	for tgt := range seen {
 		if err := runScript(tgt, errs, false); err != nil {
 			trace(CErr, "always run error: %s, skipping dependants", err)
 			return nil
@@ -112,23 +119,18 @@ func buildDependants(tgts []string) map[string]struct{} {
 	}
 
 	queueSrc := make([]string, 0, len(seen))
-	for tgt, _ := range seen {
+	for tgt := range seen {
 		queueSrc = append(queueSrc, tgt)
 	}
 	if len(queueSrc) == 0 {
 		return seen
 	}
-	levelOrig := Level
-	defer func() {
-		Level = levelOrig
-	}()
-	Level = 1
 
 RebuildDeps:
 	trace(CDebug, "checking %d dependant targets: %v", len(queueSrc), queueSrc)
 	queue := []string{}
 	for _, tgt := range queueSrc {
-		for dep, _ := range deps[tgt] {
+		for dep := range deps[tgt] {
 			queue = append(queue, dep)
 		}
 	}