summaryrefslogtreecommitdiff
path: root/libmysqld/examples
diff options
context:
space:
mode:
authorunknown <kent@mysql.com/kent-amd64.(none)>2007-09-26 18:47:55 +0200
committerunknown <kent@mysql.com/kent-amd64.(none)>2007-09-26 18:47:55 +0200
commitfb5f16f9924047f2e4afaa4f571018c78eaa7e07 (patch)
treea7b4f00420fa09a5e96ab9ccf56fa3831e7ff9fe /libmysqld/examples
parent3e22e3cac80b9d0e2a8cb79161b00b011cb190c5 (diff)
downloadmariadb-git-fb5f16f9924047f2e4afaa4f571018c78eaa7e07.tar.gz
Makefile.am:
Always include all sub directories in "make dist" Removed incorrect comment configure.in: Unconditionally list make files in AC_CONFIG_FILES Removed 'thread_dirs', it is not used Minor cleanup compile-dist: Simplified the configure line needed for "make dist" to get it all zlib.m4, ssl.m4: Unconditionally list make files in AC_CONFIG_FILES Makefile.am: Removed DIST_SUBDIRS not needed Don't copy soft links as files into source package BUILD/compile-dist: Simplified the configure line needed for "make dist" to get it all config/ac-macros/ssl.m4: Unconditionally list make files in AC_CONFIG_FILES config/ac-macros/zlib.m4: Unconditionally list make files in AC_CONFIG_FILES libmysql/Makefile.am: Removed incorrect comment Makefile.am: Always include all sub directories in "make dist" mysql-test/Makefile.am: Removed DIST_SUBDIRS not needed libmysql_r/Makefile.am: Don't copy soft links as files into source package libmysqld/Makefile.am: Don't copy soft links as files into source package libmysqld/examples/Makefile.am: Don't copy soft links as files into source package sql/Makefile.am: Don't copy soft links as files into source package extra/Makefile.am: Always include all sub directories in "make dist" plugin/Makefile.am: Always include all sub directories in "make dist" configure.in: Unconditionally list make files in AC_CONFIG_FILES Removed 'thread_dirs', it is not used Minor cleanup
Diffstat (limited to 'libmysqld/examples')
-rw-r--r--libmysqld/examples/Makefile.am10
1 files changed, 5 insertions, 5 deletions
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index 4a91724afee..3425b48645f 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -15,8 +15,8 @@
noinst_PROGRAMS = mysql
bin_PROGRAMS = mysqltest_embedded mysql_client_test_embedded
-client_sources = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES)
-tests_sources = $(mysql_client_test_embedded_SOURCES)
+client_sources = $(nodist_mysqltest_embedded_SOURCES) $(nodist_mysql_SOURCES)
+tests_sources = $(nodist_mysql_client_test_embedded_SOURCES)
BUILT_SOURCES = link_sources
CLEANFILES = $(client_sources) $(tests_sources) $(BUILT_SOURCES)
EXTRA_DIST = CMakeLists.txt
@@ -41,15 +41,15 @@ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \
@NDB_SCI_LIBS@
mysqltest_embedded_LINK = $(CXXLINK)
-mysqltest_embedded_SOURCES = mysqltest.c
+nodist_mysqltest_embedded_SOURCES = mysqltest.c
mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.a
-mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
+nodist_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)
mysql_client_test_embedded_LINK = $(CXXLINK)
-mysql_client_test_embedded_SOURCES = mysql_client_test.c
+nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c
# Don't update the files from bitkeeper
%::SCCS/s.%