summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.blaudden>2007-03-27 23:56:48 +0200
committerunknown <msvensson@pilot.blaudden>2007-03-27 23:56:48 +0200
commitd78596d85ffb59315be4f98a160da9798d502f89 (patch)
tree02a7e0d66c1854e1350626ab89132b36162066bd /include
parenta63f7995e6b05b9b77c4d2924d95dadfc881e4bf (diff)
downloadmariadb-git-d78596d85ffb59315be4f98a160da9798d502f89.tar.gz
Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit
- Move the link_sources command from top level Makefile into each subdir that need to link files BitKeeper/etc/ignore: Added libmysqld/link_sources libmysql/link_sources include/link_sources client/link_sources to the ignore list Makefile.am: Move link_sources down into each sub directory that might need it client/Makefile.am: Add "link_sources" to BUILT_SOURCES configure.in: Move link_sources down into each sub directory that might need it include/Makefile.am: Add "link_sources" to BUILT_SOURCES libmysql/Makefile.am: Add "link_sources" to BUILT_SOURCES libmysql/Makefile.shared: Add "link_sources" to BUILT_SOURCES libmysqld/Makefile.am: Add "link_sources" to BUILT_SOURCES libmysqld/examples/Makefile.am: Add "link_sources" to BUILT_SOURCES netware/Makefile.am: Add "link_sources" to BUILT_SOURCES sql/Makefile.am: Add "link_sources" to BUILT_SOURCES
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index d40df7d8343..9be6738b3f4 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -16,7 +16,7 @@
# MA 02111-1307, USA
# FIXME 'abi_check' should be in BUILT_SOURCES, disabled for now
-BUILT_SOURCES = $(HEADERS_GEN)
+BUILT_SOURCES = $(HEADERS_GEN) link_sources
HEADERS_GEN = mysql_version.h my_config.h
HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
my_list.h my_alloc.h typelib.h
@@ -48,9 +48,10 @@ EXTRA_DIST = mysql_h.ic
DISTCLEANFILES = sched.h $(CLEANFILES)
link_sources:
- -$(RM) -fr readline
+ -$(RM) -f readline openssl
@readline_h_ln_cmd@
@yassl_h_ln_cmd@
+ echo timestamp > link_sources
my_config.h: ../config.h
$(CP) ../config.h my_config.h