Remove all hardcoded make commands, changing them to ${MAKE}.

This is a first step towards being able to build RetroBSD on *BSD.
This commit is contained in:
Brian Callahan
2014-05-25 16:25:15 -04:00
parent b3abe580bd
commit bbba8d6f95
9 changed files with 26 additions and 26 deletions

View File

@@ -1,10 +1,10 @@
all: all:
make -C retro ${MAKE} -C retro
make -C linux ${MAKE} -C linux
install: install:
make -C retro install ${MAKE} -C retro install
clean: clean:
make -C retro clean ${MAKE} -C retro clean
make -C linux clean ${MAKE} -C linux clean

View File

@@ -68,18 +68,18 @@ acutab.o: acutab.c
log.o remote.o: Makefile log.o remote.o: Makefile
aculib: FRC aculib: FRC
cd aculib; make ${MFLAGS} cd aculib; ${MAKE} ${MFLAGS}
clean: FRC clean: FRC
rm -f ${OBJS} core tip tip.elf tip.dis rm -f ${OBJS} core tip tip.elf tip.dis
cd aculib; make ${MFLAGS} clean cd aculib; ${MAKE} ${MFLAGS} clean
depend: FRC depend: FRC
mkdep ${CFLAGS} ${SRCS} mkdep ${CFLAGS} ${SRCS}
cd aculib; make ${MFLAGS} depend cd aculib; ${MAKE} ${MFLAGS} depend
install: aculib tip install: aculib tip
cd aculib; make ${MFLAGS} install cd aculib; ${MAKE} ${MFLAGS} install
cp tip ${DESTDIR}/bin/tip cp tip ${DESTDIR}/bin/tip
rm -f ${DESTDIR}/bin/cu rm -f ${DESTDIR}/bin/cu
touch ${DESTDIR}/${ADM}/aculog touch ${DESTDIR}/${ADM}/aculog

View File

@@ -44,7 +44,7 @@ SUBDIRS=C. D.${HOSTNAME}X D.${HOSTNAME} D. X. TM.
all: libacu $(ALL) all: libacu $(ALL)
libacu: libacu:
cd aculib && make cd aculib && ${MAKE}
uuencode: uuencode.o uuencode: uuencode.o
@@ -136,7 +136,7 @@ install: uuencode uuencode
clean: clean:
rm -f *.o $(ALL) libuucp.a *.dis *.elf rm -f *.o $(ALL) libuucp.a *.dis *.elf
cd aculib; make ${MFLAGS} clean cd aculib; ${MAKE} ${MFLAGS} clean
depend: depend:
mkdep ${CFLAGS} *.c mkdep ${CFLAGS} *.c

View File

@@ -42,7 +42,7 @@ FRC:
install: $(STD) $(NSTD) install: $(STD) $(NSTD)
-for i in $(SUBDIR); do \ -for i in $(SUBDIR); do \
make -C $$i $(MFLAGS) DESTDIR=$(DESTDIR) install; done ${MAKE} -C $$i $(MFLAGS) DESTDIR=$(DESTDIR) install; done
-for i in $(STD) $(NSTD); do \ -for i in $(STD) $(NSTD); do \
install $$i $(DESTDIR)/games/$$i; done install $$i $(DESTDIR)/games/$$i; done
-for i in *.6; do \ -for i in *.6; do \
@@ -52,7 +52,7 @@ install: $(STD) $(NSTD)
clean: clean:
rm -f a.out core *.s *.o *.dis *.elf $(STD) $(NSTD) rm -f a.out core *.s *.o *.dis *.elf $(STD) $(NSTD)
-for i in $(SUBDIR); do make -C $$i $(MFLAGS) clean; done -for i in $(SUBDIR); do ${MAKE} -C $$i $(MFLAGS) clean; done
# Files listed in $(NSTD) have explicit make lines given below. # Files listed in $(NSTD) have explicit make lines given below.

View File

@@ -40,7 +40,7 @@ all: ../libc.a
rm -rf tmp rm -rf tmp
${ALL}: FRC ${ALL}: FRC
cd $@; make ${MFLAGS} DEFS="${DEFS}" cd $@; ${MAKE} ${MFLAGS} DEFS="${DEFS}"
FRC: FRC:
@@ -51,9 +51,9 @@ install: ../libc.a
clean: clean:
for i in ${ALL}; \ for i in ${ALL}; \
do (cd $$i; make ${MFLAGS} clean); done do (cd $$i; ${MAKE} ${MFLAGS} clean); done
rm -rf tmp *.a *~ rm -rf tmp *.a *~
depend: depend:
for i in ${ALL}; \ for i in ${ALL}; \
do (cd $$i; make ${MFLAGS} DEFS="${DEFS}" depend); done do (cd $$i; ${MAKE} ${MFLAGS} DEFS="${DEFS}" depend); done

View File

@@ -17,19 +17,19 @@ mips.a: ${ALL}
rm -rf tmp rm -rf tmp
${ALL}: FRC ${ALL}: FRC
cd $@; make ${MFLAGS} DEFS=${DEFS} cd $@; ${MAKE} ${MFLAGS} DEFS=${DEFS}
FRC: FRC:
tags: tags:
for i in ${ALL}; do \ for i in ${ALL}; do \
(cd $$i; make ${MFLAGS} TAGSFILE=../${TAGSFILE} tags); \ (cd $$i; ${MAKE} ${MFLAGS} TAGSFILE=../${TAGSFILE} tags); \
done done
clean: clean:
for i in ${ALL}; do (cd $$i; make ${MFLAGS} clean); done for i in ${ALL}; do (cd $$i; ${MAKE} ${MFLAGS} clean); done
rm -rf *.a tmp *~ rm -rf *.a tmp *~
depend: depend:
for i in ${ALL}; do \ for i in ${ALL}; do \
(cd $$i; make ${MFLAGS} DEFS=${DEFS} depend); done (cd $$i; ${MAKE} ${MFLAGS} DEFS=${DEFS} depend); done

View File

@@ -26,7 +26,7 @@ all: ../libtermcap.a termcap
.PHONY: termcap .PHONY: termcap
termcap: termcap:
cd termcap && make cd termcap && ${MAKE}
../libtermcap.a: ${OBJS} ../libtermcap.a: ${OBJS}
$(AR) cr ../libtermcap.a ${OBJS} $(AR) cr ../libtermcap.a ${OBJS}

View File

@@ -11,14 +11,14 @@ SUBDIR = misc
all: ${SUBDIR} all: ${SUBDIR}
${SUBDIR}: FRC ${SUBDIR}: FRC
cd $@; make ${MFLAGS} cd $@; ${MAKE} ${MFLAGS}
FRC: FRC:
install: FRC install: FRC
-for i in ${SUBDIR}; do \ -for i in ${SUBDIR}; do \
(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done (cd $$i; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install); done
clean: clean:
rm -f *~ rm -f *~
for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} clean); done for i in ${SUBDIR}; do (cd $$i; ${MAKE} ${MFLAGS} clean); done

View File

@@ -10,12 +10,12 @@ SUBDIR = baremetal dip duinomite duinomite-uart duinomite-e \
default: default:
all: all:
-for i in $(SUBDIR); do make -C $$i all; done -for i in $(SUBDIR); do ${MAKE} -C $$i all; done
install: install:
clean: clean:
-for i in $(SUBDIR); do make -C $$i clean; done -for i in $(SUBDIR); do ${MAKE} -C $$i clean; done
find .. -name \*~ | xargs rm -f find .. -name \*~ | xargs rm -f
reconfig: reconfig: