Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/makei/cli/makei_entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,17 @@ def handle_compile(args):
"""
Processing the compile command
"""
filenames=[]
set_environment_vars(args)
if args.file:
filenames = [args.file]
elif args.files:
filenames = map(os.path.basename, args.files.split(':'))
name=args.files.split(':')
for i in name:
if os.path.isdir(i):
filenames.append(i)
else:
filenames = map(os.path.basename, args.files.split(':'))
else:
filenames = []
targets = []
Expand Down Expand Up @@ -248,7 +254,12 @@ def handle_build(args):
if args.target:
target = args.target
elif args.subdir:
target = make_dir_target(args.subdir)
name = os.path.basename(args.subdir)
filenames = [args.subdir] if os.path.isdir(name) else []
if filenames:
for i in filenames:
target = make_dir_target(i)

else:
target = "all"
build_env = BuildEnv([target], args.make_options, get_override_vars(args))
Expand All @@ -259,7 +270,7 @@ def handle_build(args):


def make_dir_target(filename):
return f"dir_{os.path.basename(filename.strip(os.sep))}"
return f"dir_{filename.replace('/','_')}"


def handle_cvtsrcpf(args):
Expand Down
4 changes: 3 additions & 1 deletion src/mk/footer.mk
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,10 @@ endif
# This is a default rule - see Makefile
dir_$(d) : $(TARGETS_$(d))

slashify = $(subst _,/,$(1))

.SECONDEXPANSION:
dir_% : dir_$$(TOP)/$$(subst dir_,,$$(@F))
dir_% : dir_$$(TOP)/$$(call slashify,$$(subst dir_,,$$(@)))
@echo

endif
Expand Down