diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-18 06:05:55 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-18 06:05:55 +0300 |
| commit | 8a787b37f731fa645cdf433965abf6e73229cdb5 (patch) | |
| tree | c595e410a0b0ab9d112ec28350d72ac0c62779b3 /libmysqld | |
| parent | 9c34eaafb12fa2f79d7c5cb87c1730e6b45f5f5b (diff) | |
| download | mariadb-git-8a787b37f731fa645cdf433965abf6e73229cdb5.tar.gz | |
Fix to get pstack included in distribution
Fix to get libmysqld examples to be included in distribution
BitKeeper/deleted/.del-test-ssl~ed0a50364f2a51d7:
Delete: vio/test-ssl
BitKeeper/etc/ignore:
Added libmysqld/examples/mysql libmysqld/examples/mysqltest to the ignore list
configure.in:
Fix to get pstack included in distribution
libmysqld/Makefile.am:
Fix to get libmysqld examples to be included in distribution
libmysqld/examples/Makefile.am:
Fix to get libmysqld examples to be included in distribution
sql/sql_parse.cc:
Fixed bug in grant
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.% |