diff --git a/configure.ac b/configure.ac index 38c5683c..83e2c972 100644 --- a/configure.ac +++ b/configure.ac @@ -215,6 +215,7 @@ $LEX_IS_FLEX || test "X$LEX" = X: || { AC_MSG_WARN([bypassing lex because flex is required]) LEX=: } +AM_CONDITIONAL([FLEX_WORKS], [$LEX_IS_FLEX]) AM_CONDITIONAL([FLEX_CXX_WORKS], [$LEX_IS_FLEX && test $bison_cv_cxx_works = yes]) AC_PROG_YACC diff --git a/examples/c/lexcalc/local.mk b/examples/c/lexcalc/local.mk index 64cbc9fe..2cd0d647 100644 --- a/examples/c/lexcalc/local.mk +++ b/examples/c/lexcalc/local.mk @@ -19,15 +19,17 @@ lexcalcdir = $(docdir)/%D% ## Calc. ## ## ------ ## -check_PROGRAMS += %D%/lexcalc -TESTS += %D%/lexcalc.test -EXTRA_DIST += %D%/lexcalc.test -nodist_%C%_lexcalc_SOURCES = %D%/parse.y %D%/parse.h %D%/scan.l +if FLEX_WORKS + check_PROGRAMS += %D%/lexcalc + TESTS += %D%/lexcalc.test + nodist_%C%_lexcalc_SOURCES = %D%/parse.y %D%/parse.h %D%/scan.l + # Don't use gnulib's system headers. + %C%_lexcalc_CPPFLAGS = -I$(top_srcdir)/%D% -I$(top_builddir)/%D% +endif FLEX_WORKS + %D%/parse.c: $(dependencies) -# Don't use gnulib's system headers. -%C%_lexcalc_CPPFLAGS = -I$(top_srcdir)/%D% -I$(top_builddir)/%D% - +EXTRA_DIST += %D%/lexcalc.test dist_lexcalc_DATA = %D%/parse.y %D%/scan.l %D%/Makefile %D%/README.md CLEANFILES += %D%/parse.[ch] %D%/scan.c %D%/parse.output CLEANDIRS += %D%/*.dSYM diff --git a/examples/c/reccalc/local.mk b/examples/c/reccalc/local.mk index 2fc2bccb..4515f228 100644 --- a/examples/c/reccalc/local.mk +++ b/examples/c/reccalc/local.mk @@ -19,11 +19,15 @@ reccalcdir = $(docdir)/%D% ## Calc. ## ## ------ ## -check_PROGRAMS += %D%/reccalc -TESTS += %D%/reccalc.test -EXTRA_DIST += %D%/reccalc.test %D%/scan.l -nodist_%C%_reccalc_SOURCES = %D%/parse.y %D%/scan.h %D%/scan.c -BUILT_SOURCES += $(nodist_%C%_reccalc_SOURCES) +if FLEX_WORKS + check_PROGRAMS += %D%/reccalc + TESTS += %D%/reccalc.test + nodist_%C%_reccalc_SOURCES = %D%/parse.y %D%/scan.h %D%/scan.c + BUILT_SOURCES += $(nodist_%C%_reccalc_SOURCES) + # Don't use gnulib's system headers. + %C%_reccalc_CPPFLAGS = -I$(top_srcdir)/%D% -I$(top_builddir)/%D% +endif FLEX_WORKS + %D%/parse.c: $(dependencies) # Tell Make that parse.o depends on scan.h, so that scan.h is built @@ -44,9 +48,8 @@ DASH = - $(AM_V_at)$(LEX) -o%D%/scan.c --header-file=%D%/scan.h $(srcdir)/%D%/scan.l $(AM_V_at)mv $@.tmp $@ -# Don't use gnulib's system headers. -%C%_reccalc_CPPFLAGS = -I$(top_srcdir)/%D% -I$(top_builddir)/%D% +EXTRA_DIST += %D%/reccalc.test %D%/scan.l dist_reccalc_DATA = %D%/parse.y %D%/scan.l %D%/Makefile %D%/README.md CLEANFILES += %D%/parse.[ch] %D%/parse.output %D%/scan.[ch] %D%/*.stamp CLEANDIRS += %D%/*.dSYM