From 45fa49be5dc2630187e78c8adec498b751d9481e Mon Sep 17 00:00:00 2001 From: Melody Horn Date: Fri, 26 Mar 2021 19:43:40 -0600 Subject: overhaul target handling --- src/main.rs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 4048886..2764e97 100644 --- a/src/main.rs +++ b/src/main.rs @@ -26,10 +26,6 @@ fn main() { // TODO dump command-line macros into environment // TODO add SHELL macro let mut makefile = Makefile::new(args.clone()); - if !args.no_builtin_rules { - makefile.add_builtins(); - } - makefile.add_env(); for filename in &args.makefile { if filename == &PathBuf::from("-") { makefile.and_read(stdin().lock()); @@ -37,4 +33,18 @@ fn main() { makefile.and_read_file(filename); }; } + + if args.print_everything { + println!("{}", &makefile); + } + + let targets = if args.targets().count() == 0 { + vec![makefile.first_non_special_target.clone().expect("couldn't find a target!")] + } else { + args.targets().cloned().collect() + }; + + for target in targets { + makefile.update_target(&target); + } } -- cgit v1.2.3