lilypond-0.0.46.jcn1

diff --git a/TODO b/TODO
index 95fbfc684534d660bed863e3fd60476513e00ec5..522f9cafbe53c5bc9a85d4c74783a5981559d0a1 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,11 +1,10 @@
 before 0.1
-       
+       * update 20 pt table
+
        * remove spurious/outdated comments in .ly, debug .ly
 
        * pushgroup, popgroup.
 
-       * basic dynamics
-
        * decent TeX page layout
 
        * per-pstaff item-widths
@@ -22,8 +21,6 @@ MAKE-STUFF
 
        * flower config: separate optiflags.
 
-       * sort out headers, see m2m
-
        * do platform stuff: configure, header(s), targets, build (out?)
        
 BUGS
@@ -42,8 +39,6 @@ BUGS
 
 SEVERELY LACKING:
 
-       * hairpins
-
        * grace notes
 
 FURTHER FOR ORCHESTRAL SCORE:
@@ -56,7 +51,7 @@ FURTHER FOR ORCHESTRAL SCORE:
 
 INPUTLANGUAGE
 
-       * read ENV for include /init path 
+       * unix style paths for LILYINCLUDE ENV
 
        * configure pitch_byte
 
@@ -68,11 +63,20 @@ INPUTLANGUAGE
 
        * rest name configurable
 
+       * Raw request syntax
+
        * uniformate: \clef\violin, \clef"violin", \geometric 1.4, 
          \meter{ 2/4 }, etc.
 
+       * subtime with Subtle_reqs
+
 SMALLISH PROJECTS
 
+       * bugreport to doc++ devel: struct not in class hier; public
+       virtual baseclasses
+
+       * indentable stream for TeX stream, lily stream, Dstream.
+
        * key transposition
        
        * caching breakpoints / saving them. 
@@ -118,7 +122,6 @@ SMALLISH PROJECTS
 
        * caching of Register_group_register hierarchies.
 
-
        * use (char *) iso. String for communication between lexer and
        parser.
 
@@ -156,6 +159,8 @@ FUTURE
 
        * guitar chord
 
+       * Junk Staff_column, and find the requests while walking the Voices.?
+
        * better beamslope calculation: QLP for beams?
 
        * implement better breaking algorithm

diff --git a/make/Targets.make b/make/Targets.make
index de89f3d4173a427d0e1c325fad6b2b943fc863b2..2ab80134cab5c7c2363dd3a5564635cbfd18a539 100644 (file)
--- a/make/Targets.make
+++ b/make/Targets.make
@@ -32,7 +32,9 @@ EXECUTABLE = $(lily_bindir)/$(NAME)
 $(EXECUTABLE): $(build) $(OFILES) $(CUSTOMLIBES) 
        $(INCREASE_BUILD)
        $(MAKE) -S $(OFILES)  $(SILENT_LOG)
-#      $(STRIPDEBUG) $(STABLEOBS)
+ifdef STABLEOBS
+       $(DO_STRIP) $(STABLEOBS)
+endif
        $(LD_COMMAND) $(OFILES) $(LOADLIBES)
 
 exe: $(EXECUTABLE)
@@ -61,8 +63,12 @@ ifdef SUBDIRS
        set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
 endif
 
-distclean: clean
-       rm -rf Makefile $(lily-version) $(flower-version) $(mi2mu-version) .b $(build) *~ $(allout) $(allgen)
+distclean: localdistclean 
+ifdef SUBDIRS
+       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i localdistclean; done
+endif
+
+localdistclean:
 
 
 # configure:
@@ -107,7 +113,7 @@ doc:
 
 # doc++ documentation of classes
 doc++: $(progdocs)     
-       doc++ -kp -d $(DOCDIR) $^
+       doc++ -k -p -d $(DOCDIR) $^
 
 dist:
        -mkdir $(distdir)
@@ -193,3 +199,14 @@ $(LIBLILY): dummy
        $(MAKE) ./$(outdir)/$(@F) -C $(depth)/lib
 #
 
