X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=04a305ed7606a133494630f74dc6c34bedf7e026;hb=e0106a2533e8a6a90db07941af4ad3830667fe6e;hp=83d1c1621c4a56fb74b9e483a09a0b5861cdb8e5;hpb=cf539418297dac9f06557f14c3cf5e5bc18165dd;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 83d1c1621c..04a305ed76 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
-README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING
-README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt
+SCRIPTS = configure autogen.sh 
+README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING
+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)
+
+EXTRA_DIST_FILES = VERSION .cvsignore .gitignore SConstruct \
+  $(README_FILES) $(SCRIPTS) $(IN_FILES) 
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
 
@@ -32,6 +32,25 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
+local-dist: dist-toplevel-txt-files dist-changelog
+
+dist-changelog:
+	if  test -d $(top-src-dir)/.git ; then \
+		cd $(top-src-dir) && git-whatchanged gub-2.9.29-2.. > $(distdir)/ChangeLog ; \
+	else \
+		cp $(top-src-dir)/ChangeLog $(distdir) ; \
+	fi
+
+default: $(outdir)/VERSION
+
+$(outdir)/VERSION: $(config_make)
+	echo $(TOPLEVEL_VERSION) > $@
+
+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 +61,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)
@@ -75,6 +98,7 @@ local-WWW-post:
 
 	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
 
@@ -119,7 +143,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
@@ -174,7 +198,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 && \
@@ -185,7 +212,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
 		ln -s ../../../../../../mf/$(outconfbase)/*.pfa .
 
 TAGS.make: dummy
-	etags -o $@ $(find $(srcdir) -name 'GNUmakefile*' -o -name '*.make')
+	etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make')
 
 local-clean: build-dir-setup-clean local-web-clean