From: fred <fred>
Date: Sun, 24 Mar 2002 19:33:34 +0000 (+0000)
Subject: lilypond-0.0.35
X-Git-Tag: release/1.5.59~5285
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=189233390d4e2bd5b79064fd625f742200fa1477;p=lilypond.git

lilypond-0.0.35
---

diff --git a/Generate.make b/Generate.make
index 0b1e6c490d..5be1641e1e 100644
--- a/Generate.make
+++ b/Generate.make
@@ -1,20 +1,19 @@
 # Generate.make ?
-# -> Rules.make: containing all compile/flex/bison/... rules (jcn)
 
 parsheadorig=$(CCDIR)/parser.tab.h
 parsheadnew=$(HEADERDIR)/parser.hh
 
 #
-# take some trouble to avoid overwriting the old y.tab.h
-# why? (jcn)
+# take some trouble to avoid overwriting the old y.tab.h,
+# because otherwise all dependants would be remade.
 $(CCDIR)/parser.cc: $(CCDIR)/parser.y
 	$(BISON) -d $<
+	mv $(CCDIR)/parser.tab.c $@
 	(if diff  $(parsheadorig) $(parsheadnew)>/dev/null; then \
 		echo Ignoring $(parsheadorig);  \
 	else \
 		mv $(parsheadorig) $(parsheadnew); \
 	fi )
-	mv $(CCDIR)/parser.tab.c $@
 
 $(parsheadnew): $(CCDIR)/parser.cc
 
diff --git a/Makefile b/Makefile
index 3e4a16e511..c990a7246c 100644
--- a/Makefile
+++ b/Makefile
@@ -17,18 +17,18 @@ $(m2m):	$(m2mobs)
 .PHONY: clean docxx
 
 clean:
-	rm -f $(allexe) $(DOCDIR)/* core $(allobs) $(ALLDEPS)
+	rm -f $(allexe) $(DOCDIR)/* core $(allobs) 
 	for SUBDIR in $(SUBDIRS); \
 	do \
 		$(MAKE) SUBDIR=$$SUBDIR -C $$SUBDIR clean;\
 	done
 
 distclean: clean
-	rm -f  version.hh $(gencc) .GENERATE *~ $(ALLDEPS)
+	rm -f  version.hh $(gencc) .GENERATE *~ $(ALLDEPS) 
 
 all: $(exe) $(m2m) doc
 
-# value of $(OSTYPE) on windhoos; "make $OSTYPE" if u use bash :-)
+# value of $(OSTYPE) on windhoos; "make $OSTYPE" if you use bash :-)
 win32: 
 	$(MAKE) -C . CXX=g++ 
 
@@ -39,13 +39,13 @@ doc:
 docxx: $(progdocs)	
 	doc++ -kp -d $(DOCDIR) $^
 
+
+include $(DEPDIR)/*.dep
+
 $(OBJECTDIR)/%.o: $(CCDIR)/%.cc
 	$(DODEP)\
 	$(CXX) -c $(CXXFLAGS) $(OUTPUT_OPTION) 
 
-
-include $(DEPDIR)/*.dep
-
 $(OBJECTDIR)/version.o: $(obs) $(HEADERDIR)/version.hh
 
 include Generate.make
diff --git a/Variables.make b/Variables.make
index cc697d7c3c..ea71398c05 100644
--- a/Variables.make
+++ b/Variables.make
@@ -3,7 +3,7 @@
 # version info
 MAJVER=0
 MINVER=0
-PATCHLEVEL=34
+PATCHLEVEL=35
 
 
 
@@ -124,4 +124,4 @@ STRIPDEBUG=true #replace to do stripping of certain objects
 LINKER=$(CXX)
 include Site.make
 
-include Site.make
+