diff options
| author | tg <tg@FreeBSD.org> | 2001-07-26 11:04:08 +0000 |
|---|---|---|
| committer | tg <tg@FreeBSD.org> | 2001-07-26 11:04:08 +0000 |
| commit | cd2c06bb7ec34ec9fb4b691882112e487a19aee8 (patch) | |
| tree | f409f9a08a61ab1d49a6dcbdbd8a1ba276ee93bd /usr.bin/doscmd | |
| parent | 9bfb9eedcddf3ab4e79532e863cf16c5ff381090 (diff) | |
| download | FreeBSD-src-cd2c06bb7ec34ec9fb4b691882112e487a19aee8.zip FreeBSD-src-cd2c06bb7ec34ec9fb4b691882112e487a19aee8.tar.gz | |
Fix bugs introduced in 1.26:
- restore -I. in CFLAGS
- add dependencies of objects on font headers
- missing dependencies of font headers on their sources
Suggested by: bde
Diffstat (limited to 'usr.bin/doscmd')
| -rw-r--r-- | usr.bin/doscmd/Makefile | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile index f2bbe8e..701224f 100644 --- a/usr.bin/doscmd/Makefile +++ b/usr.bin/doscmd/Makefile @@ -7,9 +7,9 @@ SRCS= AsyncIO.c ParseBuffer.c bios.c callback.c cpu.c dos.c cmos.c config.c \ cwd.c debug.c disktab.c doscmd.c ems.c emuint.c exe.c i386-pinsn.c \ int.c int10.c int13.c int14.c int16.c int17.c int1a.c int2f.c intff.c \ mem.c mouse.c net.c port.c setver.c signal.c timer.c trace.c trap.c \ - tty.c video.c xms.c + tty.c video.c xms.c ${FONTHDRS} -CFLAGS+= -DDISASSEMBLER -I${.OBJDIR} +CFLAGS+= -I. -DDISASSEMBLER CLEANFILES= ${FONTFILES} ${FONTHDRS} emsdriv.sys redir.com .if ${OBJFORMAT} == "aout" @@ -38,8 +38,6 @@ CFLAGS+= -DNO_X FONTFILES= cp437-8x8.pcf.gz cp437-8x14.pcf.gz cp437-8x16.pcf.gz FONTHDRS= font8x8.h font8x14.h font8x16.h -beforedepend: ${FONTHDRS} - beforeinstall: .if ${OBJFORMAT} == "aout" ${INSTALL} ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \ @@ -76,16 +74,16 @@ cp437-8x14.pcf.gz: cp437-8x14.pcf.gz.uu cp437-8x16.pcf.gz: cp437-8x16.pcf.gz.uu uudecode ${.CURDIR}/cp437-8x16.pcf.gz.uu -font8x8.h: - uudecode -p ${.CURDIR}/share/syscons/fonts/cp437-8x8.fnt | \ +font8x8.h: ${.CURDIR}/../../share/syscons/fonts/cp437-8x8.fnt + uudecode -p ${.ALLSRC} | \ file2c 'u_int8_t font8x8[] = {' '};' > ${.TARGET} -font8x14.h: - uudecode -p ${.CURDIR}/share/syscons/fonts/cp437-8x14.fnt | \ +font8x14.h: ${.CURDIR}/../../share/syscons/fonts/cp437-8x8.fnt + uudecode -p ${.ALLSRC} | \ file2c 'u_int8_t font8x14[] = {' '};' > ${.TARGET} -font8x16.h: - uudecode -p ${.CURDIR}/share/syscons/fonts/cp437-8x16.fnt | \ +font8x16.h: ${.CURDIR}/../../share/syscons/fonts/cp437-8x8.fnt + uudecode -p ${.ALLSRC} | \ file2c 'u_int8_t font8x16[] = {' '};' > ${.TARGET} emsdriv.sys: emsdriv.sys.uu |
