lilypond-0.1.58

diff --git a/configure b/configure
index 1de68df503cf64138c4debe21bec796aace40d66..5a09581ddb4150a914d5d60d9d123e8f4e6b8fe8 100755 (executable)
--- a/configure
+++ b/configure
@@ -2238,4 +2238,5 @@ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
 rm -f Makefile
 cp make/Toplevel.make.in ./Makefile
-chmod 555 Makefile
+chmod 444 Makefile
+

diff --git a/make/Makefile b/make/Makefile
index 98f9b9d90f415f7be77caa69e648e7c6b2e20554..52b9e556375b2a98f31249a7fee41e4b50799a12 100644 (file)
--- a/make/Makefile
+++ b/make/Makefile
@@ -18,25 +18,23 @@ depth = ..
 NAME = make
 SUBDIRS = 
 
-# list of distribution files:
-
 # two outdir files are distributed, since they make sense to have without running 
 # configure and make.
 IN_FILES = $(wildcard *.in)
-EXTRA_DISTFILES = $(IN_FILES) $(outdir)/lilypond.spec $(outdir)/lilypond.lsm $(outdir)/lelievijver.lsm
+EXTRA_DISTFILES = $(IN_FILES)
+OUT_DISTFILES=$(outdir)/lilypond.spec $(outdir)/lilypond.lsm $(outdir)/lelievijver.lsm
 #
 
 # generic variables:
 #
 include ./$(depth)/make/Variables.make
 include ./$(depth)/make/Files.make 
-#
-
-# generic targets and rules:
-#
 include ./$(depth)/make/Targets.make
 include ./$(depth)/make/Rules.make
-#
+
+
+local-maintainerclean:
+       rm lilypond.spec $(wildcard *.lsm)
 
 spec: $(outdir)/lilypond.spec
 
@@ -59,3 +57,4 @@ $(outdir)/lilypond.spec: lilypond.spec.in $(depth)/VERSION
 $(outdir)/%.lsm: %.lsm.in $(depth)/VERSION
        cat $< | $(sed-version) | $(sed-date) > $@
 
+

diff --git a/make/Targets.make b/make/Targets.make
index c65d9f86199dd498dfefb5d5a3fb9e038196c6be..0d4c0b505d9c302bcdeef47681eeb02632f7cf60 100644 (file)
--- a/make/Targets.make
+++ b/make/Targets.make
@@ -13,20 +13,7 @@
 # target all:
 #
 all:    default
-ifdef SUBDIRS
-       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i all; done
-endif
-
-#
-
-# platform specific variables,
-#
-#include ./$(depth)/make/out/Site.make
-#
-
-# where to do this ?
-.PRECIOUS:  $(makeout)/Site.make
-
+       $(LOOP)
 # dependency list of executable:
 #
 
@@ -58,25 +45,27 @@ lib: $(LIBRARY)
 
 
 make-all-outdirs: make-outdir
-       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i make-all-outdirs; done
+       $(LOOP)
 
 make-outdir:
        -mkdir $(OUTDIR_NAME)
 
 # be careful about deletion.
 clean: localclean
-       rm -f $(outdir)/*
+       -rm -f $(outdir)/*
        touch $(outdir)/dummy.dep
-ifdef SUBDIRS
-       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
-endif
+       $(LOOP)
+
+distclean: clean 
+       $(LOOP)
+       $(MAKE) local-distclean
+
+maintainerclean: 
+       $(LOOP)
+       $(MAKE) local-maintainerclean
+       $(MAKE) local-distclean
 
-distclean: subdir-distclean local-distclean
 
-subdir-distclean:
-ifdef SUBDIRS
-       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
-endif
 
 # configure:
 #
@@ -154,12 +143,11 @@ doosdist:
        rm -rf $(distdir)/
 
 
-localdist: $(DISTFILES)
-       if [ -d out ]; then \
-               mkdir $(distdir)/$(localdir)/out; \
-               touch $(distdir)/$(localdir)/out/dummy.dep; \
-       fi
+localdist: $(DISTFILES) $(OUT_DISTFILES)
+       touch $(outdir)/dummy.dep; \
+       mkdir $(distdir)/$(localdir)/out; \
        $(LN) $(DISTFILES) $(distdir)/$(localdir)
+       $(LN) $(outdir)/dummy.dep $(OUT_DISTFILES) $(distdir)/$(localdir)/out
 ifdef SUBDIRS
        set -e; for i in $(SUBDIRS); do mkdir $(distdir)/$(localdir)/$$i; \
                $(MAKE) localdir=$(localdir)/$$i -C $$i localdist; done
@@ -171,9 +159,7 @@ ifdef all-tag-sources
        -etags -CT $(all-tag-sources) $(ERROR_LOG)
        -ctags -CT $(all-tag-sources) $(ERROR_LOG)
 endif
-ifdef SUBDIRS
-       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i TAGS ; done
-endif
+       $(LOOP)
 
 
 # version stuff:
@@ -192,20 +178,18 @@ localclean:
 
 local-distclean:
 
+local-maintainerclean:
+
 install-strip:
        $(MAKE) INSTALL="$(INSTALL) -s" install
 
 install: localinstall
-ifdef SUBDIRS
-       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i install; done
-endif
+       $(LOOP)
 
 localinstall:
 
 uninstall: localuninstall
-ifdef SUBDIRS
-       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i uninstall; done
-endif
+       $(LOOP)
 
 localuninstall:
 

diff --git a/make/Variables.make b/make/Variables.make
index b6c04face1e8fdf4c229ba7c6d9644e2b11152aa..2918aa5a33d60e5706800f7be26b77e69fd6fcbf 100644 (file)
--- a/make/Variables.make
+++ b/make/Variables.make
@@ -226,4 +226,8 @@ endif
 # substitute $(STRIP) in Site.make if you want stripping
 DO_STRIP=true
 
-
+ifdef SUBDIRS
+LOOP=set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
+else
+LOOP=
+endif