diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-02-18 08:41:22 +0000 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-02-18 08:41:22 +0000 |
commit | 03b76dbf35788b7c9e6bef6faf8401c1499b4cfb (patch) | |
tree | 1a5bd78b8058224651540ac90e978a6605d5e864 /Makefile | |
parent | 6d8ff85167dd89eaf1906b2e46794f396cbc16a6 (diff) |
Use CPPFLAGS.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.112 2009-02-17 08:08:42 nicm Exp $ +# $Id: Makefile,v 1.113 2009-02-18 08:41:22 nicm Exp $ .SUFFIXES: .c .o .y .h .PHONY: clean update-index.html upload-index.html @@ -44,12 +44,12 @@ SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \ window-clock.c window-scroll.c window-more.c window-copy.c \ window-choose.c \ options.c options-cmd.c paste.c colour.c utf8.c clock.c \ - tty.c tty-term.c tty-keys.c tty-write.c util.c names.c \ + tty.c tty-term.c tty-keys.c tty-write.c util.c names.c attributes.c \ osdep-unknown.c osdep-openbsd.c osdep-freebsd.c osdep-linux.c \ - osdep-darwin.c attributes.c + osdep-darwin.c osdep-netbsd.c CC?= cc -INCDIRS+= -I. -I- -I/usr/local/include +CPPFLAGS+= -I. -I- -I/usr/local/include CFLAGS+= -DMETA="'${META}'" .ifdef PROFILE # Don't use ccache @@ -82,7 +82,7 @@ LIBS+= -lutil -lncurses # FreeBSD and DragonFly .if ${OS} == "FreeBSD" || ${OS} == "DragonFly" -INCDIRS+= -Icompat +CPPFLAGS+= -Icompat SRCS+= compat/vis.c CFLAGS+= -DUSE_LIBUTIL_H -DNO_QUEUE_H -DNO_TREE_H LIBS+= -lcrypt @@ -90,7 +90,7 @@ LIBS+= -lcrypt # NetBSD .if ${OS} == "NetBSD" -INCDIRS+= -Icompat +CPPFLAGS= -Icompat SRCS+= compat/strtonum.c compat/vis.c LIBS+= -lcrypt CFLAGS+=-DNO_STRTONUM @@ -105,11 +105,11 @@ DISTFILES= *.[chyl] Makefile GNUmakefile *.[1-9] NOTES TODO CHANGES FAQ \ CLEANFILES= ${PROG} *.o .depend *~ ${PROG}.core *.log compat/*.o index.html .c.o: - ${CC} ${CFLAGS} ${INCDIRS} -c ${.IMPSRC} -o ${.TARGET} + ${CC} ${CPPFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} .y.o: ${YACC} ${.IMPSRC} - ${CC} ${CFLAGS} ${INCDIRS} -c y.tab.c -o ${.TARGET} + ${CC} ${CPPFLAGS} ${CFLAGS} -c y.tab.c -o ${.TARGET} all: ${PROG} @@ -117,7 +117,7 @@ ${PROG}: ${OBJS} ${CC} ${LDFLAGS} -o ${PROG} ${OBJS} ${LIBS} depend: - mkdep ${CFLAGS} ${INCDIRS} ${SRCS:M*.c} + mkdep ${CPPFLAGS} ${CFLAGS} ${SRCS:M*.c} dist: clean grep '^#FDEBUG=' Makefile |