($(outdir)/%.cc

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

diff --git a/ChangeLog b/ChangeLog
index 9ca91ad9415b8b3770effb56223feeae341b80e3..27703232aa07378dd9e454a6069892953450d5ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-02-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 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
        * 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 2e1578c1774f670e335e58e5f56a9b3182b2526e..25c1d1207a643b4c5d4eae985d22e499b28b4b6c 100644 (file)
--- 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)/%.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$@ $<
 
 $(outdir)/%.cc: %.ll
        $(FLEX) -Cfe -p -p -o$@ $<