From 1a8b227f8da682c168299dd426102efbb34912fe Mon Sep 17 00:00:00 2001 From: Will Estes Date: Fri, 20 Oct 2006 16:08:31 +0000 Subject: [PATCH] use configure-provided awk variable for portability; add loadlibes variable to c++ test --- NEWS | 1 + tests/test-c++-basic/Makefile.am | 2 +- tests/test-linedir-r/Makefile.am | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 003d572..7862262 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ changes between releases of flex. See the file COPYING for copying conditions. * after version 2.5.33 +** portability fixes to some unit tests ** new ca, vi, ga, nl translations from the translation project diff --git a/tests/test-c++-basic/Makefile.am b/tests/test-c++-basic/Makefile.am index 1fc579d..a90e75a 100644 --- a/tests/test-c++-basic/Makefile.am +++ b/tests/test-c++-basic/Makefile.am @@ -36,7 +36,7 @@ scanner.cpp: $(srcdir)/scanner.l $(FLEX) $(LFLAGS) $< $(testname)$(EXEEXT): $(OBJS) - $(CXX) -o $@ $(LDFLAGS) $(OBJS) + $(CXX) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) test: $(testname)$(EXEEXT) ./$(testname)$(EXEEXT) < $(srcdir)/test.input diff --git a/tests/test-linedir-r/Makefile.am b/tests/test-linedir-r/Makefile.am index 746f5ab..f2ea16d 100644 --- a/tests/test-linedir-r/Makefile.am +++ b/tests/test-linedir-r/Makefile.am @@ -46,8 +46,8 @@ $(testname)$(EXEEXT): $(OBJS) test: $(testname)$(EXEEXT) ./$(testname)$(EXEEXT) < $(srcdir)/test.input - cat -n scanner.c | grep '#line' | grep scanner.c | awk -f $(srcdir)/check-lines.awk - cat -n scanner.h | grep '#line' | grep scanner.h | awk -f $(srcdir)/check-lines.awk + cat -n scanner.c | grep '#line' | grep scanner.c | $(AWK) -f $(srcdir)/check-lines.awk + cat -n scanner.h | grep '#line' | grep scanner.h | $(AWK) -f $(srcdir)/check-lines.awk .c.o: $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< -- 2.40.0