diff options
author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-20 12:47:50 -0200 |
---|---|---|
committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-20 12:47:50 -0200 |
commit | 8664de2230300967537d75a9ec51d15c400ca36d (patch) | |
tree | 2d19b102b6c66d0bcf7bb480f2140a6ffc9da7bb /include/Makefile.am | |
parent | 766db2b52fe28514d47b159b9ec05445bdf36ab9 (diff) | |
download | mariadb-git-8664de2230300967537d75a9ec51d15c400ca36d.tar.gz |
WL#5665: Removal of the autotools-based build system
The autotools-based build system has been superseded and
is being removed in order to ease the maintenance burden on
developers tweaking and maintaining the build system.
In order to support tools that need to extract the server
version, a new file that (only) contains the server version,
called VERSION, is introduced. The file contents are human
and machine-readable. The format is:
MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5
MYSQL_VERSION_PATCH=8
MYSQL_VERSION_EXTRA=-rc
The CMake based version extraction in cmake/mysql_version.cmake
is changed to extract the version from this file. The configure
to CMake wrapper is retained for backwards compatibility and to
support the BUILD/ scripts. Also, a new a makefile target
show-dist-name that prints the server version is introduced.
VERSION:
Add top-level version file.
cmake/mysql_version.cmake:
Get version information from the top-level VERSION file.
Do not cache the version components (MAJOR_VERSION, etc).
Add MYSQL_RPM_VERSION as a replacement for MYSQL_U_SCORE_VERSION.
Diffstat (limited to 'include/Makefile.am')
-rw-r--r-- | include/Makefile.am | 107 |
1 files changed, 0 insertions, 107 deletions
diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index 415e2ef8c8c..00000000000 --- a/include/Makefile.am +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; version 2 -# of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -# MA 02111-1307, USA - -pkgpsiincludedir = $(pkgincludedir)/psi - -BUILT_SOURCES = $(HEADERS_GEN_MAKE) link_sources probes_mysql_nodtrace.h -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 -pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ - my_xml.h mysql_embed.h mysql/plugin_auth.h \ - mysql/client_plugin.h mysql/plugin_auth_common.h \ - mysql/services.h \ - mysql/service_my_snprintf.h mysql/service_thd_alloc.h \ - mysql/service_thread_scheduler.h \ - mysql/service_thd_wait.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 my_compiler.h \ - $(HEADERS_GEN_CONFIGURE) $(HEADERS_GEN_MAKE) \ - probes_mysql.h probes_mysql_nodtrace.h - -noinst_HEADERS = lf.h my_bit.h \ - heap.h my_bitmap.h my_uctype.h password.h \ - myisam.h myisampack.h myisammrg.h ft_global.h\ - mysys_err.h my_base.h \ - my_nosys.h my_alarm.h queues.h rijndael.h sha1.h sha2.h \ - my_aes.h my_tree.h hash.h thr_alarm.h \ - thr_lock.h t_ctype.h violite.h my_md5.h base64.h \ - my_handler.h my_time.h service_versions.h \ - my_rdtsc.h mysql/psi/psi_abi_v1.h mysql/psi/psi_abi_v2.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 \ - atomic/solaris.h mysql/innodb_priv.h - -pkgpsiinclude_HEADERS = mysql/psi/psi.h mysql/psi/mysql_thread.h \ - mysql/psi/mysql_file.h - -EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp probes_mysql.d.base \ - CMakeLists.txt \ - mysql/psi/psi_abi_v1.h.pp \ - mysql/psi/psi_abi_v2.h.pp \ - mysql/plugin_auth.h.pp mysql/client_plugin.h.pp - -# Remove built files and the symlinked directories -CLEANFILES = $(BUILT_SOURCES) readline openssl probes_mysql.d probes_mysql_nodtrace.h - - -# Some include files that may be moved and patched by configure -DISTCLEANFILES = sched.h $(CLEANFILES) $(HEADERS_GEN_CONFIGURE) - -link_sources: - -$(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 -# assumes the name "config.h". -my_config.h: config.h - $(CP) config.h my_config.h - -# These files should not be included in distributions since they are -# generated by configure from the .h.in files -dist-hook: - $(RM) -f $(distdir)/mysql_version.h $(distdir)/my_config.h - -probes_mysql.d: - if ! test -f probes_mysql.d ; then \ - $(CP) -f $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d; \ - fi - -DTRACEPROVIDER = probes_mysql.d -if HAVE_DTRACE -BUILT_SOURCES += probes_mysql_dtrace.h -CLEANFILES += $(DTRACEPROVIDER) - -# Fake for creating the probes file. If we are building a separate directory -# then we copy the probes from the source location and use that -# If we are building in the same directory as the source, we do not copy - -probes_mysql_dtrace.h: $(DTRACEPROVIDER) - $(DTRACE) $(DTRACEFLAGS) -h -s $(DTRACEPROVIDER) -o $@ -endif - -probes_mysql_nodtrace.h: $(DTRACEPROVIDER) - @PERL@ $(top_srcdir)/scripts/dheadgen.pl -f $(DTRACEPROVIDER) > $@ |