diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-11 09:34:02 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-11 09:34:02 +0200 |
| commit | 0f299acb7c0e693dc3aa2a98cba5453bcc07d0dd (patch) | |
| tree | 4ac6f149a3e9c967fd1f3f99f651f4c5d6d6f7de /libmysql | |
| parent | 06f4523d79f7c8509c58e6bee4b84c6ead40fbb2 (diff) | |
| parent | c2d2ede33c4c67258676f26f7030ee3d79be5ef2 (diff) | |
| download | mariadb-git-0f299acb7c0e693dc3aa2a98cba5453bcc07d0dd.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
configure.in:
Auto merged
include/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
client/Makefile.am:
Merge
netware/Makefile.am:
Merge
sql/Makefile.am:
Merge
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 |