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
This commit is contained in:
unknown 2001-09-18 06:05:55 +03:00
commit 8a787b37f7
6 changed files with 12 additions and 10 deletions

View file

@ -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

View file

@ -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.%