Commit bcbd5bc3 authored by Narayanan V's avatar Narayanan V
Browse files

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
parent 4979d6b7

Makefile.am

+8 −5
Original line number Diff line number Diff line
@@ -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

include/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -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/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

CLEANFILES =            $(BUILT_SOURCES) readline openssl