#At file:///home/narayanan/Work/mysql/W-M/mysql-6.0-bugteam-39571/
2891 V Narayanan 2008-10-27 [merge]
merging mysql-5.1-bugteam -> mysql-6.0-bugteam
modified:
include/Makefile.am
=== modified file 'include/Makefile.am'
--- a/include/Makefile.am 2008-09-12 08:58:52 +0000
+++ b/include/Makefile.am 2008-10-27 08:31:25 +0000
@@ -15,8 +15,9 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
-BUILT_SOURCES = $(HEADERS_GEN) link_sources
-HEADERS_GEN = mysql_version.h my_config.h
+BUILT_SOURCES = $(HEADERS_GEN_MAKE) link_sources
+HEADERS_GEN_CONFIGURE = mysql_version.h
+HEADERS_GEN_MAKE = my_config.h
HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
my_list.h my_alloc.h typelib.h mysql/plugin.h \
mysql/plugin_audit.h mysql/plugin_ftparser.h
@@ -26,7 +27,8 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_d
decimal.h errmsg.h my_global.h my_net.h \
my_getopt.h sslopt-longopts.h my_dir.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
- m_ctype.h my_attribute.h $(HEADERS_GEN)
+ m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \
+ $(HEADERS_GEN_MAKE)
noinst_HEADERS = config-win.h config-netware.h lf.h my_bit.h \
heap.h maria.h myisamchk.h my_bitmap.h my_uctype.h \
myisam.h myisampack.h myisammrg.h ft_global.h\
@@ -34,7 +36,7 @@ noinst_HEADERS = config-win.h config-net
my_nosys.h my_alarm.h queues.h rijndael.h sha1.h sha2.h \
my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
- mysql_version.h.in my_handler.h my_time.h \
+ my_handler.h my_time.h \
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
atomic/rwlock.h atomic/x86-gcc.h atomic/generic-msvc.h \
atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
@@ -47,7 +49,7 @@ CLEANFILES = $(BUILT_SOURCES)
# Some include files that may be moved and patched by configure
-DISTCLEANFILES = sched.h $(CLEANFILES)
+DISTCLEANFILES = sched.h $(CLEANFILES) $(HEADERS_GEN_CONFIGURE)
link_sources:
-$(RM) -f readline openssl
| Thread |
|---|
| • bzr commit into mysql-6.0 branch (v.narayanan:2891) | V Narayanan | 27 Oct |
