From: fred <fred>
Date: Sun, 24 Mar 2002 20:13:21 +0000 (+0000)
Subject: lilypond-1.0.1
X-Git-Tag: release/1.5.59~3005
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9d14e873143a0a8e298200caa7500470c3aebc34;p=lilypond.git

lilypond-1.0.1
---

diff --git a/make/Targets.make b/make/Targets.make
index 945587c0ff..1d7f67bb1c 100644
--- a/make/Targets.make
+++ b/make/Targets.make
@@ -1,246 +1,25 @@
-#
-# project  LilyPond -- the musical typesetter
-# title	   generic make targets
+# title	   package specific targets
 # file	   make/Targets.make
-#
-# Copyright (c) 1997 by    
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
 
-.PHONY : all clean config default dist doc doc++ dummy exe help html lib TAGS\
-	check-flower-deps check-lib-deps check-doc-deps check-html-deps
 
-# target all:
-#
-all:	 default
-	$(LOOP)
-# dependency list of executable:
-#
-
-$(EXECUTABLE): $(configheader) $(OFILES) $(outdir)/version.hh
-ifdef MODULE_LIBDEPS
-	$(MAKE) $(MODULE_LIBDEPS)
-endif
-ifdef STABLEOBS
-	$(DO_STRIP) $(STABLEOBS)
-endif
-	$(LD_COMMAND) $(OFILES) $(LOADLIBES)
-
-exe: $(EXECUTABLE)
-
-
-# dependency list of library:
-#
-$(LIBRARY): $(configheader) $(OFILES)
-	$(AR_COMMAND) $(OFILES)
-	$(AR) ts $@		#silly irix
-	$(RANLIB_COMMAND)
-
-$(SHAREDLIBRARY):  $(configheader) $(OFILES) $(MODULE_LIBDEPS)
-	$(LD_COMMAND) $(OFILES) -o $@.$(VERSION)
-	rm -f $@
-	ln -sf $(outdir)/$(LIB_PREFIX)$(NAME).so.$(VERSION) $@.$(MAJOR_VERSION)
-	ln -sf $(LIB_PREFIX)$(NAME).so.$(VERSION) $@
-
-#
-lib: $(LIBRARY)
-#
-
-outdirs: outdir
-	$(LOOP)
-
-outdir:
-	-mkdir -p $(outdir)
-
-# be careful about deletion.
-clean: localclean
-	-rm -f $(outdir)/*
-	touch $(outdir)/dummy.dep
-	$(LOOP)
-
-distclean: clean 
-	$(LOOP)
-	$(MAKE) local-distclean
-
-maintainerclean: 
-	$(LOOP)
-	$(MAKE)	local-maintainerclean
-	$(MAKE) local-distclean
-
-
-
-# configure:
-#
-config:
-	./$(depth)/configure
-#
-
-# dummydeps:
-#
-dummydep: $(DUMMYDEPS)
-#
-
-# value of $(OSTYPE) on windhoos...; "make $OSTYPE" if you use bash :-)
-#
-win32:  windows32 # win/lose?
-#
-windows32:
-	$(MAKE) -C . "CXX=g++ -D_WINDOWS32"
-#
-
-# xcompile to doze:
-#
-doze:	dos
-dos: 
-	$(MAKE) -C . CXX="gcc-go32 -I/usr/i386-go32/include -I/usr/i386-go32/include/g++ -D_WINDOWS32 -Dcaddr_t=char* -DMAP_SHARED=0"
-#
-
-# target help:
-#
-help:
-	@echo "Makefile for LilyPond $(TOPLEVEL_VERSION)"
-	@echo "Usage:"
-	@echo "	$(MAKE) ["VARIABLE=value" ...] [target]"
-	@echo
-	@echo "targets:"
-	@echo "	all clean config dist distclean doc doc++"
-	@echo "	exe help lib TAGS"
-	@echo "	dos:	xcomplile to dos"
-	@echo "	windows32: native cygnus-gnu compile" 
-#
-
-doc:
-#	$(MAKE) -C $(depth)/Documentation do-doc
-	$(MAKE) -C $(depth)/Documentation all
-
-html: $(HTMLFILES)
-
-# ugh. should generate in out/
-dist:
-	rm -rf $(distdir)
-	-mkdir $(distdir)
-	$(MAKE) localdist
-	chmod -R a+r $(distdir)
-	chmod  a+x `find $(distdir) -type d -print`
-
-	(cd ./$(depth)/$(outdir); $(TAR) cf - $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)
-
-# should be trapped
-	rm -rf $(distdir)/
-
-# ugh. should generate in out/
-dozedist: doosdist
-doosdist: check-mf-deps
-	rm -rf $(distdir)
-	-mkdir $(distdir)
-	$(MAKE) localdist
-	chmod -Rf a+rX $(distdir)
-#	ugh, the ugly way, then
-	rm -f $(distdir)/mf/$(outdir)/*.log
-	# urg
-	(cd $(distdir)/init; ln -s ../../../mf/out/*.ly .)
-	(cd $(distdir)/tex; ln -s ../../../mf/out/*.tex .)
-	(cd $(distdir); rm -rf $(NO_DOOS_DIST))
-	ln $(lilyout)/lilypond $(distdir)/bin/lilypond.exe
-	-strip -s $(distdir)/bin/lilypond.exe
-	ln $(mi2muout)/mi2mu $(distdir)/bin/mi2mu.exe
-	-strip -s $(distdir)/bin/mi2mu.exe
-	(cd ./$(depth)/$(outdir); $(ZIP) $(DIST_NAME).exe.zip $(DIST_NAME))
-# should be trapped
-	rm -rf $(distdir)/
-
-
-localdist: $(DISTFILES) $(OUT_DISTFILES)
-	touch $(outdir)/dummy.dep; \
-	mkdir $(distdir)/$(localdir)/out; \
-	$(LN) $(DISTFILES) $(distdir)/$(localdir)
-	$(LN) $(outdir)/dummy.dep $(OUT_DISTFILES) $(distdir)/$(localdir)/out
-ifdef SUBDIRS
-	set -e; for i in $(SUBDIRS); do mkdir $(distdir)/$(localdir)/$$i; \
-		$(MAKE) localdir=$(localdir)/$$i -C $$i localdist; done
-endif
-
-
-TAGS:$(all-tag-sources)
-ifdef all-tag-sources
-	-etags -CT $(all-tag-sources) $(ERROR_LOG)
-	-ctags -h ".h.hh.tcc.icc" $(all-tag-sources) $(ERROR_LOG)
-endif
-	$(LOOP)
-
-
-# version stuff:
-#
-
-$(outdir)/version.hh: VERSION
-	sh ./$(lily_bindir)/make-version.sh > $@
-
-
-# should this be in Rules?
-configure: configure.in aclocal.m4
-	autoconf - < $<> $@
-	chmod +x configure
-
-localclean:
-
-local-distclean:
-
-local-maintainerclean:
-
-install-strip:
-	$(MAKE) INSTALL="$(INSTALL) -s" install
-
-install: localinstall
-	$(LOOP)
-
-localinstall:
-
-uninstall: localuninstall
-	$(LOOP)
-
-localuninstall:
-
-# specific stuff:
-#
-$(LIBFLOWER): check-flower-deps
-
-check-flower-deps:
-	$(MAKE)  -C $(depth)/flower/ default
-
-check-lib-deps: check-flower-deps
-	$(MAKE)  -C $(depth)/lib
-
-check-doc-deps:
-	$(MAKE) -C $(depth)/Documentation
+check-dist-deps: 
+	false
 
 check-html-deps:
+	false
 	$(MAKE) -C $(depth)/Documentation html
 
-$(LIBLILY): dummy
-	$(MAKE) ./$(outdir)/$(@F) -C $(depth)/lib
-
-
-# RedHat rpm package:
-#
-rpm: check-rpm-doc-deps
-	-cp $(depth)/lilypond-$(TOPLEVEL_VERSION).tar.gz $(rpm-sources)
-#	-cp $(wildcard $(depth)/Documentation/*.xpm) $(rpm-sources)
-	-cp $(wildcard $(depth)/Documentation/$(outdir)/*.gif) $(rpm-sources)
-	$(MAKE) -C $(make-dir) spec
-	rpm -ba $(makeout)/lilypond.spec
-
-check-rpm-doc-deps: 
-	$(MAKE) -C $(depth)/Documentation gifs
 
 check-mf-deps:
+	false
 	$(MAKE) -C $(depth)/mf
 
+check-texinfo-deps:
+	false
+	$(MAKE) -C $(depth)/Documentation texinfo
+	$(MAKE) -C $(depth)/Documentation/man texinfo
+
+# urg!
 $(configheader): $(depth)/$(configuration).hh
 	cp $< $@
 
-WWW: local-WWW
-	$(LOOP)
-
-ifneq ($(DEPFILES),)
-include $(DEPFILES)
-endif
diff --git a/stepmake/stepmake/Toplevel.make b/stepmake/stepmake/Toplevel.make
new file mode 100644
index 0000000000..52d1256221
--- /dev/null
+++ b/stepmake/stepmake/Toplevel.make
@@ -0,0 +1,62 @@
+# -*-Makefile-*-
+# title	   Toplevel.make
+
+# override Variables.make:
+# do not dist ./Makefile (is copied from make/Toplevel.make)
+# 
+DIST_FILES := $(EXTRA_DIST_FILES) 
+#
+
+localdist: configure 
+
+local-distclean: 
+	rm -f config.hh config.make Makefile config.cache \
+		config.status config.log index.html
+
+local-maintainerclean:
+	rm -f configure
+
+Makefile: make/Toplevel.make.in
+	chmod +w $@
+	echo "# WARNING WARNING WARNING WARNING" > $@
+	echo "# do not edit! this is generated from make/Toplevel.make.in" >> $@
+	cat $< >> $@
+	chmod -w $@
+
+htmldoc: 
+	$(MAKE) CONFIGSUFFIX='www' local-WWW
+	$(MAKE) CONFIGSUFFIX='www' -C Documentation WWW
+	rm -f `find . -name \*.html~ -print`
+	tar cfz $(outdir)/htmldoc.tar.gz  `find Documentation -type d -name 'out-www' -print` index.html $(shell ls *.gif $(ERRORLOG))
+
+
+# if you fix this, please fix yodl too!
+check-top-web:
+	$(MAKE) -C Documentation/topdocs WWW
+
+local-WWW: #index.html 
+
+index.html: check-top-web NEWS
+	$(sed-version) < Documentation/topdocs/$(outdir)/topweb.html > $@
+	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=Documentation/top-docs/out-www/index.html $@
+
+WWW-clean:
+	$(MAKE) CONFIGSUFFIX='www' clean
+
+
+dist:	check-state-vector
+	rm -rf $(distdir)
+	-mkdir $(distdir)
+	$(MAKE) localdist $(distdir)
+	chmod -R a+r $(distdir)
+	chmod  a+x `find $(distdir) -type d -print` 
+	(cd ./$(depth)/$(outdir); $(TAR) cf - $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)
+# ugh.
+# Can't compare "stage1" dist with "stage2" dist in this way?
+	-ln -f $(depth)/$(outdir)/$(distname).tar.gz $(release-dir)
+	rm -rf ./$(distdir)/
+
+local-help:
+	@echo -e "\
+  dist        roll tarball: $(outdir)/$(package)-$(TOPLEVEL_VERSION).tar.gz\n"
+