From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 17 Feb 2006 18:28:06 +0000 (+0000)
Subject: ($(outdir)/%.cc
X-Git-Tag: release/2.7.36~51
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=68b70888cd7348750ce6b7c6b0985fa8d470b023;p=lilypond.git

($(outdir)/%.cc
$(outdir)/%.hh): generate h and c in one rule; otherwise -jX
builds don't work.
---

diff --git a/ChangeLog b/ChangeLog
index 9ca91ad941..27703232aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-02-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* stepmake/stepmake/c++-rules.make ($(outdir)/%.cc
+	$(outdir)/%.hh): generate h and c in one rule; otherwise -jX
+	builds don't work. 
+
+	* VERSION: release 2.7.35
+
 	* lily/beam.cc (get_default_dir): oops. Take abs () for
 	extremes[DOWN].
 	(get_default_dir): use extreme position criterion only in absence
diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
index 2e1578c177..25c1d1207a 100644
--- a/stepmake/stepmake/c++-rules.make
+++ b/stepmake/stepmake/c++-rules.make
@@ -12,17 +12,8 @@ $(outdir)/%.lo: %.cc
 $(outdir)/%.lo: $(outdir)/%.cc
 	$(DO_LO_DEP) $(CXX) -c $(ALL_CXXFLAGS) $(PIC_FLAGS) -o $@ $<
 
-$(outdir)/%.cc: %.yy
-	$(BISON) -o $@ $<
-	-mv -f $(*F).yy.tab.c $@ # bison < 1.30
-
-$(outdir)/%.hh: %.yy
-	$(BISON) -o$(outdir)/$(*F).cc -d $<
-	-mv -f $(*F).yy.tab.h $@  # bison < 1.30 ???
-	-mv -f $(outdir)/$(*F).cc.h $@  # bison < 1.30
-	-mv $(*F).tab.hh $@
-	rm -f $(*F).tab.c $(*F).tab.cc # bison < 1.30
-	rm -f $(outdir)/$(*F).cc # avoid recompiling the .cc file
+$(outdir)/%.cc $(outdir)/%.hh: %.yy
+	$(BISON) -d -o $(subst .hh,.cc,$@)  $<
 
 $(outdir)/%.cc: %.ll
 	$(FLEX) -Cfe -p -p -o$@ $<