diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-02-18 08:50:30 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-02-18 08:50:30 +0000 |
| commit | 664c79cf734da780461547a326b9bd4d1b750b6f (patch) | |
| tree | 29ac552b88195c64a4910b4be9440ac1dddf761a /GNUmakefile | |
| parent | 761db9405086654539460310fa37e2ad17901727 (diff) | |
| download | rtmux-664c79cf734da780461547a326b9bd4d1b750b6f.tar.gz rtmux-664c79cf734da780461547a326b9bd4d1b750b6f.tar.bz2 rtmux-664c79cf734da780461547a326b9bd4d1b750b6f.zip | |
INCDIRS after CPPFLAGS.
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile index e32161d7..18a1fecd 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.72 2009-02-18 08:41:22 nicm Exp $ +# $Id: GNUmakefile,v 1.73 2009-02-18 08:50:30 nicm Exp $ .PHONY: clean @@ -46,7 +46,7 @@ SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \ osdep-darwin.c attributes.c CC?= gcc -CPPFLAGS+= -I. -I- +INCDIRS+= -I. -I- CFLAGS+= -DBUILD="\"$(VERSION) ($(DATE))\"" -DMETA="'${META}'" ifdef FDEBUG CFLAGS+= -g -ggdb -DDEBUG @@ -68,7 +68,7 @@ INSTALLBIN= install -g bin -o root -m 555 INSTALLMAN= install -g bin -o root -m 444 ifeq ($(shell uname),IRIX64) -CPPFLAGS+= -Icompat -I/usr/local/include/ncurses +INCDIRS+= -Icompat -I/usr/local/include/ncurses SRCS+= compat/strlcpy.c compat/strtonum.c compat/daemon.c \ compat/asprintf.c compat/fgetln.c compat/forkpty-irix.c CFLAGS+= -DNO_STRLCPY -DNO_STRTONUM -DNO_TREE_H -DNO_SETPROCTITLE \ @@ -79,7 +79,7 @@ LIBS+= -lgen endif ifeq ($(shell uname),SunOS) -CPPFLAGS+= -Icompat -I/usr/local/include/ncurses +INCDIRS+= -Icompat -I/usr/local/include/ncurses SRCS+= compat/strtonum.c compat/daemon.c compat/forkpty-sunos.c \ compat/asprintf.c compat/fgetln.c compat/vis.c CFLAGS+= -DNO_STRTONUM -DNO_TREE_H -DNO_PATHS_H -DNO_SETPROCTITLE \ @@ -89,14 +89,14 @@ LIBS+= -lsocket -lnsl endif ifeq ($(shell uname),Darwin) -CPPFLAGS+= -Icompat +INCDIRS+= -Icompat SRCS+= compat/strtonum.c compat/bsd-poll.c compat/vis.c CFLAGS+= -DNO_STRTONUM -DNO_SETRESUID -DNO_SETRESGID -DNO_SETPROCTITLE \ -DNO_QUEUE_H -DNO_TREE_H -DBROKEN_POLL endif ifeq ($(shell uname),Linux) -CPPFLAGS+= -Icompat +INCDIRS+= -Icompat SRCS+= compat/strlcpy.c compat/strlcat.c compat/strtonum.c \ compat/fgetln.c compat/getopt_long.c compat/vis.c CFLAGS+= $(shell getconf LFS_CFLAGS) -D_GNU_SOURCE \ @@ -110,6 +110,8 @@ OBJS= $(patsubst %.c,%.o,$(SRCS)) CLEANFILES= ${PROG} *.o .depend *~ ${PROG}.core *.log compat/*.o index.html +CPPFLAGS:= ${INCDIRS} ${CPPFLAGS} + all: $(PROG) $(PROG): $(OBJS) |