release: 0.0.78

[lilypond.git] / lily / Makefile

diff --git a/lily/Makefile b/lily/Makefile
index f31a93426a0c09f742a4fa3f6b6a72ada0c78479..65065454be5433eb38ffe361cb53610b2d355b46 100644 (file)
--- a/lily/Makefile
+++ b/lily/Makefile
@@ -1,4 +1,3 @@
-#
 # project  LilyPond -- the musical typesetter
 # title           makefile for lilypond
 # file    lily/Makefile 
@@ -13,70 +12,42 @@
 depth = ..
 #
 
-# identify module:
-#
-NAME = lilypond
-MAJOR_VERSION = $(TOPLEVEL_MAJOR_VERSION)
-MINOR_VERSION = $(TOPLEVEL_MINOR_VERSION)
-PATCH_LEVEL = $(TOPLEVEL_PATCH_LEVEL)
-# use to send patches, always empty for released version:
-MY_PATCH_LEVEL = $(TOPLEVEL_MY_PATCH_LEVEL)
-build = ./$(depth)/lily/.build
-#
-
 # generic variables:
 #
-include ./$(depth)/make/Variables.make 
+include Stable.make
+include ./$(depth)/make/Variables.make
+include VERSION
 #
 
-# descent order into subdirectories:
-#
-SUBDIRS = include
-#
-
-# to be remade each build:
-#
-VERSION_DEPENDENCY = $(lily-version)
+# identify module:
 #
+NAME = lilypond
 
-# list of c++ header files:
-# 
-HHFILES = # $(shell ls include/*.hh)
 #
 
-# list of c++ source files:
+# descent order into subdirectories:
 #
-CCFILES = $(shell ls *.cc)
+SUBDIRS = include
 #
 
-# list of other source files:
-#
-EXTRA_SOURCE_FILES = $(shell ls *.y *.l)
-#
 
 # list of distribution files:
 #
-DISTFILES = Makefile $(HHFILES) $(CCFILES) $(EXTRA_SOURCE_FILES)
+EXTRA_DISTFILES = VERSION 
 #
 
 # list of custom libraries:
 #
-# yes, i know about the -L and -l options,
-# but these libraries get rebuild 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 = $(bindir)/$(EXECUTABLE)# huh?
-# MAINTARGET = $(libdir)/$(LIBRARY)# huh?
-
-default: $(MAINTARGET)
+default: $(EXECUTABLE)
 #
+include ./$(depth)/make/Files.make 
 
 # generic targets and rules:
 #
@@ -84,16 +55,17 @@ include ./$(depth)/make/Targets.make
 include ./$(depth)/make/Rules.make
 #
 
-# explicit dependencies: (how to do auto?)
-#
-# ugh
-$(outdir)/version.cc: check-flower-version $(lily-version)
-mylexer.cc: $(outdir)/parser.hh # sic
-lexer.l: $(outdir)/parser.hh
-#
+# force these: Make can't know these have to be generated in advance
+my-lily-lexer.cc: $(outdir)/parser.hh
+$(outdir)/lexer.cc: $(outdir)/parser.hh
 
-# auto dependencies:
-#
--include ./$(outdir)/*.dep
 #
 
+
+localclean:
+       rm -f $(outdir)/parser.* $(outdir)/lexer.cc
+
+#should merge with mi2mu rule
+localinstall: installexe
+
+localuninstall: uninstallexe