diff options
Diffstat (limited to 'include/Makefile.am')
| -rw-r--r-- | include/Makefile.am | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index c856b6398fe..64f73af8606 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -15,39 +15,46 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA -BUILT_SOURCES = $(HEADERS_GEN) abi_check -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 + my_list.h my_alloc.h typelib.h mysql/plugin.h pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ my_xml.h mysql_embed.h \ - my_pthread.h my_no_pthread.h raid.h \ + my_pthread.h my_no_pthread.h \ 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) -noinst_HEADERS = config-win.h config-os2.h config-netware.h \ - heap.h my_bitmap.h\ + m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \ + $(HEADERS_GEN_MAKE) + +noinst_HEADERS = config-win.h config-netware.h my_bit.h \ + heap.h my_bitmap.h my_uctype.h \ myisam.h myisampack.h myisammrg.h ft_global.h\ mysys_err.h my_base.h help_start.h help_end.h \ my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \ - my_aes.h my_tree.h hash.h thr_alarm.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_user.h my_libwrap.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/x86-msvc.h \ + atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h + +EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp # Remove built files and the symlinked directories CLEANFILES = $(BUILT_SOURCES) readline openssl -EXTRA_DIST = mysql_h.ic # 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) -fr readline + -$(RM) -f readline openssl @readline_h_ln_cmd@ @yassl_h_ln_cmd@ + echo timestamp > link_sources # We want both "my_config.h" and "config.h" that are identical, as # MySQL sources assumes the name "my_config.h", and 3rd party sources @@ -60,19 +67,5 @@ my_config.h: config.h dist-hook: $(RM) -f $(distdir)/mysql_version.h $(distdir)/my_config.h -# -# Rules for checking that ABI has not changed -# - -# Create a icheck file and compare it to the reference -abi_check: $(HEADERS_ABI) mysql_version.h mysql_h.ic - @set -ex; \ - if [ @ICHECK@ != no ] ; then \ - @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \ - @ICHECK@ --compare mysql_h.ic $@.ic; \ - $(RM) -f $@.ic; \ - fi; \ - touch abi_check; - # Don't update the files from bitkeeper %::SCCS/s.% |