lilypond-0.0.34

diff --git a/Variables.make b/Variables.make
index 96aa6194dd963f18da63cbb9e76db6d38157b1e5..cc697d7c3ccd2dce4c3f414573a0c78da7546bdb 100644 (file)
--- a/Variables.make
+++ b/Variables.make
@@ -3,7 +3,7 @@
 # version info
 MAJVER=0
 MINVER=0
-PATCHLEVEL=33
+PATCHLEVEL=34
 
 
 
@@ -19,7 +19,7 @@ DEBUGFLAG=-g
 # CXX=g++
 
 # turn off -pipe if linker doesn't support it
-EXTRACXXFLAGS=-pipe -Wall -W   -Wmissing-prototypes 
+EXTRACXXFLAGS=-pipe -Wall -W   -Wmissing-prototypes -DSTRING_UTILS_INLINED
 
 #
 # -lefence = ElectricFence.
@@ -63,15 +63,25 @@ INPUTDIR=input
 # 
 #
 include Sources.make
+
+# UGH, this sux!
 gencc=parser.cc lexer.cc
 cc=$(mycc) $(gencc)
+mym2mgencc=midi-parser.cc midi-lexer.cc
+m2mcc=$(mym2mcc) $(mym2mgencc) $(mym2msharedcc)
 
 MY_CCSOURCE=$(addprefix $(CCDIR)/, $(mycc))
 CCSOURCE=$(addprefix $(CCDIR)/, $(cc))
 obs=$(addprefix $(OBJECTDIR)/,$(cc:.cc=.o)) 
+m2mobs=$(addprefix $(OBJECTDIR)/,$(m2mcc:.cc=.o)) 
+allcc=$(mycc) $(mym2mcc)
+allobs=$(obs) $(m2mobs)
+allexe=$(exe) $(m2m)
+M2MCCSOURCE=$(addprefix $(CCDIR)/, $(m2mcc))
 ALLDEPS=$(addprefix $(DEPDIR)/,$(cc:.cc=.dep))
 STABLEOBS=$(addprefix $(OBJECTDIR)/,$(stablecc:.cc=.o)) 
-HEADERS=$(addprefix $(HEADERDIR)/,$(hdr)) 
+allhdr=$(hdr) $(mym2mhh)
+HEADERS=$(addprefix $(HEADERDIR)/,$(allhdr)) 
 progdocs=$(HEADERS) $(MY_CCSOURCE)
 
 #dist
@@ -81,9 +91,10 @@ DOCDIR=docxx
 
 PACKAGENAME=lilypond
 DNAME=$(PACKAGENAME)-$(VERSION)
+M2MNAME=m2m
 
 # distribution files.
-othersrc=lexer.l parser.y
+othersrc=lexer.l parser.y midi-lexer.l midi-parser.y
 SCRIPTS=make_version make_patch genheader clearlily
 MAKFILES=Makefile Variables.make Sources.make Initial.make Generate.make \
        configure
@@ -100,6 +111,7 @@ CXXFLAGS=$(DEFINES) -I$(HEADERDIR) -I$(FLOWERDIR) $(EXTRACXXFLAGS)
 FLEX=flex
 BISON=bison
 exe=$(PACKAGENAME)
+m2m=$(M2MNAME)
 OUTPUT_OPTION=$< -o $@
 DDIR=$(TOPDIR)/$(DNAME)
 SUBDIRS=Documentation $(OBJECTDIR) $(CCDIR) $(HEADERDIR) $(INITDIR) $(DEPDIR) \