• unknown's avatar
    Merge with 3.23 · 90b2534f
    unknown authored
    innobase/btr/btr0btr.c:
      Auto merged
    ltconfig:
      Auto merged
    innobase/include/btr0btr.h:
      Auto merged
    innobase/log/log0log.c:
      Auto merged
    libmysql/Makefile.shared:
      Auto merged
    man/isamlog.1:
      Auto merged
    man/mysql.1:
      Auto merged
    man/mysql_zap.1:
      Auto merged
    man/isamchk.1:
      Auto merged
    man/mysqlaccess.1:
      Auto merged
    man/mysqladmin.1:
      Auto merged
    man/mysqld_multi.1:
      Auto merged
    man/mysqld.1:
      Auto merged
    man/mysqld_safe.1:
      Auto merged
    man/mysqldump.1:
      Auto merged
    man/mysqlshow.1:
      Auto merged
    man/replace.1:
      Auto merged
    myisam/mi_unique.c:
      Auto merged
    scripts/mysqld_safe.sh:
      Auto merged
    sql/net_pkg.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    strings/Makefile.am:
      Auto merged
    man/perror.1:
      Auto merged
    Makefile.am:
      merge with 3.23
    client/mysqltest.c:
      merge with 3.23
    innobase/btr/btr0pcur.c:
      merge with 3.23 (use local file)
    innobase/row/row0purge.c:
      merge with 3.23 (use local file)
    scripts/mysql_fix_privilege_tables.sh:
      Merge with 3.23 (Apply debian patches)
    sql/ha_innodb.cc:
      merge with 3.23 (use local file)
    sql/mysqld.cc:
      Merge with 3.23 (use local file)
    sql/net_serv.cc:
      Merge with 3.23 (use local file)
    sql/sql_db.cc:
      Merge with 3.23 (use local file)
    90b2534f
Makefile.am 2.63 KB
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
# 
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# 
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
# 
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

# Process this file with automake to create Makefile.in

AUTOMAKE_OPTIONS =	foreign

# These are built from source in the Docs directory
EXTRA_DIST =		INSTALL-SOURCE README \
			COPYING COPYING.LIB
SUBDIRS =		. include @docs_dirs@ @readline_dir@ \
			@thread_dirs@ pstack @sql_client_dirs@ \
			@sql_server_dirs@ scripts man tests \
			BUILD os2 libmysql_r @libmysqld_dirs@ \
			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@

# Relink after clean
linked_sources = linked_client_sources linked_server_sources \
		 linked_libmysql_sources linked_libmysql_r_sources \
		 linked_libmysqld_sources  linked_libmysqldex_sources \
		 linked_include_sources

CLEANFILES = $(linked_sources)

# This is just so that the linking is done early.
config.h: $(linked_sources)

linked_include_sources:
	cd include; $(MAKE) link_sources
	echo timestamp > linked_include_sources

linked_client_sources:  @linked_client_targets@
	cd client; $(MAKE) link_sources
	echo timestamp > linked_client_sources

linked_libmysql_sources:
	cd libmysql; $(MAKE) link_sources
	echo timestamp > linked_libmysql_sources

linked_libmysql_r_sources: linked_libmysql_sources
	cd libmysql_r; $(MAKE) link_sources
	echo timestamp > linked_libmysql_r_sources

linked_libmysqld_sources:
	cd libmysqld; $(MAKE) link_sources
	echo timestamp > linked_libmysqld_sources

linked_libmysqldex_sources:
	cd libmysqld/examples; $(MAKE) link_sources
	echo timestamp > linked_libmysqldex_sources

#avoid recursive make calls in sql directory
linked_server_sources:
	cd sql; rm -f mini_client_errors.c;@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c
	echo timestamp > linked_server_sources

# Create permission databases
init-db:		all
	$(top_builddir)/scripts/mysql_install_db

bin-dist:		all
	$(top_builddir)/scripts/make_binary_distribution

tags:
	support-files/build-tags
.PHONY:		init-db bin-dist

# Test installation

test:
	cd mysql-test ; ./mysql-test-run