lilypond-1.0.1

diff --git a/flower/include/Makefile b/flower/include/Makefile
index b7716f26767acbb1ae0d20f436fae75118016b85..283e1fadcd27004634c4385ee0171e88266df70c 100644 (file)
--- a/flower/include/Makefile
+++ b/flower/include/Makefile
@@ -1,19 +1,8 @@
 # flower/lib/include/Makefile
 
-# subdir level:
-#
 depth = ../..
-#
 
-# generic stuff/Makefile
-#
-include ./$(depth)/make/Include.make
-include ./$(depth)/flower/VERSION
+include $(depth)/make/Stepmake.make
+include $(stepdir)/C++.make
 
-# identify module:
-#
-MODULE_NAME = flower
-
-
-#
 

diff --git a/lib/include/Makefile b/lib/include/Makefile
index 43a98084f3ca4e548a45ec90bd5c90ca11531bf0..5dba771ec97238ee97f27822cfe1a8ecb611ab04 100644 (file)
--- a/lib/include/Makefile
+++ b/lib/include/Makefile
@@ -1,17 +1,8 @@
 # lib/include/Makefile
 
-# subdir level:
-#
 depth = ../..
-#
 
-# identify module:
-#
-MODULE_NAME = lilypond
-
-# generic stuff/Makefile
-#
-
-include ./$(depth)/make/Include.make
+include $(depth)/make/Stepmake.make
+include $(stepdir)/C++.make
 
 

diff --git a/mi2mu/include/Makefile b/mi2mu/include/Makefile
index 1cfdc7b22a0927b31e049cf55952ea778d4c15d3..b23f26fb302fa5c4113859841d19f46371e0a4ed 100644 (file)
--- a/mi2mu/include/Makefile
+++ b/mi2mu/include/Makefile
@@ -1,17 +1,7 @@
 # lib/include/Makefile
 
-# subdir level:
-#
 depth = ../..
-#
 
-# identify module:
-#
-MODULE_NAME = lilypond
-#
-
-# generic stuff/Makefile
-#
-include ./$(depth)/make/Include.make
-#
+include $(depth)/make/Stepmake.make
+include $(stepdir)/C++.make
 

diff --git a/stepmake/stepmake/C++_vars.make b/stepmake/stepmake/C++_vars.make
new file mode 100644 (file)
index 0000000..889b3f6
--- /dev/null
+++ b/stepmake/stepmake/C++_vars.make
@@ -0,0 +1,14 @@
+
+# added two warnings that are treated by cygwin32's gcc 2.7.2 as errors.
+# huh, but still, no warnings even provoced with linux's gcc 2.7.2.1?
+
+# -pipe makes it go faster, but is not supported on all platforms. 
+# EXTRA_CXXFLAGS= -Wall -Winline -W -Wmissing-prototypes -Wmissing-declarations -Wconversion
+EXTRA_CXXFLAGS= -Wall -W -Wmissing-prototypes -Wmissing-declarations -Wconversion
+
+
+CXXFLAGS = $(ICFLAGS) $(DEFINES) $(INCLUDES) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS)
+CXX_OUTPUT_OPTION = $< -o $@
+DO_CXX_COMPILE=$(DODEP) $(CXX) -c $(CXXFLAGS) $(CXX_OUTPUT_OPTION)
+
+

diff --git a/stepmake/stepmake/Intlrules.make b/stepmake/stepmake/Intlrules.make
new file mode 100644 (file)
index 0000000..41a4421
--- /dev/null
+++ b/stepmake/stepmake/Intlrules.make
@@ -0,0 +1,7 @@
+
+LIBINTL=$(outdir)/libintl.a
+check-lib-intl:
+       $(MAKE) -C $(depth)/intl lib
+
+include $(stepdir)/C.make
+

diff --git a/stepmake/stepmake/Rules.make b/stepmake/stepmake/Rules.make
new file mode 100644 (file)
index 0000000..97e210c
--- /dev/null
+++ b/stepmake/stepmake/Rules.make
@@ -0,0 +1,39 @@
+# title           generic make rules
+# file    make/Rules.make
+
+# this is supposed to clear all suffixes:
+.SUFFIXES:
+
+$(outdir)/%: %.m4
+       $(M4) $< > $@
+
+%.dep:
+       touch $@
+
+%.gz: %
+       gzip -c9 $< > $@
+
+# bit docrules, these...
+$(outdir)/%.dvi: $(outdir)/%.tex
+       (cd $(outdir); tex \\nonstopmode \\input $(<F))
+
+$(outdir)/%.dvi: $(outdir)/%.latex
+       (cd $(outdir); \
+         latex \\nonstopmode \\input $(<F);\
+         bibtex $(basename $(<F));\
+         latex \\nonstopmode \\input $(<F);\
+         latex \\nonstopmode \\input $(<F);\
+       )
+
+$(outdir)/%.ps: $(outdir)/%.dvi
+       dvips -ta4 -o $@ $<
+
+
+# hmm, always include these, or include via package/make/Rules.make?
+include $(stepdir)/Substitute.make
+include $(make-dir)/Rules.make
+
+$(outdir)/%: %.in
+       rm -f $@
+       cat $< | $(sed-atfiles) | $(sed-atvariables) > $@
+