X-Git-Url: http://nitlanguage.org

diff --git a/src/nitls.nit b/src/nitls.nit
index b1598ac..0b8add6 100644
--- a/src/nitls.nit
+++ b/src/nitls.nit
@@ -46,28 +46,36 @@ class ProjTree
 end
 
 var tc = new ToolContext
-var model = new Model
-var mb = new ModelBuilder(model, tc)
 
 var opt_keep = new OptionBool("Ignore errors and files that are not a Nit source file", "-k", "--keep")
 var opt_recursive = new OptionBool("Process directories recussively", "-r", "--recursive")
 var opt_tree = new OptionBool("List source files in their groups and projects", "-t", "--tree")
 var opt_source = new OptionBool("List source files", "-s", "--source")
-var opt_project = new OptionBool("List projects paths (default)", "-p", "--project")
-var opt_depends = new OptionBool("List dependencies of given modules", "-M", "--depends")
+var opt_project = new OptionBool("List projects paths (default)", "-P", "--project")
+var opt_depends = new OptionBool("List dependencies of given modules", "-d", "--depends")
+var opt_make = new OptionBool("List dependencies suitable for a rule in a Makefile. Alias for -d, -p and -s", "-M")
 var opt_paths = new OptionBool("List only path (instead of name + path)", "-p", "--path")
 
-tc.option_context.add_option(opt_keep, opt_recursive, opt_tree, opt_source, opt_project, opt_depends, opt_paths)
+tc.option_context.add_option(opt_keep, opt_recursive, opt_tree, opt_source, opt_project, opt_depends, opt_paths, opt_make)
 tc.tooldescription = "Usage: nitls [OPTION]... <file.nit|directory>...\nLists the projects and/or paths of Nit sources files."
 tc.process_options(args)
 
-var sum = opt_tree.value.to_i + opt_source.value.to_i + opt_project.value.to_i + opt_depends.value.to_i
+if opt_make.value then
+	opt_depends.value = true
+	opt_paths.value = true
+	opt_source.value = true
+end
+
+var sum = opt_tree.value.to_i + opt_source.value.to_i + opt_project.value.to_i
 if sum > 1 then
 	print "Error: options --tree, --source, and --project are exclusives."
 	print tc.tooldescription
 	exit 1
 end
 
+var model = new Model
+var mb = new ModelBuilder(model, tc)
+
 if opt_depends.value then
 	if opt_recursive.value then
 		print "-M incompatible with -r"
@@ -75,38 +83,35 @@ if opt_depends.value then
 	end
 
 	mb.parse(tc.option_context.rest)
-	for x in model.mmodules do
-		print x.location.file.filename
+else
+	var files
+	if opt_recursive.value then
+		files = new Array[String]
+		for d in tc.option_context.rest do
+			var pipe = new IProcess("find", d, "-name", "*.nit")
+			while not pipe.eof do
+				var l = pipe.read_line
+				if l == "" then break # last line
+				l = l.substring(0,l.length-1) # strip last oef
+				files.add l
+			end
+			pipe.close
+			pipe.wait
+			if pipe.status != 0 and not opt_keep.value then exit 1
+		end
+	else
+		files = tc.option_context.rest
 	end
-end
-
-if sum == 0 then opt_project.value = true
 
-var files
-if opt_recursive.value then
-	files = new Array[String]
-	for d in tc.option_context.rest do
-		var pipe = new IProcess("find", d, "-name", "*.nit")
-		while not pipe.eof do
-			var l = pipe.read_line
-			if l == "" then break # last line
-			l = l.substring(0,l.length-1) # strip last oef
-			files.add l
+	for a in files do
+		var mp = mb.identify_file(a)
+		if mp == null then
+			if not opt_keep.value then tc.check_errors
 		end
-		pipe.close
-		pipe.wait
-		if pipe.status != 0 and not opt_keep.value then exit 1
 	end
-else
-	files = tc.option_context.rest
 end
 
-for a in files do
-	var mp = mb.identify_file(a)
-	if mp == null then
-		if not opt_keep.value then tc.check_errors
-	end
-end
+if sum == 0 then opt_project.value = true
 
 if opt_tree.value then
 	var ot = new ProjTree