Skip to content

build: Always use $(MAKE) to spawn sub-make #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mgorny wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build: Always use $(MAKE) to spawn sub-make #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions bootblocks/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,31 +55,31 @@ fs_min.o: minix.h

bootfile.sys: $(MSRC) $(MINC)
@rm -f $(MOBJ)
make 'CFLAGS=$(CFLAGS) -DDOSFLOPPY' monitor.out
$(MAKE) 'CFLAGS=$(CFLAGS) -DDOSFLOPPY' monitor.out
mv monitor.out bootfile.sys
@rm -f $(MOBJ)

boottar.sys: $(MSRC) $(MINC) tarboot.bin
@rm -f $(MOBJ)
make 'CFLAGS=$(CFLAGS) -DTARFLOPPY' monitor.out
$(MAKE) 'CFLAGS=$(CFLAGS) -DTARFLOPPY' monitor.out
mv monitor.out boottar.sys
@rm -f $(MOBJ)

bootminix.sys: $(MSRC) $(MINC) minix.bin
@rm -f $(MOBJ)
make 'CFLAGS=$(CFLAGS) -DMINFLOPPY' monitor.out
$(MAKE) 'CFLAGS=$(CFLAGS) -DMINFLOPPY' monitor.out
mv monitor.out bootminix.sys
@rm -f $(MOBJ)

monitor.sys: $(MSRC) $(MINC)
@rm -f $(MOBJ)
make monitor.out
$(MAKE) monitor.out
mv monitor.out monitor.sys
@rm -f $(MOBJ)

monitor: $(MSRC) $(MINC)
@rm -f $(MOBJ)
make 'CFLAGS=-ansi $(DEFS)' monitor.out
$(MAKE) 'CFLAGS=-ansi $(DEFS)' monitor.out
mv monitor.out monitor
@rm -f $(MOBJ)

Expand Down
2 changes: 1 addition & 1 deletion libbsd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ install: all
install -m 644 $(LIBBSD) $(LIBDIR)/i86

tests: dummy
make -C tests
$(MAKE) -C tests

$(LIBBSD): $(OBJS)
$(AR) rc $(LIBBSD) $(OBJS)
Expand Down
2 changes: 1 addition & 1 deletion makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ config: ;
#endif

makec:
echo 'cd $$1 ; shift ; make "$$@"' > makec
echo 'cd $$1 ; shift ; $(MAKE) "$$@"' > makec
chmod +x makec

versions: bcc/version.h
Expand Down