Commit de1c06b9 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


BUILD/Makefile.am:
  Auto merged
parents 7c49bdc1 aa6d8551

BUILD/Makefile.am

+16 −2
Original line number Diff line number Diff line
@@ -21,14 +21,22 @@ 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-no-bdb \

			compile-pentium-debug-openssl \

			compile-pentium-debug-yassl \
@@ -38,10 +46,16 @@ EXTRA_DIST = FINISH.sh \ 
			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-max \

			compile-solaris-sparc \

			compile-solaris-sparc-debug \

			compile-irix-mips64-mipspro \

			compile-hpux11-parisc2-aCC \

			compile-solaris-sparc-forte \

			compile-solaris-sparc-purify