• unknown's avatar
    Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 · e50678f1
    unknown authored
    into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
    
    
    configure.in:
      Auto merged
    include/my_time.h:
      Auto merged
    mysql-test/r/func_time.result:
      Auto merged
    mysql-test/r/kill.result:
      Auto merged
    mysql-test/r/ps.result:
      Auto merged
    mysql-test/r/rename.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/func_time.test:
      Auto merged
    mysql-test/t/ps.test:
      Auto merged
    mysql-test/t/rename.test:
      Auto merged
    mysql-test/t/view.test:
      Auto merged
    sql/Makefile.am:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql/lex.h:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql-common/my_time.c:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_view.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/table.cc:
      Auto merged
    sql/time.cc:
      Auto merged
    tests/mysql_client_test.c:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Manually merged.
    sql/sql_parse.cc:
      Manually merged.
    e50678f1
Makefile.am 7.49 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

#called from the top level Makefile

MYSQLDATAdir =		$(localstatedir)
MYSQLSHAREdir =		$(pkgdatadir)
MYSQLBASEdir=		$(prefix)
MYSQLLIBdir=            $(pkglibdir)
INCLUDES =		@ZLIB_INCLUDES@ \
			-I$(top_builddir)/include -I$(top_srcdir)/include \
			-I$(top_srcdir)/regex -I$(srcdir) \
                        $(openssl_includes)
WRAPLIBS=		@WRAPLIBS@
SUBDIRS =		share
libexec_PROGRAMS =	mysqld
noinst_PROGRAMS =	gen_lex_hash
bin_PROGRAMS =		mysql_tzinfo_to_sql
gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
SUPPORTING_LIBS =			$(top_builddir)/vio/libvio.a \
			$(top_builddir)/mysys/libmysys.a \
			$(top_builddir)/dbug/libdbug.a \
			$(top_builddir)/regex/libregex.a \
			$(top_builddir)/strings/libmystrings.a
mysqld_DEPENDENCIES=	@mysql_plugin_libs@ $(SUPPORTING_LIBS)
LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@
mysqld_LDADD =		@MYSQLD_EXTRA_LDFLAGS@ \
			@pstack_libs@ \
			@mysql_plugin_libs@ \
			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
                        @yassl_libs@ @openssl_libs@
noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
			item_strfunc.h item_timefunc.h item_uniq.h \
			item_xmlfunc.h \
			item_create.h item_subselect.h item_row.h \
			mysql_priv.h item_geofunc.h sql_bitmap.h \
			procedure.h sql_class.h sql_lex.h sql_list.h \
			sql_map.h sql_string.h unireg.h \
			sql_error.h field.h handler.h mysqld_suffix.h \
			ha_partition.h \
			ha_ndbcluster.h ha_ndbcluster_binlog.h \
			ha_ndbcluster_tables.h \
			opt_range.h protocol.h rpl_tblmap.h rpl_utility.h \
			log.h sql_show.h rpl_rli.h \
			sql_select.h structs.h table.h sql_udf.h hash_filo.h \
			lex.h lex_symbol.h sql_acl.h sql_crypt.h  \
			log_event.h sql_repl.h slave.h rpl_filter.h \
			rpl_injector.h \
			stacktrace.h sql_sort.h sql_cache.h set_var.h \
			spatial.h gstream.h client_settings.h tzfile.h \
			tztime.h my_decimal.h\
			sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \
			parse_file.h sql_view.h	sql_trigger.h \
			sql_array.h sql_cursor.h events.h \
                        event_db_repository.h event_queue.h \
			sql_plugin.h authors.h sql_partition.h event_data_objects.h \
			partition_info.h partition_element.h event_scheduler.h \
			contributors.h
mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \
			item.cc item_sum.cc item_buff.cc item_func.cc \
			item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \
			thr_malloc.cc item_create.cc item_subselect.cc \
			item_row.cc item_geofunc.cc item_xmlfunc.cc \
			field.cc strfunc.cc key.cc sql_class.cc sql_list.cc \
			net_serv.cc protocol.cc sql_state.c \
			lock.cc my_lock.c \
			sql_string.cc sql_manager.cc sql_map.cc \
			mysqld.cc password.c hash_filo.cc hostname.cc \
			set_var.cc sql_parse.cc sql_yacc.yy \
			sql_base.cc table.cc sql_select.cc sql_insert.cc \
			sql_prepare.cc sql_error.cc sql_locale.cc \
			sql_update.cc sql_delete.cc uniques.cc sql_do.cc \
			procedure.cc item_uniq.cc sql_test.cc \
			log.cc log_event.cc init.cc derror.cc sql_acl.cc \
			unireg.cc des_key_file.cc \
			discover.cc time.cc opt_range.cc opt_sum.cc \
		   	records.cc filesort.cc handler.cc \
			ha_partition.cc \
                        ha_ndbcluster.cc ha_ndbcluster_binlog.cc \
			sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
			sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
			sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
			slave.cc sql_repl.cc rpl_filter.cc rpl_tblmap.cc \
			rpl_utility.cc rpl_injector.cc \
                        sql_union.cc sql_derived.cc \
			client.c sql_client.cc mini_client_errors.c pack.c\
			stacktrace.c repl_failsafe.h repl_failsafe.cc \
			sql_olap.cc sql_view.cc \
			gstream.cc spatial.cc sql_help.cc sql_cursor.cc \
			tztime.cc my_time.c my_user.c my_decimal.cc\
			sp_head.cc sp_pcontext.cc  sp_rcontext.cc sp.cc \
			sp_cache.cc parse_file.cc sql_trigger.cc \
                        event_scheduler.cc event_data_objects.cc \
                        event_queue.cc event_db_repository.cc events.cc \
			sql_plugin.cc sql_binlog.cc \
			sql_builtin.cc sql_tablespace.cc partition_info.cc


