Merge [1929], [1930], [1931], and [1932] from trunk.

These break apart perfect hash generation from x86 specifics.

svn path=/branches/yasm-0.6.x/; revision=1975

diff --cc Makefile.am
Simple merge

diff --cc tools/Makefile.inc
index 264b8e1643022388f0b79e3c0cb42317d1372d1f,984578b9fb16b00b45af2e598419f3c52e6a16c8..dac917ddc79dfee12b89fb153f23eebf8a76ff68
--- 1/tools/Makefile.inc
--- 2/tools/Makefile.inc
+++ b/tools/Makefile.inc
@@@ -1,7 -1,9 +1,7 @@@
  # $Id$
  
  EXTRA_DIST += tools/re2c/Makefile.inc
- EXTRA_DIST += tools/gap/Makefile.inc
+ EXTRA_DIST += tools/genperf/Makefile.inc
 -EXTRA_DIST += tools/python-yasm/Makefile.inc
  
  include tools/re2c/Makefile.inc
- include tools/gap/Makefile.inc
+ include tools/genperf/Makefile.inc
 -include tools/python-yasm/Makefile.inc