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 /libmysqld | |
| 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 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 15 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 5 |
2 files changed, 11 insertions, 9 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 83796fad6d3..48981e4beee 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -177,11 +177,11 @@ endif #libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ #CLEANFILES = $(libmysqld_la_LIBADD) libmysqld.la -# This is called from the toplevel makefile. If we can link now -# to an existing file in source, we do that, else we assume it -# will show up in the build tree eventually (generated file). +BUILT_SOURCES = link_sources + +CLEANFILES = $(BUILT_SOURCES) + link_sources: - set -x; \ for f in $(sqlsources); do \ rm -f $$f; \ if test -e $(top_srcdir)/sql/$$f ; \ @@ -215,12 +215,13 @@ link_sources: done; \ fi; \ rm -f client_settings.h; \ - @LN_CP_F@ $(top_srcdir)/libmysql/client_settings.h client_settings.h + @LN_CP_F@ $(top_srcdir)/libmysql/client_settings.h \ + client_settings.h; \ + echo timestamp > link_sources clean-local: - rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlstoragesources) $(storagesources) | sed "s;\.lo;.c;g"` \ - $(top_srcdir)/linked_libmysqld_sources; \ + rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlstoragesources) $(storagesources) | sed "s;\.lo;.c;g"`; \ rm -f client_settings.h # Don't update the files from bitkeeper diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index f8c60ab3694..3e4769c564d 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -17,10 +17,10 @@ noinst_PROGRAMS = mysql bin_PROGRAMS = mysqltest_embedded mysql_client_test_embedded client_sources = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES) tests_sources = $(mysql_client_test_embedded_SOURCES) -CLEANFILES = $(client_sources) $(tests_sources) +BUILT_SOURCES = link_sources +CLEANFILES = $(client_sources) $(tests_sources) $(BUILT_SOURCES) link_sources: - set -x; \ for f in $(client_sources); do \ rm -f $$f; \ @LN_CP_F@ $(top_srcdir)/client/$$f $$f; \ @@ -29,6 +29,7 @@ link_sources: rm -f $$f; \ @LN_CP_F@ $(top_srcdir)/tests/$$f $$f; \ done + echo timestamp > link_sources DEFS = -DEMBEDDED_LIBRARY INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \ |