mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
f61743dea8
- removed "-traditional-cpp" from the darwin6 compile flags, as it broke
compilation with gcc-3.3 on Mac OS X and does not seem to be required
in general.
- make sure to link libmysqld/examples/mysqltest.c with a C++ compiler,
as the embedded server library (libmysqld.a) includes C++ code. This
broke compilation with non-gcc compilers.
configure.in:
- removed "-traditional-cpp" from the darwin6 compile flags, as it broke
compilation with gcc-3.3 and does not seem to be required in general.
libmysqld/examples/Makefile.am:
- make sure to link mysqltest.c with a C++ compiler, as the embedded server
library (libmysqld.a) includes C++ code.
28 lines
818 B
Makefile
28 lines
818 B
Makefile
noinst_PROGRAMS = mysqltest mysql
|
|
client_sources = $(mysqltest_SOURCES) $(mysql_SOURCES)
|
|
|
|
link_sources:
|
|
for f in $(client_sources); do \
|
|
rm -f $(srcdir)/$$f; \
|
|
@LN_CP_F@ $(srcdir)/../../client/$$f $(srcdir)/$$f; \
|
|
done;
|
|
|
|
DEFS = -DEMBEDDED_LIBRARY
|
|
INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \
|
|
-I$(top_srcdir) -I$(top_srcdir)/client $(openssl_includes)
|
|
LIBS = @LIBS@ @WRAPLIBS@
|
|
LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)
|
|
|
|
mysqltest_LINK = $(CXXLINK)
|
|
|
|
mysqltest_SOURCES = mysqltest.c
|
|
|
|
mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
|
|
my_readline.h sql_string.h completion_hash.h
|
|
mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
|
|
|
|
clean:
|
|
rm -f $(client_sources)
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|