diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 67 |
1 files changed, 58 insertions, 9 deletions
@@ -1,11 +1,20 @@ -include config.mk +CFLAGS += -Wall -Wno-pointer-sign -Wno-maybe-uninitialized \ + -Wno-attributes -I${PWD}/includedir \ + -DEXTENDED \ + -D 'DEF_WEAK(n)=_Static_assert(1, "")' \ + -idirafter ${PWD}/include \ + -idirafter ${PWD}/sys \ + -idirafter ${PWD}/lib/libutil \ + -idirafter ${PWD}/lib/libcrypto + BIN = \ diff \ doas \ + ed \ + grep \ m4 \ mandoc \ md5 \ - nc \ patch \ pax \ signify @@ -15,7 +24,6 @@ LIBOBJ = \ lib/libc/crypt/arc4random.o \ lib/libc/crypt/arc4random_uniform.o \ lib/libc/crypt/blowfish.o \ - lib/libc/gen/fts.o \ lib/libc/gen/getprogname.o \ lib/libc/gen/pwcache.o \ lib/libc/gen/readpassphrase.o \ @@ -48,19 +56,19 @@ LIBOBJ = \ lib/libutil/ohash.o \ lib/libutil/pidfile.o - MAN = \ usr.bin/diff/diff.1 \ usr.bin/doas/doas.1 \ usr.bin/doas/doas.conf.5 \ + usr.bin/grep/grep.1 \ usr.bin/mandoc/apropos.1 \ usr.bin/mandoc/makewhatis.8 \ usr.bin/mandoc/man.1 \ usr.bin/mandoc/man.conf.5 \ usr.bin/mandoc/mandoc.1 \ usr.bin/m4/m4.1 \ - usr.bin/nc/nc.1 \ usr.bin/patch/patch.1 \ + bin/ed/ed.1 \ bin/md5/md5.1 \ bin/md5/cksum.1 \ bin/pax/cpio.1 \ @@ -68,6 +76,11 @@ MAN = \ bin/pax/tar.1 \ usr.bin/signify/signify.1 +MANDOCLIBS = ${LIB} +GREPLIBS = ${LIB} + +include config.mk + .y.c: ${YACC} -o $@ $< .c.o: @@ -106,6 +119,36 @@ usr.bin/doas/env.o: usr.bin/doas/env.c doas: ${DOASOBJ} ${LIB} ${CC} ${LDFLAGS} -o $@ ${DOASOBJ} ${LIB} +# ------------------------------------------------------------------------------ +# ed +EDOBJ = \ + bin/ed/buf.o \ + bin/ed/glbl.o \ + bin/ed/io.o \ + bin/ed/main.o \ + bin/ed/re.o \ + bin/ed/sub.o \ + bin/ed/undo.o + +BINOBJ += ${EDOBJ} +bin/ed/sub.o: bin/ed/sub.c + ${CC} ${CFLAGS} -c -o $@ $< +ed: ${EDOBJ} ${LIB} + ${CC} ${LDFLAGS} -o $@ ${EDOBJ} ${LIB} + +# ------------------------------------------------------------------------------ +# grep +GREPOBJ = \ + usr.bin/grep/binary.o \ + usr.bin/grep/file.o \ + usr.bin/grep/grep.o \ + usr.bin/grep/mmfile.o \ + usr.bin/grep/queue.o \ + usr.bin/grep/util.o +BINOBJ += ${GREPOBJ} + +grep: ${GREPOBJ} ${GREPLIBS} + ${CC} ${LDFLAGS} -o $@ ${GREPOBJ} ${LIB} ${ZLIB} ${LIBFTS} # ------------------------------------------------------------------------------ # m4 @@ -193,8 +236,8 @@ MANDOCOBJ = \ usr.bin/mandoc/term_tag.o \ usr.bin/mandoc/tree.o BINOBJ += ${MANDOCOBJ} -mandoc: ${MANDOCOBJ} ${LIB} - ${CC} ${LDFLAGS} -o $@ ${MANDOCOBJ} ${LIB} ${ZLIB} +mandoc: ${MANDOCOBJ} ${MANDOCLIBS} + ${CC} ${LDFLAGS} -o $@ ${MANDOCOBJ} ${LIB} ${ZLIB} ${LIBFTS} # ------------------------------------------------------------------------------ # md5 @@ -221,6 +264,7 @@ nc: ${NCOBJ} ${LIB} # ------------------------------------------------------------------------------ # pax +PAXLINK = tar cpio PAXOBJ = \ bin/pax/ar_io.o \ bin/pax/ar_subs.o \ @@ -239,7 +283,7 @@ PAXOBJ = \ bin/pax/tty_subs.o BINOBJ += ${PAXOBJ} pax: ${PAXOBJ} ${LIB} - ${CC} ${LDFLAGS} -o $@ ${PAXOBJ} ${LIB} + ${CC} ${LDFLAGS} -o $@ ${PAXOBJ} ${LIB} ${LIBFTS} # ------------------------------------------------------------------------------ # patch @@ -307,7 +351,10 @@ LIBZOBJ = \ lib/libz/compress.o \ lib/libz/crc32.o \ lib/libz/deflate.o \ - lib/libz/gzio.o \ + lib/libz/gzclose.o \ + lib/libz/gzlib.o \ + lib/libz/gzread.o \ + lib/libz/gzwrite.o \ lib/libz/infback.o \ lib/libz/inffast.o \ lib/libz/inflate.o \ @@ -345,6 +392,8 @@ install: cp $${bin} ${DESTDIR}${BINDIR}; \ chmod 755 ${DESTDIR}${BINDIR}/$${bin##*/}; done chmod u+s ${DESTDIR}${BINDIR}/doas + for bin in ${PAXLINK}; do \ + ln -s pax ${DESTDIR}${BINDIR}/$${bin}; done for bin in ${MANDOCLINK}; do \ ln -s mandoc ${DESTDIR}${BINDIR}/$${bin}; done for bin in ${MD5LINK}; do \ |