From: Will Estes Date: Thu, 10 Oct 2002 19:12:49 +0000 (+0000) Subject: use builddir in tests that need it in their include path X-Git-Tag: flex-2-5-23~24 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0998801fe03aedd054c79282ea6163093595379;p=flex use builddir in tests that need it in their include path --- diff --git a/tests/TEMPLATE/Makefile.am b/tests/TEMPLATE/Makefile.am index ee5016d..b3d1f57 100644 --- a/tests/TEMPLATE/Makefile.am +++ b/tests/TEMPLATE/Makefile.am @@ -22,6 +22,8 @@ BISON = @BISON@ FLEX = $(top_builddir)/flex +builddir = @builddir@ + EXTRA_DIST = scanner.l parser.y test.input CLEANFILES = scanner.c scanner.h parser.c parser.h TEMPLATE OUTPUT $(OBJS) OBJS = scanner.o # parser.o diff --git a/tests/test-bison-nr/Makefile.am b/tests/test-bison-nr/Makefile.am index 92a2f63..2ad07db 100644 --- a/tests/test-bison-nr/Makefile.am +++ b/tests/test-bison-nr/Makefile.am @@ -22,11 +22,13 @@ BISON = @BISON@ FLEX = $(top_builddir)/flex +builddir = @builddir@ + EXTRA_DIST = scanner.l parser.y test.input main.c CLEANFILES = scanner.c scanner.h parser.c parser.h test-bison-nr $(OBJS) OUTPUT OBJS = scanner.o parser.o main.o -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) +AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) #LDFLAGS = $(top_srcdir)/libfl.a YFLAGS = --defines --output=parser.c --name-prefix="test" diff --git a/tests/test-bison-yylloc/Makefile.am b/tests/test-bison-yylloc/Makefile.am index 087fc1a..542be3a 100644 --- a/tests/test-bison-yylloc/Makefile.am +++ b/tests/test-bison-yylloc/Makefile.am @@ -22,11 +22,13 @@ BISON = @BISON@ FLEX = $(top_builddir)/flex +builddir = @builddir@ + EXTRA_DIST = scanner.l parser.y test.input main.c CLEANFILES = scanner.c scanner.h parser.c parser.h test-bison-yylloc $(OBJS) OUTPUT OBJS = scanner.o parser.o main.o -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) +AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) #LDFLAGS = $(top_srcdir)/libfl.a YFLAGS = --defines --output=parser.c --name-prefix="test" diff --git a/tests/test-bison-yylval/Makefile.am b/tests/test-bison-yylval/Makefile.am index 692f2fa..31ac68a 100644 --- a/tests/test-bison-yylval/Makefile.am +++ b/tests/test-bison-yylval/Makefile.am @@ -22,11 +22,13 @@ BISON = @BISON@ FLEX = $(top_builddir)/flex +builddir = @builddir@ + EXTRA_DIST = scanner.l parser.y test.input main.c CLEANFILES = scanner.c scanner.h parser.c parser.h test-bison-yylval $(OBJS) OUTPUT OBJS = parser.o scanner.o main.o -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) +AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) #LDFLAGS = $(top_srcdir)/libfl.a YFLAGS = --defines --output=parser.c --name-prefix="test" diff --git a/tests/test-header-nr/Makefile.am b/tests/test-header-nr/Makefile.am index ee18dc6..b6accfa 100644 --- a/tests/test-header-nr/Makefile.am +++ b/tests/test-header-nr/Makefile.am @@ -22,11 +22,13 @@ BISON = @BISON@ FLEX = $(top_builddir)/flex +builddir = @builddir@ + EXTRA_DIST = scanner.l test.input main.c CLEANFILES = scanner.c scanner.h test-header-nr $(OBJS) OUTPUT OBJS = scanner.o main.o -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) +AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) #LDFLAGS = $(top_srcdir)/libfl.a #YFLAGS = --defines --output=parser.c diff --git a/tests/test-header-r/Makefile.am b/tests/test-header-r/Makefile.am index 9b1de2b..7661a07 100644 --- a/tests/test-header-r/Makefile.am +++ b/tests/test-header-r/Makefile.am @@ -22,11 +22,13 @@ BISON = @BISON@ FLEX = $(top_builddir)/flex +builddir = @builddir@ + EXTRA_DIST = scanner.l test.input main.c CLEANFILES = scanner.c scanner.h test-header-r OUTPUT $(OBJS) OBJS = scanner.o main.o -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) +AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) #LDFLAGS = $(top_srcdir)/libfl.a LFLAGS = --header="scanner.h" #YFLAGS = --defines --output=parser.c diff --git a/tests/test-multiple-scanners-nr/Makefile.am b/tests/test-multiple-scanners-nr/Makefile.am index 55ede97..97858a0 100644 --- a/tests/test-multiple-scanners-nr/Makefile.am +++ b/tests/test-multiple-scanners-nr/Makefile.am @@ -22,11 +22,13 @@ BISON = @BISON@ FLEX = $(top_builddir)/flex +builddir = @builddir@ + EXTRA_DIST = scanner-1.l scanner-2.l main.c CLEANFILES = scanner-1.c scanner-1.h test-multiple-scanners-nr OUTPUT $(OBJS) scanner-2.c scanner-2.h OBJS = scanner-1.o scanner-2.o main.o -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) +AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) #LDFLAGS = $(top_srcdir)/libfl.a #YFLAGS = --defines --output=parser.c diff --git a/tests/test-multiple-scanners-r/Makefile.am b/tests/test-multiple-scanners-r/Makefile.am index 73ce1b8..71e6b8c 100644 --- a/tests/test-multiple-scanners-r/Makefile.am +++ b/tests/test-multiple-scanners-r/Makefile.am @@ -22,13 +22,15 @@ BISON = @BISON@ FLEX = $(top_builddir)/flex +builddir = @builddir@ + EXTRA_DIST = scanner-1.l scanner-2.l main.c CLEANFILES = scanner-1.c scanner-1.h test-multiple-scanners-r OUTPUT\ $(OBJS) scanner-2.c scanner-2.h scanner-1.tables \ scanner-2.tables OBJS = scanner-1.o scanner-2.o main.o -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) +AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) #LDFLAGS = $(top_srcdir)/libfl.a #YFLAGS = --defines --output=parser.c