From 862e6c059dc9487e921e7c48e356e848eae1877b Mon Sep 17 00:00:00 2001 From: Julien Rioux Date: Tue, 1 Oct 2013 11:42:14 +0200 Subject: [PATCH] Build: Bison is a required dependency again (issue 3577). --- Documentation/GNUmakefile | 2 -- configure.ac | 2 +- lily/GNUmakefile | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 836213ff8d..0af6fa083f 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -7,8 +7,6 @@ depth = .. ############# ### Variables -OUT_DIST_FILES = $(outdir)/ly-grammar.txt - NAME = documentation LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py) SUBDIRS = logo pictures misc po css topdocs \ diff --git a/configure.ac b/configure.ac index 3922dd1527..008befe4ec 100644 --- a/configure.ac +++ b/configure.ac @@ -120,7 +120,7 @@ STEPMAKE_LIB(REQUIRED) STEPMAKE_DLOPEN # Do not use bison 1.50 and 1.75. # 1.29 is required fr %locations, but I'm not sure it's enough --ns -STEPMAKE_BISON(OPTIONAL, 1.29) +STEPMAKE_BISON(REQUIRED, 1.29) STEPMAKE_FLEX(REQUIRED) STEPMAKE_FLEXLEXER(REQUIRED) STEPMAKE_FLEXLEXER_LOCATION diff --git a/lily/GNUmakefile b/lily/GNUmakefile index ba19ac9559..6d9afd770c 100644 --- a/lily/GNUmakefile +++ b/lily/GNUmakefile @@ -10,8 +10,6 @@ MODULE_INCLUDES= $(depth)/flower/include HELP2MAN_EXECS = lilypond STEPMAKE_TEMPLATES=c c++ executable po help2man -OUT_DIST_FILES=$(addprefix $(outdir)/,parser.hh parser.cc) - include $(depth)/make/stepmake.make ifeq ($(LINK_GXX_STATICALLY),yes) -- 2.39.2