diff options
| author | Narayanan V <v.narayanan@sun.com> | 2008-07-18 19:21:54 +0530 |
|---|---|---|
| committer | Narayanan V <v.narayanan@sun.com> | 2008-07-18 19:21:54 +0530 |
| commit | bcbd5bc373355719b4ac47cc566c5afd64dd07c4 (patch) | |
| tree | 3b2534f1cf7d738c347e0c30935cab8593dfd18d /Makefile.am | |
| parent | 4979d6b7533ca5908a197f8886d0d8da13f2b2c3 (diff) | |
| download | mariadb-git-bcbd5bc373355719b4ac47cc566c5afd64dd07c4.tar.gz | |
WL#4380
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
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 6ea03a6d55e..35d9212d669 100644 --- a/Makefile.am +++ b/Makefile.am @@ -273,10 +273,10 @@ TEST_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql/plugin.h \ # be replaced as the new .pp files. # # 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 -# 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. # @@ -293,11 +293,14 @@ do_abi_check: -I$(top_srcdir)/include \ -I$(top_srcdir)/include/mysql \ -I$(top_srcdir)/sql \ + -I$(top_builddir)/include \ + -I$(top_builddir)/include/mysql \ + -I$(top_builddir)/sql \ $$file 2>/dev/null | \ @SED@ -e '/^# /d' \ - -e '/^[ ]*$$/d' > $$file.out; \ - @DIFF@ $$file.pp $$file.out; \ - @RM@ $$file.out; \ + -e '/^[ ]*$$/d' > $(top_builddir)/abi_check.out; \ + @DIFF@ $$file.pp $(top_builddir)/abi_check.out; \ + @RM@ $(top_builddir)/abi_check.out; \ done # Don't update the files from bitkeeper |