lilypond-0.1.1

diff --git a/Documentation/Makefile b/Documentation/Makefile
index ea4a7be9c09669ea909f1290159030c66e846161..edd922ce57c2aa3f4a388a9f263099c5a5ed57f2 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -52,7 +52,6 @@ include $(depth)/make/Rules.make
 #
 
 localclean:
-       rm -f out/*
        rm -f $(TEXTFILES) $(HTMLFILES) $(GROFFFILES)
 
 MAN1FILES = lilypond convert-mudela mi2mu mudela-book

diff --git a/flower/include/Makefile b/flower/include/Makefile
index 1ad45cb4632748d8d20acea150c27eecfe651145..b7716f26767acbb1ae0d20f436fae75118016b85 100644 (file)
--- a/flower/include/Makefile
+++ b/flower/include/Makefile
@@ -14,5 +14,6 @@ include ./$(depth)/flower/VERSION
 #
 MODULE_NAME = flower
 
+
 #
 

diff --git a/lily/Makefile b/lily/Makefile
index 65065454be5433eb38ffe361cb53610b2d355b46..785fb9e0e411af4028e2e6f842ee660661b949af 100644 (file)
--- a/lily/Makefile
+++ b/lily/Makefile
@@ -12,6 +12,8 @@
 depth = ..
 #
 
+NAME = lilypond
+
 # generic variables:
 #
 include Stable.make
@@ -21,7 +23,6 @@ include VERSION
 
 # identify module:
 #
-NAME = lilypond
 
 #
 
@@ -69,3 +70,5 @@ localclean:
 localinstall: installexe
 
 localuninstall: uninstallexe
+
+$(outdir)/lily-version.o: $(outdir)/version.hh

diff --git a/make/Variables.make b/make/Variables.make
index a3bc6eee5c21725b1b1020bea43d7c98ca38654b..b601cbd8a45afdafcda3a59979463583f4869d01 100644 (file)
--- a/make/Variables.make
+++ b/make/Variables.make
@@ -5,8 +5,10 @@
 # abstract 
 #
 # do not change this file for site-wide extensions; please use 
-# make/out/Site.make; 
-# Any change in files in this directory (make/) would be distributed.
+# make/$(OUTDIR_NAME)/Site.make; 
+#
+# Any change in files in this directory (make/) would be distributed, if 
+# you do make dist 
 #
 # Copyright (c) 1997 by    
 #      Jan Nieuwenhuizen <jan@digicash.com>
@@ -15,23 +17,21 @@
 # toplevel version info, might be handy?
 #
 include $(depth)/VERSION
-#
+
+
 ifeq (0,${MAKELEVEL})
+
+# Don't try to outsmart us, you puny computer!
 MAKE:=$(MAKE) --no-builtin-rules
 endif
 
-# directory names:
-
+ifndef OUTDIR_NAME
+OUTDIR_NAME=out
+endif
 
-ifdef buildprefix
-top-directory := $(shell  cd $(depth); pwd)
-abs-sub-directory := $(shell pwd)
-relative-sub-directory := $(subst $(top-directory),,$(abs-sub-directory))
-outdir=$(buildprefix)/$(relative-sub-directory)/out/
-else
+# directory names:
 buildprefix=$(depth)
-outdir=out
-endif
+outdir=$(OUTDIR_NAME)
 
 # derived names
 lily_bindir = $(depth)/bin
@@ -39,13 +39,13 @@ distdir = $(depth)/$(DIST_NAME)
 module-distdir = $(depth)/$(MODULE_DIST_NAME)
 depdir = $(outdir)
 
-flowerout = $(buildprefix)/flower/out
-libout = $(buildprefix)/lib/out
-lilyout = $(buildprefix)/lily/out
-mi2muout = $(buildprefix)/mi2mu/out
-makeout = $(buildprefix)/make/out
-docout = $(buildprefix)/Documentation/out
-binout = $(buildprefix)/bin/out
+flowerout = $(buildprefix)/flower/$(OUTDIR_NAME)
+libout = $(buildprefix)/lib/$(OUTDIR_NAME)
+lilyout = $(buildprefix)/lily/$(OUTDIR_NAME)
+mi2muout = $(buildprefix)/mi2mu/$(OUTDIR_NAME)
+makeout = $(buildprefix)/make/$(OUTDIR_NAME)
+docout = $(buildprefix)/Documentation/$(OUTDIR_NAME)
+binout = $(buildprefix)/bin/$(OUTDIR_NAME)
 
 doc-dir = $(depth)/Documentation
 flower-dir = $(depth)/flower
@@ -85,6 +85,7 @@ TOPLEVEL_VERSION=$(TOPLEVEL_MAJOR_VERSION).$(TOPLEVEL_MINOR_VERSION).$(TOPLEVEL_
 # fix naming, use TOPLEVEL_ prefix _or_ MODULE?
 MODULE_DIST_NAME = $(MODULE_NAME)-$(VERSION)
 DIST_NAME = lilypond-$(TOPLEVEL_VERSION)
+NO_DOOS_DIST = bin flower lib lily make mi2mu out
 #
 
 # list of object files:
@@ -122,8 +123,8 @@ mi2mu-version = $(mi2muout)/version.hh
 
 # custom libraries:
 #
-LIBFLOWER = $(depth)/flower/$(outdir)/$(LIB_PREFIX)flower$(LIB_SUFFIX)
-LIBLILY = $(depth)/lib/$(outdir)/$(LIB_PREFIX)lily$(LIB_SUFFIX)
+LIBFLOWER = $(flowerout)/$(LIB_PREFIX)flower$(LIB_SUFFIX)
+LIBLILY = $(libout)/$(LIB_PREFIX)lily$(LIB_SUFFIX)
 #
 
 # compile and link options:
@@ -141,7 +142,7 @@ EXTRA_CXXFLAGS= -Wall -W -Wmissing-prototypes -Wmissing-declarations -Wconversio
 CXXFLAGS = $(CFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS)
 INCLUDES = -Iinclude -I$(outdir) -I$(include-lib) -I$(libout) -I$(include-flower) -I$(flowerout) 
 CXX_OUTPUT_OPTION = $< -o $@
-LDFLAGS = $(ILDFLAGS) $(USER_LDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) -L$(depth)/lib/out -L$(depth)/flower/out
+LDFLAGS = $(ILDFLAGS) $(USER_LDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) -L$(depth)/lib/$(OUTDIR_NAME) -L$(depth)/flower/$(OUTDIR_NAME)
 LOADLIBES = $(EXTRA_LIBES) $(MODULE_LIBES) -lg++ # need lg++ for win32, really!
 #
 
@@ -180,7 +181,12 @@ DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(outdir)/$(notdir $@)"
 
 # generic target names:
 #
+ifdef NAME
 EXECUTABLE = $(outdir)/$(NAME)$(EXE)
+else
+EXECUTABLE =
+endif
+
 EXECUTABLES = $(EXECUTABLE)
 LIB_PREFIX = lib
 
@@ -199,7 +205,7 @@ DOCDIR=$(depth)/$(outdir)
 
 # .hh should be first. Don't know why
 # take some trouble to auto ignore sources and obsolete stuff.
-progdocs=$(shell $(FIND) ./ -name '*.hh' |egrep -v 'out/') $(shell $(FIND) ./ -name '*.cc'|egrep -v 'out/')
+progdocs=$(shell $(FIND) ./ -name '*.hh' |egrep -v '$(OUTDIR_NAME)') $(shell $(FIND) ./ -name '*.cc'|egrep -v '$(OUTDIR_NAME)')
 
 
 pod2html=pod2html