gen_lex_hash_SOURCES =	gen_lex_hash.cc
gen_lex_hash_LDADD =	$(LDADD) $(CXXLDFLAGS)
mysql_tzinfo_to_sql_SOURCES =   mysql_tzinfo_to_sql.cc
mysql_tzinfo_to_sql_LDADD =  @MYSQLD_EXTRA_LDFLAGS@ $(LDADD) $(CXXLDFLAGS)

DEFS =			-DMYSQL_SERVER \
			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
			-DDATADIR="\"$(MYSQLDATAdir)\"" \
			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
			-DLIBDIR="\"$(MYSQLLIBdir)\"" \
			@DEFS@

BUILT_DIST_SRC =	sql_yacc.cc sql_yacc.h
BUILT_SOURCES =		$(BUILT_DIST_SRC) lex_hash.h
EXTRA_DIST =		udf_example.c udf_example.def $(BUILT_DIST_SRC) \
			nt_servc.cc nt_servc.h message.mc CMakeLists.txt \
			udf_example.c udf_example.def
CLEANFILES =        	lex_hash.h sql_yacc.cc sql_yacc.h sql_yacc.output
AM_YFLAGS =		-d --debug --verbose

mysql_tzinfo_to_sql.cc:
	rm -f mysql_tzinfo_to_sql.cc
	@LN_CP_F@ $(srcdir)/tztime.cc mysql_tzinfo_to_sql.cc

link_sources: mysql_tzinfo_to_sql.cc
	rm -f mini_client_errors.c
	@LN_CP_F@ $(top_srcdir)/libmysql/errmsg.c mini_client_errors.c
	rm -f pack.c
	@LN_CP_F@ $(top_srcdir)/sql-common/pack.c pack.c
	rm -f client.c
	@LN_CP_F@ $(top_srcdir)/sql-common/client.c client.c
	rm -f my_time.c
	@LN_CP_F@ $(top_srcdir)/sql-common/my_time.c my_time.c
	rm -f my_user.c
	@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c

mysql_tzinfo_to_sql.o:	$(mysql_tzinfo_to_sql_SOURCES)
			$(CXXCOMPILE) -c $(INCLUDES) -DTZINFO2SQL $<

# Try to get better dependencies for the grammar. Othervise really bad
# things like different grammars for different pars of MySQL can
# happen if you are unlucky.
sql_yacc.cc:	sql_yacc.yy

sql_yacc.h:	sql_yacc.yy

sql_yacc.o:	sql_yacc.cc sql_yacc.h $(HEADERS)
		@SED@ -e 's/__attribute__ ((__unused__))//' sql_yacc.cc > sql_yacc.cc-new
		@MV@ sql_yacc.cc-new sql_yacc.cc
		@echo "Note: The following compile may take a long time."
		@echo "If it fails, re-run configure with --with-low-memory"
		$(CXXCOMPILE) $(LM_CFLAGS) -c $<

# FIXME seems like now "lex_hash.h" differs depending on configure
# flags, so can't pregenerate and include in source TAR. Revert to
# dist pregenerated if this changes, so the file doesn't differ.
lex_hash.h:	gen_lex_hash$(EXEEXT)
		./gen_lex_hash$(EXEEXT) > $@

# the following three should eventually be moved out of this directory
ha_ndbcluster.o:ha_ndbcluster.cc ha_ndbcluster.h
		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<

ha_ndbcluster_binlog.o:ha_ndbcluster_binlog.cc ha_ndbcluster_binlog.h
		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<

#Until we can get rid of dependencies on ha_ndbcluster.h
handler.o:	handler.cc ha_ndbcluster.h
		$(CXXCOMPILE) @ndbcluster_includes@ $(CXXFLAGS) -c $<

# For testing of udf_example.so
noinst_LTLIBRARIES= udf_example.la
udf_example_la_SOURCES= udf_example.c
udf_example_la_LDFLAGS= -module -rpath $(pkglibdir)


# Don't update the files from bitkeeper
%::SCCS/s.%