diff options
author | unknown <msvensson@pilot.blaudden> | 2007-04-23 17:01:02 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.blaudden> | 2007-04-23 17:01:02 +0200 |
commit | 0d5a18b53bd30af029b27e39579b52f05b8f7115 (patch) | |
tree | 8cc026fffb64b3233d53f89373b5f930e8ed9a49 /client/Makefile.am | |
parent | 2c4ad7372c0737d49812f1e22a108dc841b4ba74 (diff) | |
parent | e4a8fd700ef4078cdd7ea11cd57e7d2bc9c11253 (diff) | |
download | mariadb-git-0d5a18b53bd30af029b27e39579b52f05b8f7115.tar.gz |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
configure.in:
Auto merged
client/mysqltest.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'client/Makefile.am')
-rw-r--r-- | client/Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index f5b8ee6690b..d482512e411 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -36,6 +36,10 @@ noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \ EXTRA_DIST = get_password.c CMakeLists.txt echo.c +BUILT_SOURCES = link_sources + +CLEANFILES = $(BUILT_SOURCES) + bin_PROGRAMS = mysql \ mysqladmin \ mysqlbinlog \ @@ -112,6 +116,7 @@ link_sources: done; \ rm -f $(srcdir)/my_user.c; \ @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c; + echo timestamp > link_sources; # Don't update the files from bitkeeper %::SCCS/s.% |