lilypond-0.0.23

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 5eb21d58ce3c3c1c88e10fc91bf3b1b05f696a64..618bd6f111b234fbfd31c9e919e5820dd42cc0f8 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,7 +1,8 @@
-PODS=README.pod CodingStyle.pod lilygut.pod lilyinput.pod
+PODS=README.pod CodingStyle.pod lilygut.pod lilyinput.pod error.pod\
+       faq.pod
 TXTS=$(PODS:.pod=.txt)
 MANS=$(PODS:.pod=.1)
-DOCFILES=$(PODS) Makefile 
+DISTFILES=$(PODS) Makefile
 
 
 default:
@@ -10,7 +11,7 @@ default:
 doc: $(TXTS)
 
 dist:
-       ln $(DOCFILES) $(DDIR)/Documentation/
+       ln $(DISTFILES) $(DDIR)/$(SUBDIR)
 clean:
        rm -f $(TXTS) $(MANS)
 

diff --git a/Variables.make b/Variables.make
index eea032df7fbcb6c78adce67fe626d661646daa05..768dcc5adb9e5e0d79aac375eb7d87ebbd6005b5 100644 (file)
--- a/Variables.make
+++ b/Variables.make
@@ -7,7 +7,7 @@ OPTIFLAG=-DNDEBUG -DNPRINT -O2
 DEBUGFLAG=-g
 
 # turn off -pipe if linker doesn't support it
-EXTRACXXFLAGS=-pipe -Wall -W   -Wmissing-prototypes 
+#EXTRACXXFLAGS=-pipe -Wall -W   -Wmissing-prototypes 
 
 #
 # -lefence = ElectricFence.
@@ -37,12 +37,12 @@ endif
 # version info
 MAJVER=0
 MINVER=0
-PATCHLEVEL=22
+PATCHLEVEL=23
 VERSION=$(MAJVER).$(MINVER).$(PATCHLEVEL)
 CXXVER=`$(CXX) --version`
 
 #flower version
-NEEDEFLOWERVER=1.0.17
+NEEDEFLOWERVER=1.0.20
 
 # directories
 TOPDIR  := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
@@ -50,11 +50,14 @@ OBJECTDIR=objects
 HEADERDIR=hdr
 CCDIR=src
 INITDIR=init
-vpath %.cc $(CCDIR)
-vpath %.hh $(HEADERDIR)
-vpath %.y $(CCDIR)
-vpath %.l $(CCDIR)
-vpath %.o $(OBJECTDIR)
+DEPDIR=deps
+INPUTDIR=input
+#vpath %.cc $(CCDIR)
+#vpath %.hh $(HEADERDIR)
+#vpath %.y $(CCDIR)
+#vpath %.l $(CCDIR)
+#vpath %.o $(OBJECTDIR)
+#vpath %.dep $(DEPDIR)
 
 # 
 #
@@ -62,8 +65,10 @@ include Sources.make
 progdocs=$(hdr) $(mycc)
 gencc=parser.cc lexer.cc
 cc=$(mycc) $(gencc)
-obs=$(cc:.cc=.o) 
 
+CCSOURCE=$(addprefix $(CCDIR)/, $(cc))
+obs=$(addprefix $(OBJECTDIR)/,$(cc:.cc=.o)) 
+ALLDEPS=$(addprefix $(DEPDIR)/,$(cc:.cc=.dep))
 
 #dist
 .EXPORT_ALL_VARIABLES:
@@ -75,12 +80,12 @@ DNAME=$(PACKAGENAME)-$(VERSION)
 
 # distribution files.
 othersrc=lexer.l parser.y
-SCRIPTS=make_version make_patch genheader
-IFILES=dimen.tex symbol.ini kortjakje.ly pavane.ly  maartje.ly\
-       lilyponddefs.tex test.tex .dstreamrc cadenza.ly scales.ly\
-       titledefs.tex pavane.tex
-OFILES=Makefile Variables.make Sources.make COPYING README NEWS
-DFILES=$(OFILES) $(IFILES) $(SCRIPTS)
+SCRIPTS=make_version make_patch genheader clean
+MAKFILES=Makefile Variables.make Sources.make Initial.make Generate.make \
+       configure
+OFILES=COPYING README NEWS TODO
+IFILES= standchen.tex titledefs.tex pavane.tex lilyponddefs.tex test.tex .dstreamrc dimen.tex 
+DFILES=$(MAKFILES) $(OFILES) $(IFILES) $(SCRIPTS)
 
 #compiling
 LOADLIBES=-L$(FLOWERDIR) -lflower $(EXTRALIB)
@@ -92,4 +97,9 @@ BISON=bison
 exe=$(PACKAGENAME)
 OUTPUT_OPTION=$< -o $@
 DDIR=$(TOPDIR)/$(DNAME)
-SUBDIRS=Documentation $(OBJECTDIR) $(CCDIR) $(HEADERDIR) $(INITDIR)
+SUBDIRS=Documentation $(OBJECTDIR) $(CCDIR) $(HEADERDIR) $(INITDIR) $(DEPDIR) \
+       $(INPUTDIR)
+
+depfile=deps/$(subst .o,.dep,$(notdir $@)) 
+DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(OBJECTDIR)/$(notdir $@)"
+

diff --git a/deps/Makefile b/deps/Makefile
new file mode 100644 (file)
index 0000000..0d303b3
--- /dev/null
+++ b/deps/Makefile
@@ -0,0 +1,4 @@
+DISTFILES=Makefile
+dist:
+       ln $(DISTFILES) $(DDIR)/$(SUBDIR)
+       
\ No newline at end of file

diff --git a/hdr/Makefile b/hdr/Makefile
index 29358a5d9d857b374f5d97c60595bffa72263241..2ee609e881c75f080c0a05588b4705a7188a2b6c 100644 (file)
--- a/hdr/Makefile
+++ b/hdr/Makefile
@@ -1,8 +1,9 @@
 default:
        $(MAKE) -C ..
-
+DISTFILES=Makefile $(hdr)
 dist:
-       ln Makefile $(hdr) $(DDIR)/$(HEADERDIR)
+       ln $(DISTFILES) $(DDIR)/$(SUBDIR)
+
 
 TAGS: $(hdr) 
        etags -CT $(hdr) 

diff --git a/input/Makefile b/input/Makefile
new file mode 100644 (file)
index 0000000..439a77e
--- /dev/null
+++ b/input/Makefile
@@ -0,0 +1,7 @@
+default: ;
+
+DISTFILES=Makefile  kortjakje.ly pavane.ly  maartje.ly\
+       cadenza.ly scales.ly standchen.lily
+
+dist:
+       ln $(DISTFILES) $(DDIR)/$(SUBDIR)

diff --git a/objects/Makefile b/objects/Makefile
new file mode 100644 (file)
index 0000000..228fde3
--- /dev/null
+++ b/objects/Makefile
@@ -0,0 +1,3 @@
+DISTFILES=Makefile
+dist:
+       ln $(DISTFILES) $(DDIR)/$(SUBDIR)
\ No newline at end of file

diff --git a/src/Makefile b/src/Makefile
index a3cc55c1e4147f15ec00f7d3291c9752c5c7b075..99c4f0a6b4a10f5d6d86706a80c4e19c91fcce07 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,8 +1,9 @@
 default:
        $(MAKE) -C ..
 
+DISTFILES=Makefile $(mycc) $(othersrc)
 dist:
-       ln Makefile $(mycc) $(othersrc) $(DDIR)/src
+       ln $(DISTFILES) $(DDIR)/$(SUBDIR)
 
 TAGS: $(mycc)
        etags -CT $(mycc)