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

WL#4380

Browse source 
1) Modified abi_check rule to not write into the
   distribution directory.
2) Added the .pp files to EXTRA_DIST so that it will
   be included in the distribution

Makefile.am:
  Modified the abi_check rule to not generate the
  .out files in the distribution directory.
include/Makefile.am:
  Added the EXTRA_DIST entry for plugin.h.pp and
  mysql.h.pp so that they will be included while
  creating the distribution.
This commit is contained in:
Narayanan V 2008-07-18 19:21:54 +05:30
commit d7f06f6ebf
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Makefile.am
View file

@ -273,10 +273,10 @@ TEST_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql/plugin.h \
# be replaced as the new .pp files. # be replaced as the new .pp files.
# #
# e.g. If include/mysql/plugin.h has an ABI change then this rule would # e.g. If include/mysql/plugin.h has an ABI change then this rule would
# leave a include/mysql/plugin.out file. # leave a <build directory>/abi_check.out file.
# #
# A developer with a justified API change will then do a # A developer with a justified API change will then do a
# mv include/mysql/plugin.out include/mysql/plugin.pp # mv <build directory>/abi_check.out include/mysql/plugin.pp
# to replace the old canons with the new ones. # to replace the old canons with the new ones.
# #
@ -293,11 +293,14 @@ do_abi_check:
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/include/mysql \ -I$(top_srcdir)/include/mysql \
-I$(top_srcdir)/sql \ -I$(top_srcdir)/sql \
-I$(top_builddir)/include \
-I$(top_builddir)/include/mysql \
-I$(top_builddir)/sql \
$$file 2>/dev/null | \ $$file 2>/dev/null | \
@SED@ -e '/^# /d' \ @SED@ -e '/^# /d' \
-e '/^[ ]*$$/d' > $$file.out; \ -e '/^[ ]*$$/d' > $(top_builddir)/abi_check.out; \
@DIFF@ $$file.pp $$file.out; \ @DIFF@ $$file.pp $(top_builddir)/abi_check.out; \
@RM@ $$file.out; \ @RM@ $(top_builddir)/abi_check.out; \
done done
# Don't update the files from bitkeeper # Don't update the files from bitkeeper

2
include/Makefile.am
View file

@ -38,6 +38,8 @@ noinst_HEADERS = config-win.h config-netware.h my_bit.h \
atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \ atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \
atomic/gcc_builtins.h my_libwrap.h my_stacktrace.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 # Remove built files and the symlinked directories
CLEANFILES = $(BUILT_SOURCES) readline openssl CLEANFILES = $(BUILT_SOURCES) readline openssl