lilypond-0.0.10

diff --git a/Make.variables b/Make.variables
deleted file mode 100644 (file)
index 3d83d00..0000000
--- a/Make.variables
+++ /dev/null
@@ -1,71 +0,0 @@
-####
-#### USER CONFIGURABLE
-####
-
-# speedy
-#DEFINES=-DNDEBUG -DNPRINT -O2
-
-# lots of debugging info
-DEFINES=-g
-
-# turn off -pipe if linker doesn't support it
-EXTRACXXFLAGS=-pipe -Wall -W  -pedantic 
-
-####
-#### EN USER CONFIGURABLE part.
-####
-
-# version info
-MAJVER=0
-MINVER=0
-PATCHLEVEL=9
-VERSION=$(MAJVER).$(MINVER).$(PATCHLEVEL)
-
-# directories
-TOPDIR  := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
-OBJECTDIR=objects
-HEADERDIR=hdr
-CCDIR=src
-
-vpath %.cc $(CCDIR)
-vpath %.hh $(HEADERDIR)
-vpath %.y $(CCDIR)
-vpath %.l $(CCDIR)
-vpath %.o $(OBJECTDIR)
-
-# 
-#
-include Sources.make
-progdocs=$(hdr) $(mycc)
-gencc=parser.cc lexer.cc
-cc=$(mycc) $(gencc)
-obs=$(cc:.cc=.o) 
-
-
-#dist
-.EXPORT_ALL_VARIABLES:
-
-DOCDIR=docdir
-
-PACKAGENAME=lilypond
-DNAME=$(PACKAGENAME)-$(VERSION)
-
-# distribution files.
-othersrc=lexer.l parser.y
-SCRIPTS=make_version make_patch genheader
-IFILES=dimen.tex symbol.ini kortjakje.ly maartje.ly\
-       lilyponddefs.tex test.tex .dstreamrc
-OFILES=Makefile Make.variables Sources.make COPYING README
-DFILES=$(OFILES) $(IFILES) $(SCRIPTS)
-
-#compiling
-LOADLIBES=-L$(FLOWERDIR) -lflower
-FLOWERDIR=../flower
-
-CXXFLAGS=$(DEFINES) -I$(HEADERDIR) -I$(FLOWERDIR) $(EXTRACXXFLAGS)
-FLEX=flex
-BISON=bison
-exe=$(PACKAGENAME)
-OUTPUT_OPTION=$< -o $@
-DDIR=$(TOPDIR)/$(DNAME)
-SUBDIRS=Documentation $(OBJECTDIR) $(CCDIR) $(HEADERDIR)

diff --git a/Makefile b/Makefile
index 8f05ad90f839b19f01c0242eb1443df79a895004..4dcc395210a1f8f54211a81023c355e640954930 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-include Make.variables 
+include Variables.make 
 
 $(exe): $(obs)
        $(CXX) -o $@ $^ $(LOADLIBES)
@@ -32,23 +32,23 @@ $(OBJECTDIR)/%.o: $(CCDIR)/%.cc
        rm -f depend
 
 realdepend: $(cc)
-       $(CXX) $(CXXFLAGS) -MM $^ |  perl -ne 's/^(.+)\.o/'$(OBJECTDIR)'\/\1.o/; print;' > depend
+       $(CXX) $(CXXFLAGS) -MM $^ |  perl -ne 's#hdr/proto.hh##; s/^(.+)\.o/'$(OBJECTDIR)'\/\1.o/; print;' > depend
 
 include depend
 
 $(CCDIR)/parser.cc: parser.y
        $(BISON) -d $<
        mv $(CCDIR)/parser.tab.h $(HEADERDIR)/parser.hh
-       mv $(CCDIR)/parser.tab.c $(CCDIR)/parser.cc
+       mv $(CCDIR)/parser.tab.c $@
 
 parser.hh: parser.cc
 
 version.o: $(obs) version.hh
 
-version.hh: Makefile make_version
-       make_version $(MAJVER) $(MINVER) $(PATCHLEVEL)  > $(HEADERDIR)/$@
+hdr/version.hh: Variables.make make_version
+       make_version $(MAJVER) $(MINVER) $(PATCHLEVEL)  > $@
 
-src/lexer.cc: lexer.l
+$(CCDIR)/lexer.cc: lexer.l
        $(FLEX) -+ -t $< > $@
 
 dist:
@@ -65,4 +65,4 @@ dist:
 
 TAGS:
        $(MAKE) -C $(HEADERDIR) TAGS
-       $(MAKE) -C $(CCDIR) TAGS
\ No newline at end of file
+       $(MAKE) -C $(CCDIR) TAGS