Update using bison-CVS.

[lilypond.git] / lily / GNUmakefile

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 651cc6d4acb90a7f42d2bc1db4690073cc00ac3c..8dfb77025e4592e30e2827208bdf95d768052bba 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -4,17 +4,22 @@ depth = ..
 NAME = lilypond
 SUBDIRS = include
 
-MODULE_LIBS=$(depth)/flower  $(depth)/ttftool $(depth)/kpath-guile 
+MODULE_LIBS= $(depth)/flower  $(depth)/ttftool $(depth)/kpath-guile 
 MODULE_INCLUDES= $(depth)/flower/include $(depth)/ttftool/include 
-MODULE_CXXFLAGS= 
-MODULE_LDFLAGS = $(KPATHSEA_LIBS)
-
+MODULE_CXXFLAGS=
 
 HELP2MAN_EXECS = lilypond
 STEPMAKE_TEMPLATES= c++ executable po help2man
 
+OUT_DIST_FILES=$(addprefix $(outdir)/,parser.cc lexer.cc parser.hh)
+
 include $(depth)/make/stepmake.make 
 
+ifeq ($(HAVE_LIBKPATHSEA_SO),no)
+MODULE_LDFLAGS+= $(KPATHSEA_LIBS)
+endif
+
+
 # for profiling, link guile statically:
 #
 # USER_LDFLAGS += -static -lltdl -ldl
@@ -30,11 +35,14 @@ $(outdir)/lily-parser.o: $(outdir)/parser.hh
 $(outdir)/lily-lexer.o: $(outdir)/parser.hh
 $(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
 
+
 $(outdir)/general-scheme.o: $(outdir)/version.hh
 $(outdir)/kpath.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh
 $(outdir)/lily-version.o: $(outdir)/version.hh
 
+local-po: $(outdir)/parser.cc
+
 # ugh.  For --srcdir builds, these must exist to satisfy their broken
 # lexer.dep and parser.dep file entries.
 ifneq ($(srcdir), .)