mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
d3d5660952
remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR don't set -DUSE_MYSYS_NEW for gcc 2.95 set $USE_MYSYS_NEW even if CXX is g++ yassl bugfixes instantiate all yassl templates explicitly client/Makefile.am: mysqlbinlog as a c++ program may need my_new.cc (if CXX=gcc) no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc client/mysqladmin.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc client/mysqlbinlog.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc configure.in: echo should be AC_MSG_WARN or AC_MSG_ERROR don't set -DUSE_MYSYS_NEW for gcc 2.95 (to restore old behaviour) set $USE_MYSYS_NEW even if CXX is g++ (for yassl, as it can be linked with C programs) remove -DDEFINE_CXA_PURE_VIRTUAL - -DUSE_MYSYS_NEW is enough extra/yassl/mySTL/list.hpp: bugfixes extra/yassl/src/Makefile.am: no need to mess with CXXFLAGS anymore. Instantiate all templates explicitly extra/yassl/src/crypto_wrapper.cpp: instantiate templates explicitly extra/yassl/src/yassl_imp.cpp: instantiate templates explicitly extra/yassl/src/yassl_int.cpp: instantiate templates explicitly extra/yassl/taocrypt/include/runtime.hpp: use -DUSE_MYSYS_NEW not -DDEFINE_CXA_PURE_VIRTUAL assert in __cxa_pure_virtual remove dummy (and thus dangerous) __cxa_guard_acquire/__cxa_guard_release extra/yassl/taocrypt/src/Makefile.am: no need to mess with CXXFLAGS anymore. Instantiate all templates explicitly extra/yassl/taocrypt/src/integer.cpp: instantiate templates explicitly extra/yassl/taocrypt/src/rsa.cpp: instantiate templates explicitly include/my_global.h: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc mysys/my_new.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc server-tools/instance-manager/command.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc sql/ha_blackhole.cc: typo fixed sql/ha_innodb.cc: warning fixed sql/item_func.cc: use LL() sql/mysqld.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
56 lines
2.4 KiB
Makefile
56 lines
2.4 KiB
Makefile
# 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
|
|
|
|
# This file is public domain and comes with NO WARRANTY of any kind
|
|
|
|
#AUTOMAKE_OPTIONS = nostdinc
|
|
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/regex \
|
|
$(openssl_includes) -I$(top_builddir)/include
|
|
LIBS = @CLIENT_LIBS@
|
|
LDADD= @CLIENT_EXTRA_LDFLAGS@ \
|
|
$(top_builddir)/libmysql/libmysqlclient.la
|
|
bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \
|
|
mysqldump mysqlimport mysqltest mysqlbinlog \
|
|
mysqltestmanagerc mysqltestmanager-pwgen
|
|
noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \
|
|
client_priv.h
|
|
mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc
|
|
mysqladmin_SOURCES = mysqladmin.cc
|
|
mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)
|
|
mysqltest_SOURCES= mysqltest.c $(top_srcdir)/mysys/my_getsystime.c
|
|
mysqltest_LDADD = $(top_builddir)/regex/libregex.a $(LDADD)
|
|
mysqlbinlog_SOURCES = mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c $(top_srcdir)/mysys/my_new.cc
|
|
mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS)
|
|
mysqltestmanagerc_SOURCES = mysqlmanagerc.c
|
|
mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c
|
|
sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc
|
|
strings_src=decimal.c
|
|
|
|
# Fix for mit-threads
|
|
DEFS = -DUNDEF_THREADS_HACK
|
|
|
|
link_sources:
|
|
for f in $(sql_src) ; do \
|
|
rm -f $(srcdir)/$$f; \
|
|
@LN_CP_F@ $(top_srcdir)/sql/$$f $(srcdir)/$$f; \
|
|
done; \
|
|
for f in $(strings_src) ; do \
|
|
rm -f $(srcdir)/$$f; \
|
|
@LN_CP_F@ $(top_srcdir)/strings/$$f $(srcdir)/$$f; \
|
|
done;
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|