Cleaner doc install, remove git-amb.txt

4 files changed, 9 insertions, 115 deletions

diff --git a/Makefile-files b/Makefile-files
new file mode 100644
index 0000000..b5679f3
--- /dev/null
+++ b/Makefile-files
@@ -0,0 +1,3 @@
+# -*- makefile -*-
+
+dist_doc_DATA += COPYING
diff --git a/Makefile.am b/Makefile.am
index cc994d0..3150b07 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,27 +1,18 @@
+CLEANFILES =
 BUILT_SOURCES =
 EXTRA_DIST =
 bin_SCRIPTS =
 man_MANS =
 UPDATE_SOURCE_FILES =
+doc_DATA =
+dist_doc_DATA =
 
 ACLOCAL_AMFLAGS = -I m4 --install
 
+include Makefile-files
 include doc/Makefile-files
 include src/Makefile-files
 
-all-local: update-sources
-
-update-sources: $(UPDATE_SOURCE_FILES)
-	@echo "x$(top_srcdir)" "x$(top_builddir)"; \
-	if test "x$(top_srcdir)" != "x$(top_builddir)"; then \
-		for file in $(UPDATE_SOURCE_FILES); do \
-			echo cp -f "$${file}" "$(top_srcdir)/$${file}"; \
-			cp -f "$${file}" "$(top_srcdir)/$${file}"; \
-		done; \
-	else \
-		echo "srcdir == builddir, no special updates needed."; \
-	fi
-
 if HAVE_NDIM_MAN2TXT
 .1.txt:
 	set -x; $(NDIM_MAN2TXT) "$<" > "$@.new"
diff --git a/src/Makefile-files b/src/Makefile-files
index 4281ec9..fa28b4d 100644
--- a/src/Makefile-files
+++ b/src/Makefile-files
@@ -5,7 +5,7 @@ EXTRA_DIST  += src/git-amb
 man_MANS   += src/git-amb.1
 EXTRA_DIST += src/git-amb.1.in
 
-EXTRA_DIST += src/git-amb.txt
 if HAVE_NDIM_MAN2TXT
-UPDATE_SOURCE_FILES += src/git-amb.txt
+dist_doc_DATA += src/git-amb.txt
+CLEANFILES    += src/git-amb.txt
 endif
diff --git a/src/git-amb.txt b/src/git-amb.txt
deleted file mode 100644
index cbd01dc..0000000
--- a/src/git-amb.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-GIT-AMB(1)		   ndims git utilities 1.1.1		    GIT-AMB(1)
-
-
-
-NAME
-       git-amb - git automake build utitilty
-
-SYNOPSIS
-       git-amb command [params]
-
-DESCRIPTION
-       Build  automake based git checkout in branch specific build and install
-       trees.  That makes it easy to  compare  build  results  from  different
-       branches.
-
-COMMAND OVERVIEW
-       git-amb autoreconf [params...]
-	      Run autoreconf on ${top_srcdir}.	Optional params will be passed
-	      on to autoreconf.
-
-       git-amb configure [params...]
-	      Run configure  in	 ${top_builddir}.   Optional  params  will  be
-	      passed on to configure.
-
-       git-amb make [params...]
-	      Run  make in ${top_builddir}.  Optional params will be passed on
-	      to make.
-
-       git-amb sh [params...]
-	      Start shell in ${top_builddir}.  Optional params will be	passed
-	      on to the shell.
-
-       git-amb clean [branch]
-	      Run ’make clean’ in ${top_builddir}.  The optional branch is the
-	      branch to clean up.
-
-       git-amb distclean [branch]
-	      Run ’make distclean’ in ${top_builddir}.	The optional branch is
-	      the branch to clean up.
-
-       git-amb purge [branch]
-	      Remove  both build and install tree.  The optional branch is the
-	      branch to purge.
-
-       git-amb uninstall [branch]
-	      Remove ${installdir}.  The optional  branch  is  the  branch  to
-	      uninstall.
-
-       git-amb builddir [branch]
-	      Print  ${builddir}.   The optional branch is the branch to print
-	      the builddir for.
-
-       git-amb installdir [branch]
-	      Print ${installdir}.  The optional branch is the branch to print
-	      the installdir for.
-
-CONFIGURATION
-       Get the value with git config amb.foo or set it with git config amb.foo
-       value
-
-   amb.builddir
-       Location of build tree, relative to top checkout (source) dir, or abso-
-       lute.  The branch name will be appended to it.
-
-   amb.installdir
-       Location	 of  installation,  relative  to top checkout (source) dir, or
-       absolute.  The branch name will be appended to it.
-
-EXAMPLES
-	 $ git config amb.builddir _builds
-	 $ git config amb.installdir _installs
-
-	 $ git checkout master
-	 $ git-amb make install
-	 $ git checkout foo/bar
-	 $ git-amb make dist install
-	 $ diff -ru $(git-amb installdir) $(git-amb installdir master)
-	 $ git-amb sh
-	 <----> [...] $ ls *.tar.gz
-
-TODO
-       Access to build results
-	      Could be better.
-
-       User Interface
-	      Should be more consistent, smaller.
-
-       Concurrent Usage
-	      Exhibits problems, e.g. starting git-amb sh and then running git
-	      checkout other-branch from another terminal.
-
-AUTHORS
-       git-amb was written by Hans Ulrich Niedermann.
-
-SEE ALSO
-       git-branch(1), git-checkout(1), git-config(1).
-
-
-
-2007-11-02		     ndim-git-utils 1.1.1		    GIT-AMB(1)