CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/04/25 14:16:51
Modified files:
make : stepmake.make
cygwin : GNUmakefile
Documentation/user: GNUmakefile
. : ChangeLog
Log message:
* cygwin/GNUmakefile (INSTALLATION_OUT_SUFFIXES): Remove profile
stuff.
* Documentation/user/GNUmakefile: Only build music-glossary with
rendered lilypond snippets during web.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/make/stepmake.make.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/cygwin/GNUmakefile.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/GNUmakefile.diff?tr1=1.98&tr2=1.99&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3499&tr2=1.3500&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3499 lilypond/ChangeLog:1.3500
--- lilypond/ChangeLog:1.3499 Mon Apr 25 11:23:43 2005
+++ lilypond/ChangeLog Mon Apr 25 14:16:50 2005
@@ -1,5 +1,8 @@
2005-04-25 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+ * cygwin/GNUmakefile (INSTALLATION_OUT_SUFFIXES): Remove profile
+ stuff.
+
* scm/output-ps.scm (grob-cause): Bugfix.
* scm/lily.scm (ly:load): Remove x11-color.
Index: lilypond/Documentation/user/GNUmakefile
diff -u lilypond/Documentation/user/GNUmakefile:1.98
lilypond/Documentation/user/GNUmakefile:1.99
--- lilypond/Documentation/user/GNUmakefile:1.98 Mon Apr 25 07:28:04 2005
+++ lilypond/Documentation/user/GNUmakefile Mon Apr 25 14:16:50 2005
@@ -3,15 +3,16 @@
LATEX_FILES =$(wildcard *.latex)
# todo: add latex.
-DVI_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.dvi))
+DVI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.dvi)
EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES)
IMAGES=$(wildcard *.png)
-OUT_EPS_IMAGES=$(addprefix $(outdir)/,$(IMAGES:.png=.eps))
-OUT_PNG_IMAGES=$(addprefix $(outdir)/,$(IMAGES))
-OUT_ITEXI_FILES=$(addprefix $(outdir)/,$(ITELY_FILES:.itely=.itexi)
-HTML_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.html))\
+OUT_EPS_IMAGES=$(IMAGES:%.png=$(outdir)/%.eps)
+OUT_PNG_IMAGES=$(IMAGES:%=$(outdir)/%)
+OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
+ $(ITELY_FILES:%.itely=$(outdir)/%.texi)
+HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%.html)\
$(outdir)/lilypond-internals.html
PS_FILES = $(DVI_FILES:.dvi=.ps)
@@ -241,7 +242,7 @@
$(outdir)/lilypond.texi: $(ITELY_FILES) $(ITEXI_FILES)
$(outdir)/lilypond.nexi: $(ITELY_FILES) $(ITEXI_FILES)
-# Prevent music-glossary.texi from default
+# Prevent building music-glossary.texi from default target
$(outdir)/music-glossary.nexi:
# Rules for the automatically generated documentation
@@ -269,11 +270,10 @@
touch $@
touch $(outdir)/$(*F).nexi
-$(outdir)/interfaces.itexi:
+$(outdir)/programming-interface.texi:
cp dummy-interfaces.itexi $@
endif
-
local-clean: local-delete
local-delete:
Index: lilypond/cygwin/GNUmakefile
diff -u lilypond/cygwin/GNUmakefile:1.13 lilypond/cygwin/GNUmakefile:1.14
--- lilypond/cygwin/GNUmakefile:1.13 Sun Sep 21 10:13:25 2003
+++ lilypond/cygwin/GNUmakefile Mon Apr 25 14:16:50 2005
@@ -21,36 +21,17 @@
POSTREMOVES=$(wildcard postremove*.sh)
OUT_POSTREMOVES=$(POSTREMOVES:%=$(outdir)/%)
-PROFILES=$(wildcard *-profile.sh) lilypond-profile.sh
-OUT_PROFILES=$(PROFILES:%=$(outdir)/%)
+default: $(OUT_POSTINSTALLS) $(OUT_POSTREMOVES) $(OUTIN_FILES)
-# profiles
-$(outdir)/%.sh: %.sh $(config_make)
- cat $< | sed $(sed-atvariables) > $@
- chmod 755 $@
-
-# Get profile from buildscripts
-$(outdir)/lilypond-profile.sh:
$(outdir)/../$(depth)/buildscripts/$(outconfbase)/lilypond-profile
- cp $< $@
- chmod 755 $@
-
-default: $(OUT_POSTINSTALLS) $(OUT_POSTREMOVES) $(OUT_PROFILES) $(OUTIN_FILES)
-
-INSTALLATION_OUT_SUFFIXES=1 2 # 3
+INSTALLATION_OUT_SUFFIXES=1
# Avoid collapsed directory constructs '//'
etc=$(patsubst %/, %, $(dir $(prefix)))/etc
INSTALLATION_DIR=$(etc)/postinstall
INSTALLATION_FILES=$(OUT_POSTINSTALLS)
-INSTALLATION_OUT_DIR1=$(etc)/profile.d
-INSTALLATION_OUT_FILES1=$(OUT_PROFILES)
-
-INSTALLATION_OUT_DIR2=$(etc)/postremove
-INSTALLATION_OUT_FILES2=$(OUT_POSTREMOVES)
-
-# INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/tex
-# INSTALLATION_OUT_FILES3=$(shell kpsewhich geometry.sty)
+INSTALLATION_OUT_DIR1=$(etc)/postremove
+INSTALLATION_OUT_FILES1=$(OUT_POSTREMOVES)
endif
Index: lilypond/make/stepmake.make
diff -u lilypond/make/stepmake.make:1.23 lilypond/make/stepmake.make:1.24
--- lilypond/make/stepmake.make:1.23 Fri Jul 16 11:34:53 2004
+++ lilypond/make/stepmake.make Mon Apr 25 14:16:50 2005
@@ -72,7 +72,7 @@
ifeq ($(builddir),)
outroot=.
else
- outroot=$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd))
+ outroot=$(builddir)$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd))
endif
include $(config_make)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
