From 5c9005d70707c2dfadd0e7b5d839e43926d318bb Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:08:49 +0000 Subject: [PATCH] lilypond-1.0.1 --- flower/include/Makefile | 15 ++---------- lib/include/Makefile | 13 ++--------- mi2mu/include/Makefile | 14 ++---------- stepmake/stepmake/C++_vars.make | 14 ++++++++++++ stepmake/stepmake/Intlrules.make | 7 ++++++ stepmake/stepmake/Rules.make | 39 ++++++++++++++++++++++++++++++++ 6 files changed, 66 insertions(+), 36 deletions(-) create mode 100644 stepmake/stepmake/C++_vars.make create mode 100644 stepmake/stepmake/Intlrules.make create mode 100644 stepmake/stepmake/Rules.make diff --git a/flower/include/Makefile b/flower/include/Makefile index b7716f2676..283e1fadcd 100644 --- 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 43a98084f3..5dba771ec9 100644 --- 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 1cfdc7b22a..b23f26fb30 100644 --- 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 index 0000000000..889b3f6c21 --- /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 index 0000000000..41a4421f86 --- /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 index 0000000000..97e210c959 --- /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 $( $@ + -- 2.39.5