Commit 0bf5fa03 authored by unknown's avatar unknown
Browse files

Additional "make distcheck" changes specific to 5.0 


configure.in:
  Removed duplicate "tools/Makefile", and unused AVAILABLE_LANGUAGES_ERRORS
Docs/Makefile.am:
  Add generated files to explicitly be removed on "make distclean"
extra/Makefile.am:
  Added empty SUBDIRS, else automake 1.6.3 will not
  put out code for DIST_SUBDIRS handling
extra/yassl/Makefile.am:
  "make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type
extra/yassl/src/Makefile.am:
  "make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type
extra/yassl/taocrypt/src/Makefile.am:
  "make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type
sql/share/Makefile.am:
  Added distclean target for "*/errmsg.sys"
client/Makefile.am:
  Put links into current directory, not \$(srcdir)
parent 233c6b79

Docs/Makefile.am

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ install-data-hook: mysql.info 
uninstall-local:

	@RM@ -f $(DESTDIR)$(infodir)/mysql.info



# Problems with "make distclean", works differently for make files

# generated by different versions of the automake. Some require the

# generated files explicitly in DISTCLEANFILES.

DISTCLEANFILES = $(TXT_FILES)



# This target is not used in builds, just for convinience

CLEAN_FILES:		$(TXT_FILES)

	touch $(TXT_FILES)

client/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ link_sources: 
         done; \

        for f in $(strings_src) ; do \

          rm -f $(srcdir)/$$f; \

          @LN_CP_F@ $(top_srcdir)/strings/$$f $(srcdir)/$$f; \

          @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \

         done;



# Don't update the files from bitkeeper

configure.in

+1 −2
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ AC_DEFINE_UNQUOTED([DOT_FRM_VERSION], [$DOT_FRM_VERSION], 
                   [Version of .frm files])

AC_SUBST(SHARED_LIB_VERSION)

AC_SUBST(AVAILABLE_LANGUAGES)

AC_SUBST(AVAILABLE_LANGUAGES_ERRORS)



AC_SUBST([NDB_VERSION_MAJOR])

AC_SUBST([NDB_VERSION_MINOR])
@@ -2753,7 +2752,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl 
 pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl

 sql-common/Makefile SSL/Makefile dnl

 dbug/Makefile scripts/Makefile dnl

 include/Makefile sql-bench/Makefile tools/Makefile dnl

 include/Makefile sql-bench/Makefile dnl

 server-tools/Makefile server-tools/instance-manager/Makefile dnl

 tests/Makefile Docs/Makefile support-files/Makefile dnl

 support-files/MacOSX/Makefile mysql-test/Makefile dnl

extra/Makefile.am

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ 
                        $(top_builddir)/include/mysqld_ername.h

pkginclude_HEADERS=	$(BUILT_SOURCES)

CLEANFILES =		$(BUILT_SOURCES)

# We never use SUBDIRS here, but needed for automake 1.6.3

# to generate code to handle DIST_SUBDIRS

SUBDIRS=

DIST_SUBDIRS=           yassl



# This will build mysqld_error.h and sql_state.h

extra/yassl/Makefile.am

+1 −1
Original line number Diff line number Diff line 
SUBDIRS = taocrypt src

EXTRA_DIST = yassl.dsp yassl.dsw mySTL/*.hpp
 
EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp)