diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-27 23:56:48 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-27 23:56:48 +0200 |
| commit | c2d2ede33c4c67258676f26f7030ee3d79be5ef2 (patch) | |
| tree | 02a7e0d66c1854e1350626ab89132b36162066bd /libmysql | |
| parent | 094db7029ea92e7dc6c0731e5e6f19285f415536 (diff) | |
| download | mariadb-git-c2d2ede33c4c67258676f26f7030ee3d79be5ef2.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 'libmysql')
| -rw-r--r-- | libmysql/Makefile.am | 1 | ||||
| -rw-r--r-- | libmysql/Makefile.shared | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 38680c98d53..ebfe15774ff 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -70,6 +70,7 @@ link_sources: @LN_CP_F@ $(top_srcdir)/sql/net_serv.cc net.c ; \ rm -f password.c; \ @LN_CP_F@ $(top_srcdir)/sql/password.c password.c + echo timestamp > link_sources # This part requires GNUmake # diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index dc6d658fcdf..c24c6ab52db 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -79,8 +79,11 @@ target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) \ $(sql_cmn_objects) $(vio_objects) $(sqlobjects) target_ldflags = -version-info @SHARED_LIB_VERSION@ @LD_VERSION_SCRIPT@ vio_objects= vio.lo viosocket.lo viossl.lo viosslfactories.lo + +BUILT_SOURCES = link_sources + CLEANFILES = $(target_libadd) $(SHLIBOBJS) \ - $(target) + $(target) $(BUILT_SOURCES) DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DDEFAULT_HOME_ENV=MYSQL_HOME \ @@ -103,8 +106,7 @@ clean-local: `echo $(vio_objects) | sed "s;\.lo;.c;g"` \ `echo $(sql_cmn_objects) | sed "s;\.lo;.c;g"` \ $(CHARSET_SRCS) $(CHARSET_OBJS) \ - $(mystringsextra) $(mysysheaders) $(vioheaders)\ - ../linked_libmysql_sources ../linked_libmysql_r_sources \ + $(mystringsextra) $(mysysheaders) $(vioheaders) \ net.c conf_to_src_SOURCES = conf_to_src.c |