+# RedHat rpm package:
+#
+#rpm:  dist
+#      mv ./$(depth)/lilypond-$(TOPLEVEL_VERSION).tar.gz $(rpm-sources)
+rpm:
+       cp ./$(depth)/../releases/lilypond-$(TOPLEVEL_VERSION).tar.gz $(rpm-sources)
+       cp $(doc-dir)/*.gif $(rpm-sources)
+       $(MAKE) -C $(make-dir) spec
+       rpm -ba $(makeout)/lilypond.spec
+#
+

diff --git a/make/Variables.make b/make/Variables.make
index d1ca0485813e9a05f39b5a4f426a252f7e906cc1..8c3ab6f49729ed1f12335d61d8def93e3cf6b014 100644 (file)
--- a/make/Variables.make
+++ b/make/Variables.make
@@ -3,7 +3,7 @@
 # title           generic variables
 # file    make/Variables.make
 # abstract do not change this file for site-wide extensions;
-# please edit settings in User.make 
+#          please edit settings in User.make 
 #
 # Copyright (c) 1997 by    
 #      Jan Nieuwenhuizen <jan@digicash.com>
@@ -15,6 +15,10 @@ include ./$(depth)/.version
 #
 include ./$(depth)/make/out/Configure_variables.make
 
+# ugh, for win32 make
+# leave me up here, or i won-t work
+export CXX
+
 ifeq (0,${MAKELEVEL})
 MAKE:=$(MAKE) --no-builtin-rules
 endif
@@ -33,6 +37,7 @@ libdir = $(outdir)
 lilyout = ./$(depth)/lily/$(outdir)
 mi2muout = ./$(depth)/mi2mu/$(outdir)
 makeout = ./$(depth)/make/$(outdir)
+doc-dir = ./$(depth)/Documentation
 flower-dir = ./$(depth)/flower
 lib-dir = ./$(depth)/lib
 lily-dir = ./$(depth)/lily
@@ -41,6 +46,8 @@ make-dir = ./$(depth)/make
 include-lib = ./$(depth)/lib/include
 include-flower = ./$(depth)/flower/include
 #
+rpm-sources = /usr/src/redhat/SOURCES
+#
 
 # user settings:
 #
@@ -53,9 +60,6 @@ BUILD = $(shell cat $(build))
 INCREASE_BUILD = echo `expr \`cat $(build)\` + 1` > .b; mv .b $(build)
 #
 
-# ugh, for win32 make
-export CXX
-
 # the version:
 #
 VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)$(MY_PATCH_LEVEL)
@@ -122,7 +126,7 @@ CXXFLAGS = $(CFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS)
 INCLUDES = -Iinclude -I$(outdir) -I$(include-lib) -I$(libout) -I$(include-flower) -I$(flowerout) 
 CXX_OUTPUT_OPTION = $< -o $@
 LDFLAGS = $(EXTRA_LDFLAGS)
-LOADLIBES = $(EXTRA_LIBES) $(CUSTOMLIBES)
+LOADLIBES = $(EXTRA_LIBES) $(CUSTOMLIBES) -lg++ # need lg++ for win32, really!
 #
 
 # librarian:
@@ -171,7 +175,14 @@ STRIPDEBUG=true #replace to do stripping of certain objects
 DISTFILES=$(EXTRA_DISTFILES) Makefile $(ALL_SOURCES)
 DOCDIR=$(depth)/$(outdir)
 
-
-progdocs=$(allhh) $(allcc) 
+# .hh should be first. Don't know why
+progdocs=$(shell find -name '*.hh' |egrep -v 'obsolete/|out/') $(shell find -name '*.cc'|egrep -v 'out/|obsolete/')
 pod2groff=pod2man --center="LilyPond documentation" --section="0"\
        --release="LilyPond $(TOPLEVEL_MAJOR_VERSION).$(TOPLEVEL_MINOR_VERSION).$(TOPLEVEL_PATCH_LEVEL)" $< > $@
+STRIP=strip --strip-debug
+ifdef stablecc
+ STABLEOBS=$(addprefix $(outdir)/,$(stablecc:.cc=.o))
+endif
+stablecc=
+DO_STRIP=true
+