* Documentation/user/internals.itely: Use ly-set-mus-property!.
* cygwin/mknetrel: New file.
* Documentation/windows/fix-suffixes.sh:
* buildscripts/walk.sh: Junk.
* aclocal.m4: Regenerate.
* stepmake/stepmake/topdocs-targets.make:
* stepmake/stepmake/help2man-rules.make:
* stepmake/stepmake/generic-vars.make:
* stepmake/make/stepmake.make:
* Documentation/user/GNUmakefile:
* make/stepmake.make:
* make/lilypond-vars.make:
* GNUmakefile.in:
* stepmake/aclocal.m4: Remove builddir cruftyness.
* stepmake/stepmake/c++-rules.make: Use ALL_CXXFLAGS, to guard
agains user override of CXXFLAGS.
* stepmake/stepmake/c++-vars.make (ALL_CXXFLAGS): Include CXXFLAGS.
* stepmake/stepmake/c-rules.make: Use ALL_CFLAGS, to guard
against user override of CFLAGS.
* stepmake/stepmake/c-vars.make (ALL_CFLAGS): Include CFLAGS.
+2002-07-18 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * Documentation/user/refman.itely: Compile fix for \mark #'(music ...).
+
+ * Documentation/user/internals.itely: Use ly-set-mus-property!.
+
+ * cygwin/mknetrel: New file.
+
+ * cygwin: New directory. Moved Cygwin stuff from
+ Documentation/windows.
+
+ * Documentation/windows/fix-suffixes.sh:
+ * buildscripts/walk.sh: Junk.
+
+ * aclocal.m4: Regenerate.
+
+ * buildscripts/walk.sh: Remove.
+
+ * stepmake/stepmake/topdocs-targets.make:
+ * stepmake/stepmake/help2man-rules.make:
+ * stepmake/stepmake/generic-vars.make:
+ * stepmake/make/stepmake.make:
+ * Documentation/user/GNUmakefile:
+ * make/stepmake.make:
+ * make/lilypond-vars.make:
+ * GNUmakefile.in:
+ * stepmake/aclocal.m4: Remove builddir cruftyness.
+
+ * stepmake/stepmake/c++-rules.make: Use ALL_CXXFLAGS, to guard
+ agains user override of CXXFLAGS.
+
+ * stepmake/stepmake/c++-vars.make (ALL_CXXFLAGS): Include CXXFLAGS.
+
+ * stepmake/stepmake/c-rules.make: Use ALL_CFLAGS, to guard
+ against user override of CFLAGS.
+
+ * stepmake/stepmake/c-vars.make (ALL_CFLAGS): Include CFLAGS.
+
+
2002-07-17 Han-Wen <hanwen@cs.uu.nl>
* GNUmakefile.in: distribute lexer-gcc-3.1.sh as well
# there used to be a dependency on a dummy target, to force a rebuild of lilypond-internals every time.
# however, this triggers compilation during install, which is a bad thing (tm).
-$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(depth)/$(builddir)/lily/$(outconfbase)/lilypond
- cd $(outdir) && ../$(depth)/$(builddir)/lily/$(outconfbase)/lilypond --verbose ../$(src-depth)/ly/generate-documentation
+$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(builddir)/lily/$(outconfbase)/lilypond
+ cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond --verbose ../$(src-depth)/ly/generate-documentation
-ln $(outdir)/lilypond-internals.texi $(outdir)/lilypond-internals.nexi
## unused
$(outdir)/interfaces.itexi: dummy
- cd $(outdir) && ../$(depth)/$(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-interface-doc
+ cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-interface-doc
else
@lilypond[verbatim,singleline]
#(define (testfunc x)
(if (equal? (ly-get-mus-property x 'text) "foo")
- (ly-set-mus-property x 'text "bar"))
+ (ly-set-mus-property! x 'text "bar"))
;; recurse
- (ly-set-mus-property x 'elements
+ (ly-set-mus-property! x 'elements
(map testfunc (ly-get-mus-property x 'elements)))
(display x)
x
(let* ((elements (ly-get-mus-property music 'elements))
(reversed (reverse elements))
(span-dir (ly-get-mus-property music 'span-direction)))
- (ly-set-mus-property music 'elements reversed)
+ (ly-set-mus-property! music 'elements reversed)
(if (dir? span-dir)
- (ly-set-mus-property music 'span-direction (- span-dir)))
+ (ly-set-mus-property! music 'span-direction (- span-dir)))
(map reverse-music reversed)
music))
c1 \mark \default
c1 \mark "12"
c1 \mark \default
- c1 \mark #'(music "scripts-segno")
+%% FIXME
+%% c1 \mark #'(music "scripts-segno")
c1
}
@end lilypond
depth=../..
-EXTRA_DIST_FILES = LilyPond.ico README changelog $(wildcard *.sh *.patch *.hint)
-
-STEPMAKE_TEMPLATES=documentation texinfo install install-out
+EXTRA_DIST_FILES = LilyPond.ico $(wildcard *.patch)
+STEPMAKE_TEMPLATES=documentation texinfo
include $(depth)/make/stepmake.make
local-WWW:
-# For cygwin builds only
-target=$(shell gcc -dumpmachine)
-ifeq ($(target),i686-pc-cygwin)
-
-POST_INSTALLS=$(wildcard post-*.sh)
-OUT_POST_INSTALLS=$(POST_INSTALLS:%=$(outdir)/%)
-
-PROFILES=$(wildcard *-profile.sh) lilypond-profile.sh
-OUT_PROFILES=$(PROFILES:%=$(outdir)/%)
-
-# profiles
-$(outdir)/%.sh: %.sh
- cat $< | sed $(sed-atvariables) > $@
- chmod 755 $@
-
-# Urg
-$(outdir)/lilypond-profile.sh: $(outdir)/../$(depth)/buildscripts/$(outconfbase)/lilypond-profile
- cp $< $@
- chmod 755 $@
-
-default: $(OUT_POST_INSTALLS) $(OUT_PROFILES)
-
-INSTALLATION_OUT_SUFFIXES=1 2
-
-# URG.
-# By popular demand,
-# LilyPond on windows is configured with --prefix=/usr/lilypond-x.y.x
-# The cygwin profile.d dir, however, is in /etc
-
-# avoid collapsed directory constructs '//'
-etc=$(dir $(patsubst %/, %, $(dir $(prefix))))etc
-INSTALLATION_DIR=$(etc)/postinstall
-INSTALLATION_FILES=$(OUT_POST_INSTALLS)
-
-INSTALLATION_OUT_DIR1=$(etc)/profile.d
-INSTALLATION_OUT_FILES1=$(OUT_PROFILES)
-
-INSTALLATION_OUT_DIR2=$(datadir)/tex
-INSTALLATION_OUT_FILES2=$(shell kpsewhich geometry.sty)
-
-else
-
-local-install:
- @echo skipping
-
-local-install-outfiles:
- @echo skipping
-
-endif
+++ /dev/null
-LilyPond
-------------------------------------------
-LilyPond - The GNU music typesetter.
-
-Runtime requirements:
- cygwin-1.3.10 or newer
- libguile14
-
-Build requirements:
- cygwin-1.3.10 or newer
- binutils-20011102 or newer
- gcc-2.95.3-5 or newer
- bison-1.35 or newer
- flex-2.5.4 or newer
- python-2.2 or newer
- texinfo-4.2 or newer
- sed-3.02 or newer
- fileutils
- sh-utils
- tetex-beta
- texmf-tiny
- etc.
- libguile14-dev
-
-
-Canonical homepage:
- http://www.lilypond.org/development
-
-Canonical download:
- ftp://ftp.lilypond.org/pub/LilyPond
-
-------------------------------------
-
-Build instructions:
-
- unpack lilypond-1.5.64-1-src.tar.bz2
- if you use setup to install this src package, it will be
- unpacked under /usr/src automatically
- cd /usr/src
- DISTDIR=/usr/src ./lilypond-1.5.64-1.sh
-
-This will create:
- $DISTDIR/lilypond/lilypond-1.5.64-1-orig.tar.bz2
- $DISTDIR/lilypond/lilypond-1.5.64-1-src.tar.bz2
- $DISTDIR/lilypond/lilypond-1.5.64-1.tar.bz2
- $DISTDIR/lilypond/lilypond-doc/lilypond-doc-1.5.64-1.tar.bz2
-
-------------------
-
-Port notes:
-
- These packages were built on GNU/Linux using cross building and
- packaging scripts:
-
- http://lilypond.org/cygwin/cygwin-cross-1.3.10.2.tar.gz
-
- Jan Nieuwenhuizen
- janneke@gnu.org
-
-Cygwin port maintained by: Jan Nieuwenhuizen <janneke@gnu.org>
+++ /dev/null
-lilypond (1.5.64.jcn1-1) unstable; urgency=low
-
- * Initial Release.
-
- -- Jan Nieuwenhuizen <janneke@gnu.org> Thu, 4 Jul 2002 12:54:08 +0200
-
-Local variables:
-mode: debian-changelog
-End:
+++ /dev/null
-#!/bin/bash
-## duh, rename executables,
-## for people that use a dumb shell instead of bash
-
-if [ $# -le 0 ]; then
- echo "Usage: fix-suffixes [FILE]..."
- exit 2
-fi
-
-echo `basename $0`
-
-function fix_extension ()
-{
- path=$1
- ext=$2
- expr="$3"
- dir=`dirname $path`
- file=`basename $path`
- base=`basename $file $ext`
- if [ $base$ext != $file ]; then
- type="`file $path`"
- if expr "$type" : "$expr"; then
- mv -f $path $dir/$base$ext
- fi
- fi
-}
-
-for i in `/bin/ls -d1 $*`; do
- fix_extension $i .exe '.*Windows.*\(executable\).*'
-# fix_extension $i .py '.*\(python\).*'
-done
-
+++ /dev/null
-sdesc: "LilyPond documentation."
-category: Publishing
-ldesc: "LilyPond Documentation in HTML, PS and DVI formats.
-This package contains the HTML, PostScript and DVI documentation for the
-LilyPond music typesetting software."
+++ /dev/null
-sdesc: "A program for printing sheet music"
-category: Publishing
-requires: ash bash libguile14 libiconv2 libintl2 python tetex-beta texmf-tiny
-#suggests: emacs gsview lilypond-doc rxvt xdvi texmf-base
-ldesc: "A program for printing sheet music.
-LilyPond prints beautiful sheet music. It produces music notation
-from a description file. It excels at typesetting classical music, but
-you can also print pop-songs. LilyPond is part of the GNU Project."
\ No newline at end of file
+++ /dev/null
-#!@SHELL@
-# /etc/profile.d/post-lily.sh -- Setup LilyPond
-
-# touch /tmp/.lilypond-install -- from redhat.spec, why?
-rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm' -print'`
-# rm /tmp/.lilypond-install
-
-# needed for prefix=lilypond-x.y.z
-#rm -f /usr/lilypond
-#lily=@prefix@
-#ln -s $lily /usr/lilypond
-
-
+++ /dev/null
-#!@SHELL@
-# /etc/profile.d/zlily-profile.sh -- profile additions for Windows
-# runs after lilypond-profile.sh
-
-# maybe we should do this once (postinstall) and dump result for
-# this login script
-POSIX_GS_LIB="$(cygpath -apu ""$GS_LIB"")"
-WINDOWS_GS_LIB="$(cygpath -apw ""$POSIX_GS_LIB"")"
-
-POSIX_GS_FONTPATH="$(cygpath -apu ""$GS_FONTPATH"")"
-WINDOWS_GS_FONTPATH="$(cygpath -apw ""$POSIX_GS_FONTPATH"")"
-
-POSIX_TEXINPUTS="$(cygpath -apu ""$TEXINPUTS"")"
-WINDOWS_TEXINPUTS="$(cygpath -apw ""$POSIX_TEXINPUTS"")"
-
-POSIX_TFMFONTS="$(cygpath -apu ""$TFMFONTS"")"
-WINDOWS_TFMFONTS="$(cygpath -apw ""$POSIX_TFMFONTS"")"
-
-POSIX_MFINPUTS="$(cygpath -apu ""$MFINPUTS"")"
-WINDOWS_MFINPUTS="$(cygpath -apw ""$POSIX_MFINPUTS"")"
-
-export POSIX_TEXINPUTS POSIX_TFMFONTS POSIX_TFMFONTS
-export WINDOWS_TEXINPUTS WINDOWS_TFMFONTS WINDOWS_MFINPUTS
-
-GS_FONTPATH="$WINDOWS_GS_FONTPATH"
-GS_LIB="$WINDOWS_GS_LIB"
-
-# needed for prefix=lilypond-x.y.z
-# PATH="/usr/lilypond/bin:$PATH"
-# PATH="@prefix@/bin:$PATH"
-
-cat <<EOF
-Congratulations and welcome to GNU LilyPond.
-
-To get started, visit:
- http://www.lilypond.org/Documentation/windows/out-www/installing.html
-
-If you encounter any problems, visit:
- http://www.lilypond.org/wiki?TroubleshootingWindows
-
-When it all works, head straight to the tutorial:
- http://www.lilypond.org/Documentation/user/out-www/lilypond/Tutorial.html
-
-EOF
SUBDIRS = buildscripts scripts flower lily \
mf ly tex ps scm \
python po make intl \
- debian $(builddir)/stepmake \
+ cygwin debian $(builddir)/stepmake \
Documentation input
#
$(MAKE) -C input WWW-clean
top-WWW-clean:
- cd $(depth)/$(builddir) && rm -f $(TOP_HTMLS) lily-[0-9]*.png
+ cd $(builddir) && rm -f $(TOP_HTMLS) lily-[0-9]*.png
$(SHELL) $(buildscript-dir)/clean-fonts.sh
WWW:
default: builddir-setup
-builddir-setup: $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)-force
+builddir-setup: $(builddir)/share/lilypond/$(TOPLEVEL_VERSION)-force
-$(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)-force:
+$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)-force:
# Preparing LilyPond tree for builddir exec
- @echo Making $(depth)/$(builddir)/share
- @cd $(depth)/$(builddir) && rm -rf share
- @cd $(depth)/$(builddir) && mkdir -p share/lilypond
- @cd $(depth)/$(builddir)/share/lilypond && mkdir -p $(TOPLEVEL_VERSION)
- @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \
+ @echo Making $(builddir)/share
+ @cd $(builddir) && rm -rf share
+ @cd $(builddir) && mkdir -p share/lilypond
+ @cd $(builddir)/share/lilypond && mkdir -p $(TOPLEVEL_VERSION)
+ @cd $(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \
ln -s ../../../$(srcdir)/ly ly && \
ln -s ../../../mf/$(outconfbase) dvips && \
ln -s ../../../mf/$(outconfbase) afm && \
ln -s ../../../$(srcdir)/mf && \
ln -s ../../../$(srcdir)/ps && \
ln -s ../../../$(srcdir)/scm
- @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \
+ @cd $(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \
mkdir tex
- @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)/tex && \
+ @cd $(builddir)/share/lilypond/$(TOPLEVEL_VERSION)/tex && \
ln -s ../../../../$(srcdir)/tex source && \
ln -s ../../../../mf/$(outconfbase) generate
- @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \
+ @cd $(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \
mkdir fonts
- @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)/fonts && \
+ @cd $(builddir)/share/lilypond/$(TOPLEVEL_VERSION)/fonts && \
ln -s ../../../../$(srcdir)/mf source && \
ln -s ../../../../mf/$(outconfbase) afm && \
ln -s ../../../../mf/$(outconfbase) tfm && \
local-clean: builddir-setup-clean
builddir-setup-clean:
- @cd $(depth)/$(builddir) && rm -rf share
+ @cd $(builddir) && rm -rf share
MAJOR_VERSION=1
MINOR_VERSION=5
PATCH_LEVEL=68
-MY_PATCH_LEVEL=uu1
+MY_PATCH_LEVEL=jcn1
# Use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
dnl aclocal.m4 -*-shell-script-*-
dnl WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
+dnl do not edit! this is aclocal.m4, generated from /home/fred/cvs/lilypond/stepmake/aclocal.m4
dnl aclocal.m4 -*-shell-script-*-
dnl StepMake subroutines for configure.in
# regular in-place build
# test for srcdir_build = yes ?
- if test "$builddir" = "."; then
+ if test "$srcdir_build" = "yes"; then
rm -f $srcdir/GNUmakefile
cp $srcdir/GNUmakefile.in $srcdir/GNUmakefile
chmod 444 $srcdir/GNUmakefile
AC_MSG_RESULT(Stepmake package!)
AC_MSG_CHECKING(builddir)
+ builddir="`pwd`"
if test "$srcdir" = "."; then
- builddir=.
+ srcdir_build=yes
else
- absolute_builddir="`pwd`"
- package_absolute_builddir="`dirname $absolute_builddir`"
+ srcdir_build=no
+ package_builddir="`dirname $builddir`"
package_srcdir="`dirname $srcdir`"
- builddir="`dirname $package_srcdir`/`basename $package_absolute_builddir`/`basename $absolute_builddir`"
fi
AC_MSG_RESULT($builddir)
AC_MSG_RESULT($PACKAGE)
AC_MSG_CHECKING(builddir)
+ builddir="`pwd`"
if test "$srcdir" = "."; then
- builddir=.
- srcdir_build=no
- else
- absolute_builddir="`pwd`"
-# builddir="`dirname $srcdir`/`basename $absolute_builddir`"
- builddir="`bash $srcdir/buildscripts/walk.sh \"$srcdir\"`"
srcdir_build=yes
+ else
+ srcdir_build=no
fi
AC_MSG_RESULT($builddir)
- if expr "$srcdir" : '/' > /dev/null 2>&1; then
- absolute_srcdir=yes
- STEPMAKE_WARN(Absolute --srcdir specified: $srcdir)
- fi
AC_MSG_CHECKING(for stepmake)
# Check for installed stepmake
if test -d $stepmake; then
AC_MSG_RESULT($stepmake)
else
- if test "$absolute_srcdir" != "yes"; then
- stepmake='$(depth)'/$srcdir/stepmake
- else
- stepmake=$srcdir/stepmake
- fi
+ stepmake="`cd $srcdir/stepmake; pwd`"
AC_MSG_RESULT($srcdir/stepmake ($datadir/stepmake not found))
fi
--- /dev/null
+depth = ..
+
+NAME = cygwin
+
+EXTRA_DIST_FILES = README changelog mknetrel $(wildcard *.sh *.hint)
+
+STEPMAKE_TEMPLATES = install install-out
+
+include $(depth)/make/stepmake.make
+
+# For cygwin builds only
+target=$(shell gcc -dumpmachine)
+ifeq ($(target),i686-pc-cygwin)
+
+POST_INSTALLS=$(wildcard post-*.sh)
+OUT_POST_INSTALLS=$(POST_INSTALLS:%=$(outdir)/%)
+
+PROFILES=$(wildcard *-profile.sh) lilypond-profile.sh
+OUT_PROFILES=$(PROFILES:%=$(outdir)/%)
+
+# profiles
+$(outdir)/%.sh: %.sh
+ cat $< | sed $(sed-atvariables) > $@
+ chmod 755 $@
+
+# Urg
+$(outdir)/lilypond-profile.sh: $(outdir)/../$(depth)/buildscripts/$(outconfbase)/lilypond-profile
+ cp $< $@
+ chmod 755 $@
+
+default: $(OUT_POST_INSTALLS) $(OUT_PROFILES)
+
+INSTALLATION_OUT_SUFFIXES=1 2
+
+# URG.
+# By popular demand,
+# LilyPond on windows is configured with --prefix=/usr/lilypond-x.y.x
+# The cygwin profile.d dir, however, is in /etc
+
+# avoid collapsed directory constructs '//'
+etc=$(dir $(patsubst %/, %, $(dir $(prefix))))etc
+INSTALLATION_DIR=$(etc)/postinstall
+INSTALLATION_FILES=$(OUT_POST_INSTALLS)
+
+INSTALLATION_OUT_DIR1=$(etc)/profile.d
+INSTALLATION_OUT_FILES1=$(OUT_PROFILES)
+
+INSTALLATION_OUT_DIR2=$(datadir)/tex
+INSTALLATION_OUT_FILES2=$(shell kpsewhich geometry.sty)
+
+else
+
+local-install:
+ @echo skipping
+
+local-install-outfiles:
+ @echo skipping
+
+endif
+
--- /dev/null
+LilyPond
+------------------------------------------
+LilyPond - The GNU music typesetter.
+
+Runtime requirements:
+ cygwin-1.3.10 or newer
+ libguile14
+
+Build requirements:
+ cygwin-1.3.10 or newer
+ binutils-20011102 or newer
+ gcc-2.95.3-5 or newer
+ bison-1.35 or newer
+ flex-2.5.4 or newer
+ python-2.2 or newer
+ texinfo-4.2 or newer
+ sed-3.02 or newer
+ fileutils
+ sh-utils
+ tetex-beta
+ texmf-tiny
+ etc.
+ libguile14-dev
+
+
+Canonical homepage:
+ http://www.lilypond.org/development
+
+Canonical download:
+ ftp://ftp.lilypond.org/pub/LilyPond
+
+------------------------------------
+
+Build instructions:
+
+ unpack lilypond-1.5.64-1-src.tar.bz2
+ if you use setup to install this src package, it will be
+ unpacked under /usr/src automatically
+ cd /usr/src
+ DISTDIR=/usr/src ./lilypond-1.5.64-1.sh
+
+This will create:
+ $DISTDIR/lilypond/lilypond-1.5.64-1-orig.tar.bz2
+ $DISTDIR/lilypond/lilypond-1.5.64-1-src.tar.bz2
+ $DISTDIR/lilypond/lilypond-1.5.64-1.tar.bz2
+ $DISTDIR/lilypond/lilypond-doc/lilypond-doc-1.5.64-1.tar.bz2
+
+------------------
+
+Port notes:
+
+ These packages were built on GNU/Linux using cross building and
+ packaging scripts:
+
+ http://lilypond.org/cygwin/cygwin-cross-1.3.10.2.tar.gz
+
+ Jan Nieuwenhuizen
+ janneke@gnu.org
+
+Cygwin port maintained by: Jan Nieuwenhuizen <janneke@gnu.org>
--- /dev/null
+lilypond (1.5.68.jcn1-1) unstable; urgency=low
+
+ * First full mknetrel build.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org> Thu, 18 Jul 2002 01:35:18 +0200
+
+lilypond (1.5.64.jcn1-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org> Thu, 4 Jul 2002 12:54:08 +0200
+
+Local variables:
+mode: debian-changelog
+End:
--- /dev/null
+sdesc: "LilyPond documentation."
+category: Publishing
+ldesc: "LilyPond Documentation in HTML, PS and DVI formats.
+This package contains the HTML, PostScript and DVI documentation for the
+LilyPond music typesetting software."
--- /dev/null
+sdesc: "A program for printing sheet music"
+category: Publishing
+requires: ash bash libguile14 libiconv2 libintl2 python tetex-beta texmf-tiny
+#suggests: emacs gsview lilypond-doc rxvt xdvi texmf-base
+ldesc: "A program for printing sheet music.
+LilyPond prints beautiful sheet music. It produces music notation
+from a description file. It excels at typesetting classical music, but
+you can also print pop-songs. LilyPond is part of the GNU Project."
\ No newline at end of file
--- /dev/null
+# -*- shell-script -*-
+
+# stable LilyPond releases: lilypond-1.4
+# archive=ftp://lilypond.org/pub/LilyPond/v1.4
+
+# LilyPond development: lilypond-1.5
+# archive=ftp://lilypond.org/pub/LilyPond/v1.5
+
+# Guile specific mknetrel overrides
+# To use this, do something like:
+cat >/dev/null <<EOC
+
+ wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.5/lilypond-1.5.68.tar.gz
+ rm -rf /home/mknetrel/netrel/src/lilypond-*
+ mkdir -p /home/mknetrel/netrel/src && cd /home/mknetrel/netrel/src
+ ## TODO: look at pimport
+ tar xzf /var/tmp/lilypond-*
+ mv lilypond-* $(echo lilypond-*)-1
+ cd -
+ ./bin/mknetrel -xXC lilypond
+
+EOC
+
+
+BUILD=1
+# sover=14
+
+patch=$mknetrel_root/patch
+iscygwin || (uploads=$here/uploads/$base && mkdir -p $uploads)
+
+sub_packages="doc"
+
+
+
+##. $extra/jcn
+
+
+# -*- shell-script -*-
+
+# jcn -- unsorted stuff
+
+
+#
+# Patching and configuring
+#
+
+# Maybe add to mknetrel or pimport.
+dopatchsrc () {
+ cd $src
+ patch -p1 < $patch/$package.patch
+ [ -d cygwin -a ! -e CYGWIN-PATCHES ] && ln -s cygwin CYGWIN-PATCHES
+ [ -d CYGWIN-PATCHES -a ! -e cygwin ] && ln -s CYGWIN-PATCHES cygwin
+ [ -d CYGWIN-PATCHES ] || mkdir CYGWIN-PATCHES
+}
+
+# Maybe add to mknetrel or pimport.
+patchsrc () {
+ [ -r $patch/$package.patch -a ! -r $src/CYGWIN-PATCHES -a ! -r $src/cygwin ] && dopatchsrc
+}
+
+autoupdate () {
+ for i in bootstrap autogen.sh; do
+ if [ -x ./$i ]; then
+ ./$i || exit 1
+ return 0
+ fi
+ done
+
+ aclocal
+ rm -rf libltdl
+ libtoolize --force --copy --automake --ltdl
+ autoheader
+ autoconf
+ automake --add-missing
+}
+
+crosscache () {
+ cat <<EOF > config.cache
+
+ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
+ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
+ac_cv_sizeof_char_p=${ac_cv_sizeof_char_p=4}
+ac_cv_sizeof_double=${ac_cv_sizeof_double=8}
+ac_cv_sizeof_float=${ac_cv_sizeof_float=4}
+ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
+ac_cv_sizeof_long=${ac_cv_sizeof_long=4}
+ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=12}
+ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8}
+ac_cv_sizeof_short=${ac_cv_sizeof_short=2}
+ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4}
+ac_cv_c_long_size_t=${ac_cv_c_long_size_t=no}
+ac_cv_c_long_time_t=${ac_cv_c_long_time_t=yes}
+ac_16bit_type=${ac_16bit_type=short}
+ac_32bit_type=${ac_32bit_type=int}
+ac_64bit_type=${ac_64bit_type=none}
+ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=no}
+ac_cv_sprintf_count=${ac_cv_sprintf_count=yes}
+ac_cv_spinlocks=${ac_cv_spinlocks=no}
+ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
+ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
+ac_cv_func_mkfifo=yes
+
+# Try at preventing to break make rules while crosscompiling. This
+# used work, but nowadays ./configure thinks it knows better than me.
+
+# But what ./configure doesn't know, is that automake and libtool are
+# broken wrt cross-building, and wrt cc_for_build. See new
+# workarounds above.
+
+ac_exeext=${ac_exeext=}
+ac_cv_exeext=${ac_cv_exeext=}
+EOF
+}
+
+
+
+#
+# Subpackage stuff -- Maybe move to mknetrel
+#
+
+# Possibly, using file-lists globs is smarter than separate install
+# prefixes. We'll see what happens when packaging tetex-*.
+
+
+lib_name () {
+ echo lib$base$sover
+}
+
+devel_name () {
+ echo $base-devel
+}
+
+doc_name () {
+ echo $base-doc
+}
+
+lib_split () {
+ mkdir -p ./$prefix/bin || exit 1
+ mv $inst/$prefix/bin/*.dll ./$prefix/bin
+ mkdir -p ./$prefix/share || exit 1
+ mv $inst/$prefix/share/$base ./$prefix/share
+ true
+}
+
+devel_split () {
+ mkdir -p ./$prefix/bin || exit 1
+ mv $inst/$prefix/bin/guile-* ./$prefix/bin
+ mv $inst/$prefix/include ./$prefix/include
+ mkdir -p ./$prefix/lib || exit 1
+ mv $inst/$prefix/lib/*.a ./$prefix/lib
+ mv $inst/$prefix/lib/*.la ./$prefix/lib
+ mkdir -p ./$prefix/share || exit 1
+ mv $inst/$prefix/share/aclocal ./$prefix/share
+ true
+}
+
+doc_split () {
+ mkdir -p ./$prefix || exit 1
+ mv $inst/$prefix/info ./$prefix
+ true
+}
+
+domkdist() {
+ #
+ # Fix up installation slightly
+ #
+ cd $inst || exit 1
+ chmod -R a+w .
+ cd usr 2>/dev/null && dousrstuff
+
+
+ # Split off any sub-packages. The actual splitting is handled by
+ # a package's specific code in extra/.
+
+ # To package `foo' in foo, foo-doc and foo-devel, set
+ # sub_packages='doc devel'.
+
+ # Then provide functions doc_name and devel_name, that return the
+ # full name of the sub-package. Also provide functions doc_split
+ # and devel_split, that mv part of foo's installation in $inst to
+ # the sub-packages' installation roots $inst-doc and $inst-devel.
+
+ cd $inst || exit 1
+ presplit
+
+ for i in $sub_packages; do
+ subname=$(${i}_name)
+ rm -rf $inst-$i
+ mkdir -p $inst-$i || exit 1
+ cd $inst-$i
+ ${i}_split || exit 1
+ done
+
+ #
+ # Make tar balls
+ #
+
+ cd $inst || exit 1
+ prepackage
+
+ # The base package
+ echo creating $tarstem.tar.bz2
+ cd $inst || exit 1
+
+ f=$src/cygwin/setup.hint && test -r $f && cp $f $uploads
+ f=$src/cygwin/$base.hint && test -r $f && cp $f $uploads/setup.hint
+ find * -print | sort | tar -T - --no-recursion -cjf $tarstem.tar.bz2
+
+ # Any sub-packages
+ for i in $sub_packages; do
+ subname=$(${i}_name)
+ subload=$uploads/$subname
+ subtarstem=$subload/$subname-$ver
+ mkdir -p $subload || exit 1
+ echo creating $subtarstem.tar.bz2
+ f=$src/cygwin/$subname.hint && test -r $f && cp $f $subload/setup.hint
+ cd $inst-$i
+ find * -print | sort | tar -T - --no-recursion -cjf $subtarstem.tar.bz2
+ done
+
+ # The source package
+ cd $src/.. || exit 1
+ echo creating "$tarstem"-src.tar.bz2
+ find $package_src/* -print -follow | egrep -v '\.cvsignore|\.bak$|\.orig$|\.o$|~$|^.#|CVS|%redact|/tags$' | egrep -v "$src_exclude" | sort | tar -T - --no-recursion -cjf "$tarstem"-src.tar.bz2
+ postpackage
+}
+
+
+# end jcn
+
+
+
+
+needdevoflags () {
+ return 1
+}
+
+# do I have a broken setup, do the Guile developers not know how to
+# write configure.in and Makefile.am, or are automake/libtool broken?
+preconfig () { # aka libtool_woes ()
+
+ # Add to mknetrel?
+ patchsrc
+
+ ## autoupdate
+
+ cd $build || exit 1
+
+ GUILE=1.5.6
+ cat > guile-config <<EOF
+#/bin/sh
+[ "\$1" == "--version" ] && echo "guile-config - Guile version $GUILE"
+[ "\$1" == "compile" ] && echo "-I$PREFIX/include"
+[ "\$1" == "link" ] && echo "-L$PREFIX/lib -lguile"
+exit 0
+EOF
+
+ chmod 755 guile-config
+ old_path=$PATH
+ PATH=$(pwd):$PATH
+
+ LDFLAGS="$PREFIX/bin/libpython2.2.dll"
+}
+
+postconfig () {
+ # Configure for build, for generating doc
+ rm -f config.cache
+ (PATH="$old_path" \
+ CFLAGS="-O2 -g" \
+ $src/configure --prefix=/usr --enable-config=for-build)
+}
+
+prebuild () {
+ # Build for build, generating doc
+ cd $build || exit 1
+
+ # ugh, footify fix
+ cd $src && ln -s GNUmakefile.in GNUmakefile
+
+ cd $build || exit 1
+ PATH=/bin:/usr/bin:$PATH make conf=for-build all doc html-doc
+ for i in $(find . -path "out-for-build/*.1"); do
+ cp -pv $i $(dirname $(dirname $i))/$(basename $i)
+ done
+}
+
+postinstall () {
+ mkdir -p $inst-doc/$prefix
+ cd $src || exit 1
+ make conf=for-build prefix=$inst-doc/$prefix install-html-doc
+
+
+ ## copy READMEs etc
+
+ cd $src || exit 1
+ docdir=$prefix/share/doc/$name-$version
+
+ mkdir -p $inst/$docdir
+
+ ## Generic READMEs
+ find . -maxdepth 1 -type f -exec cp -pv \{\} $inst/$docdir \;
+
+ ## Windows readmes
+ cd Documentation/windows || exit 1
+ cp -p README $inst/$docdir/README.Cygwin
+ cp -p changelog $inst/$docdir/changelog.Cygwin
+ mkdir -p $inst/$prefix/doc/Cygwin
+ cp -p README $inst/$prefix/doc/Cygwin/$cygpack.README
+
+ ## copy examples
+ cd $src || exit 1
+ cp -prv input $inst/$docdir
+
+ cd $inst-doc/$prefix/share/doc/$name-$version &&
+ ln -s $(find html/Documentation -name '*.ps.gz') .
+
+ ## Cygwin doesn't adhere to FHS (and why should they?)
+ cd $inst/$prefix && mv share/doc .
+ cd $inst-doc/$prefix && mv share/doc .
+}
+
+#presplit () {
+# docdir=$prefix/share/doc/$name-$version
+# mkdir -p $inst-doc/$docdir || exit 1
+#}
+
+doc_split () {
+ mkdir -p ./$prefix || exit 1
+ mv $inst/$prefix/info ./$prefix
+ true
+}
+
+
+#prepackage () {
+# mv $inst/$prefix/bin/guile-* $inst-devel/$prefix/bin
+#}
--- /dev/null
+#!@SHELL@
+# /etc/profile.d/post-lily.sh -- Setup LilyPond
+
+# touch /tmp/.lilypond-install -- from redhat.spec, why?
+rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm' -print'`
+# rm /tmp/.lilypond-install
+
+# needed for prefix=lilypond-x.y.z
+#rm -f /usr/lilypond
+#lily=@prefix@
+#ln -s $lily /usr/lilypond
+
+
--- /dev/null
+#!@SHELL@
+# /etc/profile.d/zlily-profile.sh -- profile additions for Windows
+# runs after lilypond-profile.sh
+
+# maybe we should do this once (postinstall) and dump result for
+# this login script
+POSIX_GS_LIB="$(cygpath -apu ""$GS_LIB"")"
+WINDOWS_GS_LIB="$(cygpath -apw ""$POSIX_GS_LIB"")"
+
+POSIX_GS_FONTPATH="$(cygpath -apu ""$GS_FONTPATH"")"
+WINDOWS_GS_FONTPATH="$(cygpath -apw ""$POSIX_GS_FONTPATH"")"
+
+POSIX_TEXINPUTS="$(cygpath -apu ""$TEXINPUTS"")"
+WINDOWS_TEXINPUTS="$(cygpath -apw ""$POSIX_TEXINPUTS"")"
+
+POSIX_TFMFONTS="$(cygpath -apu ""$TFMFONTS"")"
+WINDOWS_TFMFONTS="$(cygpath -apw ""$POSIX_TFMFONTS"")"
+
+POSIX_MFINPUTS="$(cygpath -apu ""$MFINPUTS"")"
+WINDOWS_MFINPUTS="$(cygpath -apw ""$POSIX_MFINPUTS"")"
+
+export POSIX_TEXINPUTS POSIX_TFMFONTS POSIX_TFMFONTS
+export WINDOWS_TEXINPUTS WINDOWS_TFMFONTS WINDOWS_MFINPUTS
+
+#GS_FONTPATH="$WINDOWS_GS_FONTPATH"
+#GS_LIB="$WINDOWS_GS_LIB"
+
+# needed for prefix=lilypond-x.y.z
+# PATH="/usr/lilypond/bin:$PATH"
+# PATH="@prefix@/bin:$PATH"
+
+cat <<EOF
+Congratulations and welcome to GNU LilyPond.
+
+To get started, visit:
+ http://www.lilypond.org/Documentation/windows/out-www/installing.html
+
+If you encounter any problems, visit:
+ http://www.lilypond.org/wiki?TroubleshootingWindows
+
+When it all works, head straight to the tutorial:
+ http://www.lilypond.org/Documentation/user/out-www/lilypond/Tutorial.html
+
+EOF
## settings to run LilyPond
-export PATH:=$(abs-builddir)/lily/$(outconfbase):$(abs-builddir)/buildscripts/$(outconfbase):$(PATH)
+export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfbase):$(PATH)
# LilyPond is often run from within $(outdir), making a relative
# PREFIX incorrect.
-export LILYPONDPREFIX:=$(shell cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION); pwd)
+export LILYPONDPREFIX:=$(shell cd $(builddir)/share/lilypond/$(TOPLEVEL_VERSION); pwd)
export PYTHONPATH:=$(topdir)/python:$(PYTHONPATH)
ABC2LY = $(script-dir)/abc2ly.py
CONVERT_LY = $(script-dir)/convert-ly.py
-LILYPOND = $(abs-builddir)/lily/$(outconfbase)/lilypond
+LILYPOND = $(builddir)/lily/$(outconfbase)/lilypond
LILYPOND_BOOK = $(script-dir)/lilypond-book.py
-LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(outdir) -I$(input-dir) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(abs-builddir)/mf/$(outconfbase)/ -I $(abs-builddir)/mf/out/
+LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(outdir) -I$(input-dir) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(builddir)/mf/$(outconfbase)/ -I $(builddir)/mf/out/
LY2DVI = $(script-dir)/ly2dvi.py
LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py
PS_TO_GIFS = $(buildscript-dir)/ps-to-gifs.sh
# make/Stepmake.make
+
+all: foe
+
+foe:
+ @echo one=.$(shell cd $(builddir); pwd).
+ @echo two=.$(shell cd $(depth); pwd).
+
include $(depth)/make/toplevel-version.make
ifdef config
configuration=$(config)
else
- ifeq ($(builddir),.)
+ ifeq ($(builddir),)
configuration=$(depth)/config$(CONFIGSUFFIX).make
else
- # user package
- configuration=$(depth)/$(builddir)/config$(CONFIGSUFFIX).make
- # stepmake package
- #configuration=$(depth)/../$(builddir)/stepmake/config$(CONFIGSUFFIX).make
+ configuration=$(builddir)/config$(CONFIGSUFFIX).make
endif
endif
-include $(configuration)
-
-ifeq ($(builddir),.)
- outroot=$(builddir)
+ifeq ($(builddir),)
+ outroot=.
else
- outroot=$(depth)/$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(shell cd .; pwd))
+ outroot=$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd))
endif
+include $(configuration)
+
outdir=$(outroot)/$(outbase)
-config_h=$(depth)/$(builddir)/config$(CONFIGSUFFIX).h
+config_h=$(builddir)/config$(CONFIGSUFFIX).h
# The outdir that was configured for: best guess to find binaries
outconfbase=out$(CONFIGSUFFIX)
# regular in-place build
# test for srcdir_build = yes ?
- if test "$builddir" = "."; then
+ if test "$srcdir_build" = "yes"; then
rm -f $srcdir/GNUmakefile
cp $srcdir/GNUmakefile.in $srcdir/GNUmakefile
chmod 444 $srcdir/GNUmakefile
AC_MSG_RESULT(Stepmake package!)
AC_MSG_CHECKING(builddir)
+ builddir="`pwd`"
if test "$srcdir" = "."; then
- builddir=.
+ srcdir_build=yes
else
- absolute_builddir="`pwd`"
- package_absolute_builddir="`dirname $absolute_builddir`"
+ srcdir_build=no
+ package_builddir="`dirname $builddir`"
package_srcdir="`dirname $srcdir`"
- builddir="`dirname $package_srcdir`/`basename $package_absolute_builddir`/`basename $absolute_builddir`"
fi
AC_MSG_RESULT($builddir)
AC_MSG_RESULT($PACKAGE)
AC_MSG_CHECKING(builddir)
+ builddir="`pwd`"
if test "$srcdir" = "."; then
- builddir=.
- srcdir_build=no
- else
- absolute_builddir="`pwd`"
-# builddir="`dirname $srcdir`/`basename $absolute_builddir`"
- builddir="`bash $srcdir/buildscripts/walk.sh \"$srcdir\"`"
srcdir_build=yes
+ else
+ srcdir_build=no
fi
AC_MSG_RESULT($builddir)
- if expr "$srcdir" : '/' > /dev/null 2>&1; then
- absolute_srcdir=yes
- STEPMAKE_WARN(Absolute --srcdir specified: $srcdir)
- fi
AC_MSG_CHECKING(for stepmake)
# Check for installed stepmake
if test -d $stepmake; then
AC_MSG_RESULT($stepmake)
else
- if test "$absolute_srcdir" != "yes"; then
- stepmake='$(depth)'/$srcdir/stepmake
- else
- stepmake=$srcdir/stepmake
- fi
+ stepmake="`cd $srcdir/stepmake; pwd`"
AC_MSG_RESULT($srcdir/stepmake ($datadir/stepmake not found))
fi
ifdef config
configuration=$(config)
else
- ifeq ($(builddir),.)
+ ifeq ($(builddir),)
configuration=$(depth)/config$(CONFIGSUFFIX).make
else
- # user package
- configuration=$(depth)/$(builddir)/config$(CONFIGSUFFIX).make
- # stepmake package
- configuration=$(depth)/../$(builddir)/stepmake/config$(CONFIGSUFFIX).make
+ configuration=$(builddir)/config$(CONFIGSUFFIX).make
endif
endif
-include $(configuration)
-
-ifeq ($(builddir),.)
- outroot=$(builddir)
+ifeq ($(builddir),)
+ outroot=.
else
- outroot=$(depth)/$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(shell cd .; pwd))
+ outroot=$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd))
endif
+include $(configuration)
+
outdir=$(outroot)/$(outbase)
-config_h=$(depth)/$(builddir)/config$(CONFIGSUFFIX).h
+config_h=$(builddir)/config$(CONFIGSUFFIX).h
# The outdir that was configured for: best guess to find binaries
outconfbase=out$(CONFIGSUFFIX)
.SUFFIXES: .cc .dep .hh .ll .o .so .yy
$(outdir)/%.o: %.cc
- $(DO_O_DEP) $(CXX) -c $(CXXFLAGS) -o $@ $<
+ $(DO_O_DEP) $(CXX) -c $(ALL_CXXFLAGS) -o $@ $<
$(outdir)/%.o: $(outdir)/%.cc
- $(DO_O_DEP) $(CXX) -c $(CXXFLAGS) -o $@ $<
+ $(DO_O_DEP) $(CXX) -c $(ALL_CXXFLAGS) -o $@ $<
$(outdir)/%.lo: %.cc
- $(DO_LO_DEP) $(CXX) -c $(CXXFLAGS) $(PIC_FLAGS) -o $@ $<
+ $(DO_LO_DEP) $(CXX) -c $(ALL_CXXFLAGS) $(PIC_FLAGS) -o $@ $<
$(outdir)/%.lo: $(outdir)/%.cc
- $(DO_LO_DEP) $(CXX) -c $(CXXFLAGS) $(PIC_FLAGS) -o $@ $<
+ $(DO_LO_DEP) $(CXX) -c $(ALL_CXXFLAGS) $(PIC_FLAGS) -o $@ $<
$(outdir)/%.cc: %.yy
$(BISON) $<
# EXTRA_CXXFLAGS= -Wall -Winline -W -Wmissing-prototypes -Wmissing-declarations -Wconversion
EXTRA_CXXFLAGS= -Wall -W -Wmissing-prototypes -Wconversion
-CXXFLAGS = $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS) $($(PACKAGE)_CFLAGS) $($(PACKAGE)_CXXFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS)
+ALL_CXXFLAGS = $(CXXFLAGS) $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS) $($(PACKAGE)_CFLAGS) $($(PACKAGE)_CXXFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS)
# template files:
TCC_FILES := $(wildcard *.tcc)
.SUFFIXES: .c .dep .h .l .lo .o .so .y
$(outdir)/%.o: %.c
- $(DO_O_DEP) $(CC) -c $(CFLAGS) -o $@ $<
+ $(DO_O_DEP) $(CC) -c $(ALL_CFLAGS) -o $@ $<
$(outdir)/%.o: $(outdir)/%.c
- $(DO_O_DEP) $(CC) -c $(CFLAGS) -o $@ $<
+ $(DO_O_DEP) $(CC) -c $(ALL_CFLAGS) -o $@ $<
$(outdir)/%.lo: %.c
- $(DO_LO_DEP) $(CC) -c $(CFLAGS) $(PIC_FLAGS) -o $@ $<
+ $(DO_LO_DEP) $(CC) -c $(ALL_CFLAGS) $(PIC_FLAGS) -o $@ $<
$(outdir)/%.lo: %.c
- $(DO_LO_DEP) $(CC) -c $(CFLAGS) $(PIC_FLAGS) -o $@ $<
+ $(DO_LO_DEP) $(CC) -c $(ALL_CFLAGS) $(PIC_FLAGS) -o $@ $<
$(outdir)/%.c: %.y
$(BISON) $<
ALL_C_SOURCES += $(H_FILES) $(C_FILES) $(Y_FILES) $(L_FILES)
-CFLAGS = $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS)
+ALL_CFLAGS = $(CFLAGS) $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS)
abs-srcdir := $(shell cd $(depth); pwd)
#deprecated
topdir := $(abs-srcdir)
-abs-builddir := $(shell cd $(depth)/$(builddir); pwd)
endif
pwd := $(shell pwd)
$(outdir)/%.1: $(outdir)/%
echo "generating man page from --help"
- @$(PERL) $(depth)/$(builddir)/buildscripts/$(outbase)/help2man $< > $@ || \
+ @$(PERL) $(builddir)/buildscripts/$(outbase)/help2man $< > $@ || \
(echo ""; echo "Apparently the man pages failed to build. This is";\
echo "no problem, since they don't contain any information anyway.";\
echo "Please run make again, and be prepared for NO manual pages.")
copy-to-top: $(TO_TOP_FILES)
$(foreach i, $(TO_TOP_FILES), \
- cp $(i) $(depth)/$(builddir) && ) true
- -cp $(outroot)/out-www/*png $(outroot)/out-www/index.html $(depth)/$(builddir)
- -cp $(outdir)/*png $(outdir)/index.html $(depth)/$(builddir) # don't fail when not making website
+ cp $(i) $(builddir) && ) true
+ -cp $(outroot)/out-www/*png $(outroot)/out-www/index.html $(builddir)
+ -cp $(outdir)/*png $(outdir)/index.html $(builddir) # don't fail when not making website
local-WWW: $(HTML_FILES) copy-to-top
# we want footers even if website builds (or is built) partly