X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=fc35f9124597b9ee210437a9986035e72abc6ef8;hb=8cc304c6e0f141b0fb00dffb9a8f592e540d23cd;hp=aae925d8263ceced6ff0d08ca502b928257b299d;hpb=78107dc7b47fa7dd0b9243720ebdeb02026ab1c1;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index aae925d826..fc35f91245 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -9,21 +9,21 @@ SUBDIRS = buildscripts python scripts \
 	po make \
 	elisp vim \
 	input \
-	cygwin stepmake $(documentation-dir)
+	stepmake $(documentation-dir)
 
 
 ## this convoluted construction is necessary, since we don't know the
 ## value of DOCUMENTATION here.
 documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
-SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh Doxyfile
+SCRIPTS = configure autogen.sh 
 README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING
-README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt
+TOPDOC_FILES=AUTHORS README INSTALL NEWS
+TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.in)
-PATCH_FILES = emacsclient.patch server.el.patch darwin.patch
+
 EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \
-  $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES)
-NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
+  $(README_FILES) $(SCRIPTS) $(IN_FILES) 
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
 
@@ -32,6 +32,13 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
+local-dist: dist-toplevel-txt-files
+
+dist-toplevel-txt-files:
+	-mkdir -p $(distdir)
+	ln $(TOPDOC_TXT_FILES) $(distdir)/
+	ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)/
+
 doc: 
 	$(MAKE) -C Documentation
 
@@ -42,14 +49,18 @@ install-WWW:
 	$(MAKE) -C Documentation/user local-install-WWW
 	$(MAKE) -C Documentation/user install-info
 
+install-help2man:
+	$(MAKE) -C scripts man install-help2man
+	$(MAKE) -C lily man install-help2man
+
 web-install:
 	$(MAKE) out=www install-WWW
 
 uninstall-WWW:
-	#TODO
+	echo TODO
 
 web-uninstall:
-	$(MAKE) out=www uninstall-WWW=
+	$(MAKE) out=www uninstall-WWW
 
 local-install:
 	$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)
@@ -73,17 +84,28 @@ local-WWW-post:
 
 	cd $(top-build-dir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify)
 
+	cd $(top-build-dir) && find Documentation input \
+		$(web-ext:%=-path '*/out-www/*.%' -or) -type l \
+		| grep -v 'lily-[0-9].*.pdf' \
+		> $(outdir)/weblist
+	ls $(outdir)/*.html >> $(outdir)/weblist
+
+## urg: this is too hairy, should write a python script to do this.
+
 ## rewrite file names so we lose out-www
 	rm -rf $(outdir)/web-root/ 
-	for d in out-www `cd $(top-build-dir) && find Documentation input -name 'out-www' `; do \
-		echo $$d ; \
-		(mkdir -p $(outdir)/web-root/$$d/ || true) ; \
-		rsync -Wa --include source --include music-glossary \
-			--include lilypond-internals  \
-			--include lilypond \
-		$(foreach pat,$(web-ext), --include '*'.$(pat)) $(top-build-dir)/$$d/ $(outdir)/web-root/$$d/../ ; \
+	mkdir $(outdir)/web-root/
+## urg slow.
+	cat $(outdir)/weblist | (cd $(top-build-dir); tar -cf-  -T- ) | \
+		tar -C $(outdir)/web-root/ -xf -  
+	for dir in $(outdir)/web-root/ ; do  \
+		cd $$dir && \
+		for a in `find . -name out-www`; do \
+			rsync -a  --link-dest $$a/ $$a/ $$a/.. ; \
+			rm -rf $$a ; \
+		done \
 	done
-	echo $(TOPLEVEL_VERSION)> $(outdir)/web-root/VERSION 
+	echo $(TOPLEVEL_VERSION) > $(outdir)/web-root/VERSION
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
@@ -109,7 +131,7 @@ default: $(config_h) build-dir-setup
 build-dir-setup: $(tree-share-prefix)/lilypond-force
 
 PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po)
-HELP_CATALOGS = $(PO_FILES:$(src-depth)/po/%.po=%)
+HELP_CATALOGS = $(PO_FILES:po/%.po=%)
 CATALOGS = $(HELP_CATALOGS:lilypond=) 
 
 $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
@@ -164,7 +186,10 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
 	touch $(tree-share-prefix)/lilypond-force
 
 $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-force
-	-rm -f $(tree-share-prefix)/fonts/{otf,svg,tfm,type1}/* &&  \
+	-rm -f $(tree-share-prefix)/fonts/otf/* &&  \
+	rm -f $(tree-share-prefix)/fonts/svg/* &&  \
+	rm -f $(tree-share-prefix)/fonts/tfm/* &&  \
+	rm -f $(tree-share-prefix)/fonts/type1/* &&  \
 		cd $(tree-share-prefix)/fonts/otf && \
 		ln -s ../../../../../../mf/$(outconfbase)/*.otf .
 	-cd $(tree-share-prefix)/fonts/svg && \
@@ -177,7 +202,13 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
 TAGS.make: dummy
 	etags -o $@ $(find $(srcdir) -name 'GNUmakefile*' -o -name '*.make')
 
-local-clean: build-dir-setup-clean
+local-clean: build-dir-setup-clean local-web-clean
+
+local-web-clean:
+	rm -rf $(outdir)/web-root/
+
+
+
 build-dir-setup-clean:
 	cd $(top-build-dir) && rm -rf share