diff options
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 3 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 6ecce474b50..c0784447216 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -78,7 +78,8 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ rpl_injector.cc my_user.c partition_info.cc \ sql_servers.cc -libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) +libmysqld_int_a_SOURCES= $(libmysqld_sources) +nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources) libmysqld_a_SOURCES= sqlstoragesources = $(EXTRA_libmysqld_a_SOURCES) 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.% |