release: 0.0.62

[lilypond.git] / lily / Makefile

diff --git a/lily/Makefile b/lily/Makefile
index cb49063ad6e918a8a312de144bddbdca7e49d7fe..01503659df47cfc093f297becba8a76759df453d 100644 (file)
--- a/lily/Makefile
+++ b/lily/Makefile
@@ -14,10 +14,10 @@ depth = ..
 
 # generic variables:
 #
+include Stable.make
 include ./$(depth)/make/Variables.make
 include ./$(depth)/make/Files.make 
 include .version
-
 #
 
 # identify module:
@@ -31,32 +31,22 @@ NAME = lilypond
 SUBDIRS = include
 #
 
-# to be remade each build:
-#
-VERSION_DEPENDENCY = $(lily-version)
-#
-
 
 # list of distribution files:
 #
-DISTFILES = .version Makefile $(ALL_SOURCES)
+EXTRA_DISTFILES = .version 
 #
 
 # list of custom libraries:
 #
-# yes, i know about the -L and -l options,
-# but these libraries get rebuilt when needed.
-CUSTOMLIBES = $(LIBLILY) $(LIBFLOWER)
+MODULE_LIBDEPS= check-flower-deps check-lily-deps
+MODULE_LIBES= -llily -lflower
 
-LOADLIBES +=
 #
 
 # main target of this module:
 #
-# MAINTARGET = $(EXECUTABLE)
-# MAINTARGET = $(LIBRARY)
 MAINTARGET = $(lily_bindir)/$(EXECUTABLE)# huh?
-# MAINTARGET = $(libdir)/$(LIBRARY)# huh?
 
 default: $(MAINTARGET)
 #
@@ -69,7 +59,7 @@ include ./$(depth)/make/Rules.make
 
 # force these: Make can't know these have to be generated in advance
 my-lily-lexer.cc: $(outdir)/parser.hh
-lexer.l: $(outdir)/parser.hh
+$(outdir)/lexer.cc: $(outdir)/parser.hh
 
 #
 
@@ -83,3 +73,6 @@ DEPFILES = $(wildcard $(depdir)/*.dep)
 -include /dev/null $(DEPFILES)
 #
 
+
+localclean:
+       rm -f $(outdir)/parser.* $(outdir)/lexer.cc