summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-12-18 18:11:19 +0100
committerunknown <kent@mysql.com>2005-12-18 18:11:19 +0100
commita5ecdebac3b38ca7948d9db774107d6a35a41726 (patch)
tree1ca0d28c71d28d724dff4b9f4f3199ee9db00288 /BUILD
parent6642eb0581cec439c2e783f6a9d99bb938e1f6b6 (diff)
parent2de5c141627638ad375c1911f9a4a0b378599f4f (diff)
downloadmariadb-git-a5ecdebac3b38ca7948d9db774107d6a35a41726.tar.gz
Merge
configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/ndb_basic.result: Auto merged mysql-test/r/ndb_multi.result: Auto merged mysql-test/r/skip_name_resolve.result: Auto merged mysql-test/r/type_time.result: Auto merged mysql-test/t/ndb_basic.test: Auto merged mysql-test/t/ndb_multi.test: Auto merged mysql-test/t/skip_name_resolve.test: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged storage/ndb/src/ndbapi/NdbImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged tests/mysql_client_test.c: Auto merged zlib/Makefile.am: Auto merged
Diffstat (limited to 'BUILD')
-rw-r--r--BUILD/Makefile.am23
1 files changed, 21 insertions, 2 deletions
diff --git a/BUILD/Makefile.am b/BUILD/Makefile.am
index 45c1aaa1a76..a5f3623c25e 100644
--- a/BUILD/Makefile.am
+++ b/BUILD/Makefile.am
@@ -21,27 +21,46 @@ EXTRA_DIST = FINISH.sh \
SETUP.sh \
autorun.sh \
check-cpu \
+ cleanup \
compile-alpha \
compile-alpha-ccc \
compile-alpha-cxx \
compile-alpha-debug \
+ compile-amd64-debug-max \
+ compile-amd64-max \
+ compile-darwin-mwcc \
+ compile-dist \
+ compile-hpux11-parisc2-aCC \
compile-ia64-debug-max \
+ compile-irix-mips64-mipspro \
compile-pentium \
compile-pentium-debug \
compile-pentium-debug-max \
+ compile-pentium-debug-max-no-embedded \
+ compile-pentium-debug-max-no-ndb \
compile-pentium-debug-no-bdb \
compile-pentium-debug-openssl \
compile-pentium-debug-yassl \
compile-pentium-gcov \
compile-pentium-gprof \
+ compile-pentium-icc \
+ compile-pentium-icc-valgrind-max \
+ compile-pentium-icc-yassl \
compile-pentium-max \
compile-pentium-myodbc \
compile-pentium-mysqlfs-debug \
compile-pentium-pgcc \
+ compile-pentium-valgrind-max \
+ compile-pentium64-debug \
+ compile-pentium64-debug-max \
+ compile-pentium64-valgrind-max \
+ compile-ppc \
+ compile-ppc-debug \
+ compile-ppc-debug-max \
+ compile-ppc-debug-max-no-ndb \
+ compile-ppc-max \
compile-solaris-sparc \
compile-solaris-sparc-debug \
- compile-irix-mips64-mipspro \
- compile-hpux11-parisc2-aCC \
compile-solaris-sparc-forte \
compile-solaris-sparc-purify