ignore .dotest

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index ffab58bd76996ba55cfdb697aac0430e9086b6c3..70d937a7f49ca34f28af22da2c7a0624c2b2d805 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -9,7 +9,7 @@ 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
@@ -17,14 +17,13 @@ SUBDIRS = buildscripts python scripts \
 documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure autogen.sh 
-README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING
+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 .git ; then \
+               git-whatchanged gub-2.9.29-2.. > $(distdir)/ChangeLog ; \
+       else \
+               cp $(srcdir)/ChangeLog $(distdir) ; \
+       fi
+
+default: $(outdir)/VERSION
+
+$(outdir)/VERSION: $(config_make)
+       echo $(TOPLEVEL_VERSION) > $@
 
 dist-toplevel-txt-files:
        -mkdir -p $(distdir)