summaryrefslogtreecommitdiff
path: root/zlib
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-11-20 12:47:50 -0200
committerDavi Arnaut <davi.arnaut@oracle.com>2010-11-20 12:47:50 -0200
commitf6deb00a56b2e87287d606aba3bcd71290d876ae (patch)
tree2d19b102b6c66d0bcf7bb480f2140a6ffc9da7bb /zlib
parente1cba38b6cfc4f5bb559ea211f72221e19487940 (diff)
downloadmariadb-git-f6deb00a56b2e87287d606aba3bcd71290d876ae.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.
Diffstat (limited to 'zlib')
-rw-r--r--zlib/Makefile.am35
1 files changed, 0 insertions, 35 deletions
diff --git a/zlib/Makefile.am b/zlib/Makefile.am
deleted file mode 100644
index 277f6445a85..00000000000
--- a/zlib/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2004-2006 MySQL AB
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-# Process this file with automake to create Makefile.in
-
-INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include
-
-LIBS= $(NON_THREADED_LIBS)
-
-pkglib_LTLIBRARIES = libz.la
-noinst_LTLIBRARIES = libzlt.la
-
-libz_la_LDFLAGS = -static
-
-noinst_HEADERS = crc32.h deflate.h inffast.h inffixed.h inflate.h \
- inftrees.h trees.h zconf.h zlib.h zutil.h
-
-libz_la_SOURCES = adler32.c compress.c crc32.c deflate.c gzio.c \
- infback.c inffast.c inflate.c inftrees.c trees.c \
- uncompr.c zutil.c
-libzlt_la_SOURCES = $(libz_la_SOURCES)
-
-EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3 CMakeLists.txt