diff options
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 2 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index feeec6225fd..1f0b15d15b6 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -32,7 +32,7 @@ INCLUDES = @MT_INCLUDES@ @bdb_includes@ -I$(srcdir)/../include -I../include \ ## XXX: should we use client or server LDFLAGS for libmysqld? LDADD = @CLIENT_EXTRA_LDFLAGS@ libmysqld.la pkglib_LTLIBRARIES = libmysqld.la -SUBDIRS = examples +SUBDIRS = . examples libmysqld_la_SOURCES= libmysqld.c lib_sql.cc lib_load.cc libmysqlsources = errmsg.c get_password.c password.c diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index 2a8ac304e9a..9fc4c12835e 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -1,5 +1,6 @@ -bin_PROGRAMS = mysqltest mysql +noinst_PROGRAMS = mysqltest mysql client_sources = $(mysqltest_SOURCES) $(mysql_SOURCES) + link_sources: for f in $(client_sources); do \ rm -f $(srcdir)/$$f; \ @@ -8,7 +9,7 @@ link_sources: DEFS = -DEMBEDDED_SERVER INCLUDES = -I$(top_srcdir)/include $(openssl_includes) \ - -I$(srcdir) -I$(top_srcdir) -I.. + -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/client LIBS = @LIBS@ LDADD = $(top_builddir)/libmysqld/libmysqld.la \ $(top_builddir)/isam/libnisam.a \ @@ -20,7 +21,7 @@ LDADD = $(top_builddir)/libmysqld/libmysqld.la \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a \ $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/regex/libregex.a + $(top_builddir)/regex/libregex.a @LIBDL@ mysqltest_DEPENDENCIES = ../libmysqld.la mysqltest_SOURCES = mysqltest.c @@ -31,3 +32,6 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) clean: rm -f $(client_sources) + +# Don't update the files from bitkeeper +%::SCCS/s.% |