Explicitly add -I/path/to/dist/src so that any yacc-generated .c files
in the .OBJDIR compile correctly. (Something I changed in the last commit must have broken this. Or make(1) changed. Or something else borked. In any case, it's fixed now.)
This commit is contained in:
parent
e2d7cbd438
commit
5906faf133
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.2 2003/09/13 20:18:08 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2003/09/23 11:04:45 lukem Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -8,7 +8,10 @@ SRCS= main.c pswparser.y lexer.l pswdict.c pswfile.c \
|
||||
|
||||
YHEADER=1
|
||||
|
||||
CPPFLAGS+=-DXENVIRONMENT -DFRIENDSFILE='"<DPS/dpsfriends.h>"' -I.
|
||||
CPPFLAGS+= -DXENVIRONMENT \
|
||||
-DFRIENDSFILE='"<DPS/dpsfriends.h>"' \
|
||||
-I. \
|
||||
-I${X11SRCDIR.xc}/config/pswrap
|
||||
|
||||
pswpriv.h: pswparser.h
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.2 2003/09/13 20:18:12 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2003/09/23 11:04:46 lukem Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -8,7 +8,7 @@ SRCS= gram.y lex.l deftwmrc.c add_window.c gc.c list.c twm.c \
|
||||
cursor.c icons.c session.c
|
||||
|
||||
YHEADER=1
|
||||
CPPFLAGS+=-I. -DHAS_MKSTEMP
|
||||
CPPFLAGS+= -I. -I${X11SRCDIR.xc}/programs/${PROG} -DHAS_MKSTEMP
|
||||
CPPFLAGS.parse.c= -DSYSTEM_INIT_FILE=\"${X11LIBDIR}/twm/system.twmrc\"
|
||||
|
||||
FILES= system.twmrc
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.2 2003/09/13 20:18:21 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2003/09/23 11:04:46 lukem Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -7,7 +7,7 @@ SRCS= dashlist.c planemask.c getfile.c tests.c text.c \
|
||||
choice.c main.c interpret.c record.c testfrac.c gram.y lex.l
|
||||
|
||||
YHEADER=1
|
||||
CPPFLAGS+=-I.
|
||||
CPPFLAGS+=-I. -I${X11SRCDIR.xc}/programs/${PROG}
|
||||
|
||||
APPDEFS=Xgc.ad
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.2 2003/09/13 20:18:22 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2003/09/23 11:04:47 lukem Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -8,7 +8,9 @@ SRCS= xkbcomp.c xkbscan.c expr.c vmod.c indicators.c misc.c \
|
||||
symbols.c geometry.c xkbpath.c listing.c \
|
||||
xkbparse.y parseutils.c utils.c
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/${PROG}
|
||||
CPPFLAGS.xkbpath.c= -DDFLT_XKB_CONFIG_ROOT=\"${X11LIBDIR}/xkb\"
|
||||
CPPFLAGS.geometry.c= -Wno-error # XXX
|
||||
|
||||
FILESDIR=${X11LIBDIR}/xkb
|
||||
FILES= README README.config README.enhancing
|
||||
|
@ -1,10 +1,11 @@
|
||||
# $NetBSD: Makefile,v 1.2 2003/09/13 20:18:29 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2003/09/23 11:04:47 lukem Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
PROG= xkbevd
|
||||
SRCS= xkbevd.c cfgscan.c cfgparse.y evargs.c printev.c utils.c
|
||||
|
||||
CPPFLAGS+=-I${X11SRCDIR.xc}/programs/${PROG}
|
||||
LDADD+= -lxkbfile -lXext -lX11
|
||||
DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user