The GCC 2.96 snapshots have slightly different rules for finding include
files. Mostly -I${.CURDIR} was needed -- especially for YACC generated
files as the new cpp does not look in the ultimate source file
(ie, the .y file)'s directory as told by the "#line" directive. Some were
misspellings of "-I${.CURDIR}" as "-I.".
This commit is contained in:
David E. O'Brien
parent
de17efd5b3
commit
2c5569d6ff
@ -4,7 +4,6 @@ PROG= eqn
|
||||
SRCS= eqn.cc eqn.tab.h main.cc lex.cc \
|
||||
box.cc limit.cc list.cc over.cc text.cc \
|
||||
script.cc mark.cc other.cc delim.cc sqrt.cc pile.cc special.cc
|
||||
CFLAGS+= -I.
|
||||
DPADD= ${LIBGROFF}
|
||||
LDADD= ${LIBGROFF}
|
||||
MAN1= eqn.1 neqn.1
|
||||
@ -21,5 +20,7 @@ eqn.tab.h: eqn.cc
|
||||
.include "../Makefile.cfg"
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
INCLUDES+= -I${DIST_DIR} -I.
|
||||
|
||||
neqn: ${DIST_DIR}/neqn.sh
|
||||
sed -e 's/@g@/${g}/g' ${.ALLSRC} > ${.TARGET}
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
PROG= pic
|
||||
SRCS= lex.cc main.cc object.cc pic.cc pic.tab.h \
|
||||
common.cc troff.cc tex.cc
|
||||
CFLAGS+= -I.
|
||||
DPADD= ${LIBGROFF} ${LIBM}
|
||||
LDADD= ${LIBGROFF} -lm
|
||||
CLEANFILES= ${MAN1} pic.cc pic.tab.h y.tab.c y.tab.h
|
||||
@ -12,3 +11,5 @@ pic.tab.h: pic.cc
|
||||
|
||||
.include "../Makefile.cfg"
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
INCLUDES+= -I${DIST_DIR} -I.
|
||||
|
||||
@ -2,10 +2,11 @@
|
||||
|
||||
PROG= refer
|
||||
SRCS= command.cc label.cc ref.cc refer.cc token.cc
|
||||
CFLAGS+= -I${.CURDIR}/../include
|
||||
DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM}
|
||||
LDADD= ${LIBBIB} ${LIBGROFF} -lm
|
||||
CLEANFILES= label.cc label.tab.h ${MAN1} y.tab.c y.tab.h
|
||||
|
||||
.include "../Makefile.cfg"
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
INCLUDES+= -I${DIST_DIR} -I${.CURDIR}/../include
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
LIB= ipsec
|
||||
SHLIB_MAJOR= 1
|
||||
SHLIB_MINOR= 0
|
||||
CFLAGS+=-I${.OBJDIR}
|
||||
CFLAGS+=-I${.CURDIR} -I.
|
||||
CFLAGS+=-DIPSEC_DEBUG -DIPSEC
|
||||
.if !defined(NOINET6)
|
||||
CFLAGS+=-DINET6
|
||||
|
||||
@ -7,6 +7,7 @@ SRCS= ftpd.c ftpcmd.y logwtmp.c popen.c skey-stuff.c
|
||||
|
||||
CFLAGS+=-DSETPROCTITLE -DSKEY -DLOGIN_CAP -DVIRTUAL_HOSTING -Wall
|
||||
CFLAGS+=-DINET6
|
||||
CFLAGS+=-I${.CURDIR}
|
||||
YFLAGS=
|
||||
|
||||
LDADD= -lskey -lmd -lcrypt -lutil
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
PROG= setkey
|
||||
SRCS= setkey.c parse.y token.l
|
||||
CFLAGS+=-g
|
||||
CFLAGS+=-I${.CURDIR}/../../lib/libipsec
|
||||
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libipsec
|
||||
DPADD= ${LIBL} ${LIBY}
|
||||
LDADD= -ll -ly
|
||||
CLEANFILES+= y.tab.c y.tab.h key_test.o keytest
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
PROG= mklocale
|
||||
SRCS= yacc.y lex.l y.tab.h
|
||||
CFLAGS+=-I.
|
||||
CFLAGS+= -I${.CURDIR}
|
||||
MAN1= mklocale.1
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
@ -7,7 +7,7 @@ SRCS= cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \
|
||||
NOMAN=
|
||||
LDADD+= -ll
|
||||
DPADD+= ${LIBL}
|
||||
CFLAGS+=-I.
|
||||
CFLAGS+= -I${.CURDIR} -I.
|
||||
LINTFLAGS=-aehpz
|
||||
|
||||
BINDIR= /usr/libexec
|
||||
|
||||
@ -35,7 +35,7 @@ SRCS= scspd.c scsp_cafsm.c scsp_config.c scsp_config_lex.c \
|
||||
scsp_timer.c
|
||||
MAN8= scspd.8
|
||||
|
||||
CFLAGS+= -I${.CURDIR}/../../../sys -I${.OBJDIR}
|
||||
CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.OBJDIR}
|
||||
LDADD+= -latm -lmd
|
||||
DPADD+= ${LIBATM} ${LIBMD}
|
||||
|
||||
|
||||
@ -7,7 +7,8 @@ SRCS = rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c \
|
||||
exec.c dial.c monitor.c pcause.c controller.c alias.c \
|
||||
y.tab.h holiday.c
|
||||
|
||||
COPTS += -I${.CURDIR}/../isdnmonitor -I${.CURDIR}/../isdntel -I${.OBJDIR}
|
||||
COPTS += -I${.CURDIR}/../isdnmonitor -I${.CURDIR}/../isdntel
|
||||
COPTS += -I${.CURDIR} -I${.OBJDIR}
|
||||
|
||||
# compile debug support
|
||||
COPTS += -DDEBUG
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
|
||||
PROG= kbdcontrol
|
||||
SRCS= kbdcontrol.c lex.l
|
||||
CFLAGS+= -I${.CURDIR}
|
||||
MAN1= kbdcontrol.1
|
||||
MAN5= kbdmap.5
|
||||
MLINKS= kbdmap.5 keymap.5
|
||||
|
||||
@ -16,7 +16,8 @@ DESTRUN= /var/run
|
||||
DESTSBIN= /usr/sbin
|
||||
DESTHELP= /usr/share/misc
|
||||
|
||||
CFLAGS+= -I${BIND_DIR}/port/freebsd/include
|
||||
CFLAGS+= -I${BIND_DIR}/port/freebsd/include \
|
||||
-I${.CURDIR}/../../contrib/bind/bin/named
|
||||
|
||||
# This is mostly for named and named-xfer
|
||||
.if defined(USE_LIBBIND)
|
||||
|
||||
@ -11,6 +11,7 @@ SRCS= main.c getinfo.c debug.c send.c skip.c list.c subr.c commands.l
|
||||
MAN8= nslookup.8
|
||||
|
||||
CFLAGS+=-D_PATH_HELPFILE=\"${DESTHELP}/nslookup.help\"
|
||||
CFLAGS+=-I${.CURDIR}/../../contrib/bind/bin/nslookup
|
||||
LDADD+= -ll -ledit -ltermcap
|
||||
DPADD+= ${LIBL} ${LIBEDIT} ${LIBTERMCAP}
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ PROG= rrenumd
|
||||
SRCS= rrenumd.c parser.y lexer.l
|
||||
YFLAGS+= -d
|
||||
|
||||
CFLAGS+= -DINET6 -DIPSEC -I${.OBJDIR}
|
||||
CFLAGS+= -DINET6 -DIPSEC -I${.CURDIR} -I${.OBJDIR}
|
||||
LDADD= -lipsec -lcompat -ll -ly
|
||||
DPADD= ${LIBIPSEC} ${LIBCOMPAT} ${LIBL} ${LIBY}
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
PROG= setkey
|
||||
SRCS= setkey.c parse.y token.l
|
||||
CFLAGS+=-g
|
||||
CFLAGS+=-I${.CURDIR}/../../lib/libipsec
|
||||
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libipsec
|
||||
DPADD= ${LIBL} ${LIBY}
|
||||
LDADD= -ll -ly
|
||||
CLEANFILES+= y.tab.c y.tab.h key_test.o keytest
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user