mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

Browse source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
include/Makefile.am:
  Merge, SUPERCLEANFILES and CLEANFILES has dissapeared in 5.0
This commit is contained in:
unknown 2006-10-24 21:05:35 +02:00
commit 80bd3e3856
6 changed files with 1287 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
include/Makefile.am
View file

@ -15,7 +15,7 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h
BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h mysql_h.ic
pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \
mysql.h mysql_com.h mysql_embed.h \
my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
@ -34,7 +34,7 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
my_user.h my_libwrap.h
# mysql_version.h are generated
CLEANFILES = mysql_version.h my_config.h readline openssl
CLEANFILES = mysql_version.h my_config.h readline openssl mysql_h.ic
# Some include files that may be moved and patched by configure
DISTCLEANFILES = sched.h $(CLEANFILES)
@ -52,5 +52,27 @@ 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 for mysql.h
mysql_h.ic: mysql.h
@set -x; \
if [ @ICHECK@ != no ] ; then \
@ICHECK@ --canonify -o $@ mysql.h; \
fi;
# Compare the icheck file to the reference
check_abi: mysql_h.ic
@set -x; \
if [ @ICHECK@ != no ] ; then \
@ICHECK@ --compare mysql_h.ic mysql_h_abi.ic; \
fi; \
touch check_abi;
all: check_abi
# Don't update the files from bitkeeper
%::SCCS/s.%