PATCH: Additional simplifications to build process

[Mark Mitchell]

Now that we're using Distutils, there's no need for config.guess and
install-sh in the source tree.  I also simplified GNUmakefile.in a
little bit, and corrected MANIFEST.in to include some missing files.

--
Mark Mitchell
CodeSourcery, LLC
mark at codesourcery.com

2003-11-24  Mark Mitchell  <mark at codesourcery.com>

	* GNUmakefile.in (QM_TOOLS): Do not set it.
	(clean): Remove generated documentation.
	(distclean): Do not remove qm/__version.py.
	* MANIFEST.in: Include GNUmakefile.in, configure.in, and
	configure.
	* config.guess: Remove.
	* install-sh: Likewise.

Index: GNUmakefile.in
===================================================================
RCS file: /home/qm/Repository/qm/GNUmakefile.in,v
retrieving revision 1.33
diff -c -5 -p -r1.33 GNUmakefile.in
*** GNUmakefile.in	24 Nov 2003 18:31:08 -0000	1.33
--- GNUmakefile.in	24 Nov 2003 21:08:40 -0000
***************
*** 11,24 ****
  #
  # For license terms see the file COPYING.
  #
  ########################################################################
  
- # The QM Tools that are being built in this version of QM.
- QM_TOOLS	:= $(notdir \
-                      $(filter qm/test, $(wildcard qm/*)))
- 
  # This trick is necessary to create a make variable containing a
  # single space.  See the "(make)Flavors" info page.
  NULLSTRING	:=
  SPACE		:= $(NULLSTRING) # This comment needs to be here.
  
--- 11,20 ----
*************** PYTHONDIRS	= $(TOPDIR)
*** 35,45 ****
  DOCUMENTATION = @MAINTAINER_MODE@
  
  # HappyDoc configuration.
  HAPPYDOC	= @HAPPYDOC@
  
! # Places to install things.
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  datadir		= @datadir@
  libdir		= @libdir@
  bindir		= @bindir@
--- 31,43 ----
  DOCUMENTATION = @MAINTAINER_MODE@
  
  # HappyDoc configuration.
  HAPPYDOC	= @HAPPYDOC@
  
! # Places to install things.  The values substituted by configure
! # involve $(exec_prefix), so we must define that even though it is not
! # used directly.
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  datadir		= @datadir@
  libdir		= @libdir@
  bindir		= @bindir@
*************** endif
*** 79,92 ****
  %: %.in
  	./config.status
  
  clean::
  	$(PYTHON) ./setup.py clean -a
  
  distclean: clean
  	rm -f GNUmakefile config.cache config.status config.log
- 	rm -f qm/__version.py 
  
  ########################################################################
  # Installation Rules
  ########################################################################
  
--- 77,91 ----
  %: %.in
  	./config.status
  
  clean::
  	$(PYTHON) ./setup.py clean -a
+ 	rm -rf qm/test/doc/print
+ 	rm -rf qm/test/doc/html
  
  distclean: clean
  	rm -f GNUmakefile config.cache config.status config.log
  
  ########################################################################
  # Installation Rules
  ########################################################################
  
Index: MANIFEST.in
===================================================================
RCS file: /home/qm/Repository/qm/MANIFEST.in,v
retrieving revision 1.2
diff -c -5 -p -r1.2 MANIFEST.in
*** MANIFEST.in	24 Nov 2003 00:52:57 -0000	1.2
--- MANIFEST.in	24 Nov 2003 21:08:40 -0000
***************
*** 13,22 ****
--- 13,23 ----
  #
  ########################################################################
  
  include ChangeLog COPYING README
  include MANIFEST.in setup.py
+ include GNUmakefile.in configure.in configure
  
  # These are the modules included in the 'qm' package.
  recursive-include   qm *.py
  # This is the main executable.
  include             qm/test/qmtest