Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index c0177ffa3355e538deb90ce9d75c0db4a2d413f3..d25212c13d76066807a70be65358bd2c7d12b84e 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -9,22 +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 autogen.sh Doxyfile
-README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING
-TOPDOC_FILES=AUTHORS README INSTALL NEWS
+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 
-EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \
-  $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES)
+EXTRA_DIST_FILES = VERSION .cvsignore .gitignore SConstruct \
+  $(README_FILES) $(SCRIPTS) $(IN_FILES) 
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
 
@@ -33,7 +32,19 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
-local-dist: dist-toplevel-txt-files
+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)
@@ -50,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)
@@ -67,7 +82,9 @@ final-install:
 
 web-ext = html midi pdf png txt ly signature
 
-footify = $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+# For docball, issue `make web CONTENT_NEGOTIATION='
+CONTENT_NEGOTIATION = --content-negotiation
+footify = $(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) $(CONTENT_NEGOTIATION)
 footifymail = MAILADDRESS='http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs'
 
 
@@ -83,7 +100,8 @@ local-WWW-post:
 
        cd $(top-build-dir) && find Documentation input \
                $(web-ext:%=-path '*/out-www/*.%' -or) -type l \
-               | grep -v 'lily-[0-9].*.pdf' \
+               | grep -v 'lily-[0-9a-f]*.*pdf' \
+               | grep -v '/fr/' \
                > $(outdir)/weblist
        ls $(outdir)/*.html >> $(outdir)/weblist
 
@@ -139,7 +157,6 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
        ln -s $(TOPLEVEL_VERSION) $(tree-share-prefix-current)
        mkdir -p $(tree-lib-prefix)
        ln -s $(TOPLEVEL_VERSION) $(tree-lib-prefix-current)
-       mkdir -p $(tree-share-prefix)/dvips
        mkdir -p $(tree-share-prefix)/elisp
        mkdir -p $(tree-share-prefix)/fonts
        mkdir -p $(tree-share-prefix)/fonts/otf
@@ -162,9 +179,6 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
                ln -s ../../../../python/$(outconfbase) python && \
                ln -s $(top-src-dir)/scm && \
                ln -s $(top-src-dir)/scripts scripts
-       cd $(tree-share-prefix)/dvips && \
-               ln -s ./../../../mf/$(outconfbase) mf-out && \
-               ln -s $(top-src-dir)/ps
        cd $(tree-share-prefix)/tex && \
                ln -s $(top-src-dir)/tex source && \
                ln -s ../../../../../tex/$(outconfbase) tex-out && \
@@ -183,7 +197,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 && \
@@ -194,7 +211,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