diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | libmysql/Makefile.shared | 9 | ||||
| -rw-r--r-- | tools/Makefile.am | 8 |
4 files changed, 10 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index b7ffd503460..61ea903ddb2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,8 +29,7 @@ SUBDIRS = include @docs_dirs@ @readline_dir@ \ # Relink after clean linked_sources = linked_client_sources linked_server_sources \ linked_libmysql_sources linked_libmysql_r_sources \ - linked_libmysqld_sources linked_include_sources \ - linked_tools_sources + linked_libmysqld_sources linked_include_sources CLEANFILES = $(linked_sources) @@ -45,11 +44,6 @@ linked_client_sources: @linked_client_targets@ cd client; $(MAKE) link_sources echo timestamp > linked_client_sources -linked_tools_sources: - cd tools; $(MAKE) link_sources - echo timestamp > linked_tools_sources - - linked_libmysql_sources: cd libmysql; $(MAKE) link_sources echo timestamp > linked_libmysql_sources diff --git a/configure.in b/configure.in index d8360ef65d5..852fd2fd9a6 100644 --- a/configure.in +++ b/configure.in @@ -1694,7 +1694,7 @@ then else tools_dirs="" fi -AC_SUBST([tools_dirs]) +AC_SUBST(tools_dirs) MYSQL_CHECK_CPU MYSQL_CHECK_MYSQLFS diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index ba97c7cf04d..afc6d561ce3 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -56,7 +56,14 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ thr_mutex.lo mulalloc.lo string.lo default.lo \ my_compress.lo array.lo my_once.lo list.lo my_net.lo \ charset.lo hash.lo mf_iocache.lo my_seek.lo \ - my_pread.lo mf_cache.lo + my_pread.lo mf_cache.lo my_vsnprintf.lo + +link_sources: + for f in $(mysys_src); do \ + rm -f $$f; \ + @LN_CP_F@ ../mysys/$$f $$f; \ + done; + # Not needed in the minimum library mysysobjects2 = getopt.lo getopt1.lo getvar.lo my_lib.lo mysysobjects = $(mysysobjects1) $(mysysobjects2) diff --git a/tools/Makefile.am b/tools/Makefile.am index 0b84298a829..21455447ce1 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -8,14 +8,6 @@ mysqlmngd_SOURCES = mysqlmngd.c my_vsnprintf.c mysqltest_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) DEFS = -DUNDEF_THREADS_HACK -mysys_src=my_vsnprintf.c mysys_priv.h - -link_sources: - for f in $(mysys_src); do \ - rm -f $$f; \ - @LN_CP_F@ ../mysys/$$f $$f; \ - done; - # Don't update the files from bitkeeper %::SCCS/s.% |