From 993239bd5a3e86db7200ccfb920a547e394887b7 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:35:19 +0000 Subject: [PATCH] lilypond-0.0.42 --- INSTALL | 51 --------------- make/Configure_variables.make.in | 24 +++++++ make/Targets.make | 107 ++++++++++++++++++------------- 3 files changed, 87 insertions(+), 95 deletions(-) delete mode 100644 INSTALL create mode 100644 make/Configure_variables.make.in diff --git a/INSTALL b/INSTALL deleted file mode 100644 index c36823be78..0000000000 --- a/INSTALL +++ /dev/null @@ -1,51 +0,0 @@ -IMPORTANT: - - if you have downloaded a - - *.pre* - - version, then this is version is *not* meant for producing nice output - (but to keep your patchsets up to date). It might not even compile. - - -INSTALL: - - to make LilyPond, simply type: - - sh configure - make - - assuming you have the gnu development tools, and your make is gnu make, - else try something like: - - MAKE=gmake configure - MAKE=gmake gmake - - \begin{masochist} - Windows NT: - - you need the cygnus win32 gnu port development stuff; have a look - at http://www.cygnus.com/gnu-win32. - - to make LilyPond under, brr, aargh, well, simply type: - - bash configure - make win32 - \end{masochist} - - -SUPPORT - - LilyPond (pl 0.0.39) is known to compile on the following platforms: - - * linux 2.0.28, g++ 2.7.2[.1] - * aix 4.1, g++ 2.7.2 - * windows-nt 4.0, cygnus gnu-win32 beta17.1 (~=g++ 2.7.2) - * linux 2.0.28 X to doze, gcc-go32 (~=g++ 2.7.2), but segfaults - in 16 bit subsystem %-/ - -Have fun! - - hanwen@stack.nl - jan@digicash.com - diff --git a/make/Configure_variables.make.in b/make/Configure_variables.make.in new file mode 100644 index 0000000000..22d1becc05 --- /dev/null +++ b/make/Configure_variables.make.in @@ -0,0 +1,24 @@ +# -*-Makefile-*- + +# @configure_input@ + +INSTALL = @INSTALL@ +CXXFLAGS = @CXXFLAGS@ +#CXX = @CXX@ + +prefix = @prefix@ +TEXPREFIX = @TEXPREFIX@ +mandir = @mandir@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +includedir = @includedir@ +datadir = @datadir@ + +RANLIB = @RANLIB@ +DEFS = @DEFS@ +#SET_MAKE = @SET_MAKE@ +DEFINES = @DEFINES@ +FIND = @FIND@ +COMPILEINFO = @COMPILEINFO@ +BISON = @BISON@ +FLEX = @FLEX@ diff --git a/make/Targets.make b/make/Targets.make index 1b894002bc..8173b9e079 100644 --- a/make/Targets.make +++ b/make/Targets.make @@ -12,7 +12,10 @@ # target all: # all: default - for i in $(SUBDIRS); do $(MAKE) -C $$i all; done +ifdef SUBDIRS + set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i all; done +endif + # # platform specific variables, @@ -23,45 +26,40 @@ include ./$(depth)/make/out/Site.make # where to do this ? .PRECIOUS: $(makeout)/Site.make -# ... and configure bootstrap :-) -# -$(makeout)/Site.make: $(make-dir)/$(genout) $(flower-config) $(lily-config) -# this is handy, but runs on second "make distclean" too. ah well... -# if [ \! -d $(makeout) ]; then mkdir $(makeout); fi - touch $@ - @echo "oeps, sources were not configured!" - (cd $(depth); ./configure) -# - # dependency list of executable: # -EXECUTABLE = $(bindir)/$(NAME) -$(EXECUTABLE): $(OFILES) $(CUSTOMLIBES) +EXECUTABLE = $(lily_bindir)/$(NAME) +$(EXECUTABLE): $(build) $(OFILES) $(CUSTOMLIBES) + $(INCREASE_BUILD) + $(MAKE) $(OFILES) $(SILENT_LOG) # $(STRIPDEBUG) $(STABLEOBS) -# $(LD_COMMAND) -o $@ $^ $(LOADLIBES) $(LD_COMMAND) $(OFILES) $(LOADLIBES) - -@touch $(VERSION_DEPENDENCY) $(ERROR_LOG) - $(INCREASE_BUILD) - touch $(build) #waai necessary? -# + exe: $(EXECUTABLE) # +$(build): + echo 0 > $@ + # dependency list of library: # LIBRARY = $(libdir)/$(LIB_PREFIX)$(NAME)$(LIB_SUFFIX) -$(LIBRARY): $(OFILES) $(CUSTOMLIBES) - $(AR_COMMAND) $(OFILES) - -@touch $(VERSION_DEPENDENCY) $(ERROR_LOG) +$(LIBRARY): $(build) $(OFILES) $(CUSTOMLIBES) $(INCREASE_BUILD) - touch $(build) #waai necessary? + $(MAKE) $(OFILES) $(SILENT_LOG) + $(AR_COMMAND) $(OFILES) + $(RANLIB_COMMAND) + + # lib: $(LIBRARY) # -clean: - rm -f $(allexe) core $(allobs) $(alldeps) - for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done +clean: localclean + rm -f $(allobs) $(alldeps) +ifdef SUBDIRS + set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done +endif distclean: clean rm -rf $(lily-version) $(flower-version) $(mi2mu-version) .b $(build) *~ $(allout) $(allgen) @@ -75,7 +73,7 @@ config: # dummydeps: # -dummydep: $(flower-dir)/$(genout) $(lib-dir)/$(genout) $(lily-dir)/$(genout) $(mi2mu-dir)/$(genout) $(DUMMYDEPS) +dummydep: $(DUMMYDEPS) # # value of $(OSTYPE) on windhoos; "make $OSTYPE" if you use bash :-) @@ -105,7 +103,7 @@ help: # doc: - $(MAKE) -C Documentation do-doc + $(MAKE) -C $(depth)/Documentation do-doc # doc++ documentation of classes doc++: $(progdocs) @@ -117,10 +115,13 @@ dist: (cd ./$(depth); tar cfz $(DIST_NAME).tar.gz $(DIST_NAME)) rm -rf $(distdir)/ # should be trapped -localdist: +localdist: $(DISTFILES) + if [ -d out ]; then mkdir $(distdir)/$(localdir)/out; fi ln $(DISTFILES) $(distdir)/$(localdir) - for i in $(SUBDIRS); do mkdir $(distdir)/$(localdir)/$$i; done - for i in $(SUBDIRS); do $(MAKE) localdir=$(localdir)/$$i -C $$i localdist; done +ifdef SUBDIRS + set -e; for i in $(SUBDIRS); do mkdir $(distdir)/$(localdir)/$$i; done + set -e; for i in $(SUBDIRS); do $(MAKE) localdir=$(localdir)/$$i -C $$i localdist; done +endif moduledist: -mkdir $(module-distdir) @@ -130,27 +131,45 @@ moduledist: localmoduledist: ln $(DISTFILES) $(module-distdir)/$(localdir) - for i in $(SUBDIRS); do mkdir $(module-distdir)/$(localdir)/$$i; done - for i in $(SUBDIRS); do $(MAKE) localdir=$(localdir)/$$i -C $$i localmoduledist; done +ifdef SUBDIRS + set -e; for i in $(SUBDIRS); do mkdir $(module-distdir)/$(localdir)/$$i; done + set -e; for i in $(SUBDIRS); do $(MAKE) localdir=$(localdir)/$$i -C $$i localmoduledist; done +endif all-tags: TAGS - for i in $(SUBDIRS); do $(MAKE) -C $$i all-tags; done +ifdef SUBDIRS + set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i all-tags; done +endif TAGS: $(allcc) etags -CT $(allcc) -# to some outdir? -autoconf: - autoconf - < configure.in > ac_configure - # version stuff: # -check-flower-version: - $(MAKE) flower-version -C ./$(depth)/flower -$(lily-version): $(lily-dir)/$(genout) ./$(depth)/.version ./$(bindir)/make_version $(build) - ./$(bindir)/make_version "$(MAJOR_VERSION)" "$(MINOR_VERSION)" "$(PATCH_LEVEL)" "$(MY_PATCH_LEVEL)" "$(BUILD)" "$(CXX) $(CXXVER)" > $@ -check-mi2mu-version: - $(MAKE) mi2mu-version -C ./$(depth)/mi2mu -# +out/version.hh: .version + ./$(lily_bindir)/make_version > $@ + + +# should this be in Rules? +configure: configure.in + autoconf - < $<> $@ + chmod +x configure + +localclean: + + +install: localinstall +ifdef SUBDIRS + set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i install; done +endif + +localinstall: + +uninstall: localuninstall +ifdef SUBDIRS + set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i uninstall; done +endif + +localuninstall: -- 2.39.5