Reviewers: ,
Message:
Please review.
Description:
Build: Top-level GNUmakefile
This file is chmoded to 444 so it cannot be overwritten by
cat << EOF > GNUmakefile
alone; it needs to be removed first. It also has some missing
dependencies as evidenced by running `make' twice: on the second
run it should not have anything to do.
- Allow configure to overwrite the top-level GNUmakefile.
- Give priority to helper scripts necessary for the build process.
- Dependency fix for the linking into out/share/lilypond/current.
Please review this at http://codereview.appspot.com/5535047/
Affected files:
M GNUmakefile.in
M stepmake/aclocal.m4
Index: GNUmakefile.in
diff --git a/GNUmakefile.in b/GNUmakefile.in
index
aa74dd6bd570c9b62fb43a686f4b1de13493a3d9..32254edbfcd67ab5e948989474091b1c993d9f32
100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -151,16 +151,21 @@ src-ext = c cc yy ll hh icc py scm tex ps texi itexi
tely itely sh
doc-clean: snippets-clean $(tree-share-prefix)/lilypond-force
-default: $(config_h) build-dir-setup
+default: $(config_h) build-dir-setup build-scripts
build-dir-setup: $(tree-share-prefix)/lilypond-force
+build-scripts:
+ $(MAKE) -C scripts/build
+
PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po)
HELP_CATALOGS = $(PO_FILES:po/%.po=%)
CATALOGS = $(HELP_CATALOGS:lilypond=)
-$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
$(outdir)/VERSION
# Preparing LilyPond tree for build-dir exec
+link-tree: $(tree-share-prefix)/lilypond-force
+
+$(tree-share-prefix)/lilypond-force: GNUmakefile $(outdir)/VERSION
cd $(top-build-dir)/$(outbase) && rm -rf bin lib share
mkdir -p $(tree-bin)
mkdir -p $(tree-share-prefix)
@@ -203,7 +208,9 @@ $(tree-share-prefix)/lilypond-force link-tree:
GNUmakefile $(outdir)/VERSION
ln -sf ../../../../../po/$(outconfbase)/$i.mo lilypond.mo) &&)
true
touch $(tree-share-prefix)/lilypond-force
-$(tree-share-prefix)/mf-link-tree link-mf-tree:
$(tree-share-prefix)/lilypond-force
+link-mf-tree: $(tree-share-prefix)/mf-link-tree
+
+$(tree-share-prefix)/mf-link-tree: $(tree-share-prefix)/lilypond-force
-rm -f $(tree-share-prefix)/fonts/otf/* && \
rm -f $(tree-share-prefix)/fonts/svg/* && \
rm -f $(tree-share-prefix)/fonts/fonts.conf && \
@@ -221,6 +228,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree:
$(tree-share-prefix)/lilypond-fo
ln -s ../../../../../../mf/$(outconfbase)/*.tfm .
-cd $(tree-share-prefix)/fonts/type1 && \
ln -s ../../../../../../mf/$(outconfbase)/*.pf? .
+ touch $(tree-share-prefix)/mf-link-tree
TAGS.make: dummy
etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name
'*.make')
Index: stepmake/aclocal.m4
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index
8045c3ef0a4f3bb3b4b254deaadfba543a16a016..c60521ead3a3923f53e06d39d878957dc3f16c8d
100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -436,12 +436,13 @@ EOF
done
done
-
+ rm -f GNUmakefile
cat < GNUmakefile
depth = .
include config\$(if \$(conf),-\$(conf),).make
include \$(configure-srcdir)/GNUmakefile.in
EOF
+ chmod 444 GNUmakefile
AC_SUBST(VPATH)
fi
])
___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
