Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 (b0701a5c) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/Makefile.am

+14 −10

Original line number	Diff line number	Diff line
		@@ -18,11 +18,11 @@ noinst_SCRIPTS = Support/generate-text-files.pl

		EXTRA_DIST = $(noinst_SCRIPTS) mysql.info INSTALL-BINARY

		all: txt_files

		txt_files: ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
		TXT_FILES= ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
		INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt

		all-local: $(TXT_FILES)

		# make sure that "make install" installs the info page, too
		# automake only seems to take care of this automatically,
		# if we're building the info page from texi directly.
		@@ -30,28 +30,32 @@ install-data-hook: mysql.info
		$(mkinstalldirs) $(DESTDIR)$(infodir)
		$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)

		CLEAN_FILES: $(txt_files)
		touch $(txt_files)
		uninstall-local:
		@RM@ -f $(DESTDIR)$(infodir)/mysql.info

		# This target is not used in builds, just for convinience
		CLEAN_FILES: $(TXT_FILES)
		touch $(TXT_FILES)

		GT = $(srcdir)/Support/generate-text-files.pl

		../INSTALL-SOURCE: mysql.info $(GT)
		perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@
		perl -w $(GT) $< "installing-source" "windows-source-build" > $@

		../INSTALL-WIN-SOURCE: mysql.info $(GT)
		perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@
		perl -w $(GT) $< "windows-source-build" "post-installation" > $@

		# We put the description for the binary installation here so that
		# people who download source wont have to see it. It is moved up to
		# the toplevel by the script that makes the binary tar files.
		INSTALL-BINARY: mysql.info $(GT)
		perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@
		perl -w $(GT) $< "installing-binary" "installing-source" > $@

		../EXCEPTIONS-CLIENT: mysql.info $(GT)
		perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@
		perl -w $(GT) $< "mysql-floss-license-exception" "function-index" > $@

		../support-files/MacOSX/ReadMe.txt: mysql.info $(GT)
		perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@
		perl -w $(GT) $< "mac-os-x-installation" "netware-installation" > $@

		# Don't update the files from bitkeeper
		%::SCCS/s.%

Makefile.am

+15 −16

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@
		AUTOMAKE_OPTIONS = foreign

		# These are built from source in the Docs directory
		EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
		EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
		README COPYING EXCEPTIONS-CLIENT
		SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
		@readline_topdir@ sql-common \
		@thread_dirs@ pstack \
		@@ -34,16 +35,19 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \
		BUILD netware os2 @libmysqld_dirs@ \
		@bench_dirs@ support-files @fs_dirs@ @tools_dirs@

		# Relink after clean
		linked_sources = linked_client_sources linked_server_sources \
		linked_libmysql_sources linked_libmysql_r_sources \
		linked_libmysqld_sources linked_libmysqldex_sources \
		# Run these targets before any others, also make part of clean target,
		# to make sure we create new links after a clean.
		BUILT_SOURCES = linked_client_sources linked_server_sources \
		@linked_client_targets@ \
		@linked_libmysqld_targets@ \
		linked_include_sources @linked_netware_sources@

		CLEANFILES = $(linked_sources)

		# This is just so that the linking is done early.
		all-local: $(linked_sources)
		# The db.h file is a bit special, see note in "configure.in".
		# In the case we didn't compile with bdb, a dummy file is put
		# there, but will not be removed by the bdb make file becuase
		# it will never be called.
		CLEANFILES = $(BUILT_SOURCES) bdb/build_unix/db.h
		DISTCLEANFILES = ac_available_languages_fragment

		linked_include_sources:
		cd include; $(MAKE) link_sources
		@@ -73,13 +77,8 @@ linked_netware_sources:
		cd @netware_dir@; $(MAKE) link_sources
		echo timestamp > linked_netware_sources

		#avoid recursive make calls in sql directory
		linked_server_sources:
		cd sql; rm -f mini_client_errors.c;\
		@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c;\
		rm -f pack.c;@LN_CP_F@ ../sql-common/pack.c pack.c;\
		rm -f client.c;@LN_CP_F@ ../sql-common/client.c client.c;\
		rm -f my_time.c;@LN_CP_F@ ../sql-common/my_time.c my_time.c
		cd sql; $(MAKE) link_sources
		echo timestamp > linked_server_sources

		# Create permission databases
		@@ -91,7 +90,7 @@ bin-dist: all

		# Remove BK's "SCCS" subdirectories from source distribution
		dist-hook:
		rm -rf `find $(distdir) -type d -name SCCS`
		rm -rf `find $(distdir) -type d -name SCCS -print`

		tags:
		support-files/build-tags

client/Makefile.am

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,8 +41,8 @@ DEFS = -DUNDEF_THREADS_HACK

		link_sources:
		for f in $(sql_src) ; do \
		rm -f $(srcdir)/$$f; \
		@LN_CP_F@ $(top_srcdir)/sql/$$f $(srcdir)/$$f; \
		rm -f $$f; \
		@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
		done;

		# Don't update the files from bitkeeper

cmd-line-utils/libedit/Makefile.am

+8 −8

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		# Makefile for the GNU readline library.
		# Copyright (C) 1994,1996,1997 Free Software Foundation, Inc.

		ASRC=vi.c emacs.c common.c
		ASRC = $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c
		AHDR = vi.h emacs.h common.h

		INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
		@@ -42,16 +42,16 @@ SUFFIXES = .sh
		$< > $@-t
		@MV@ $@-t $@

		vi.h: vi.c makelist
		sh ./makelist -h ./vi.c > $@.tmp && \
		vi.h: $(srcdir)/vi.c makelist
		sh ./makelist -h $(srcdir)/vi.c > $@.tmp && \
		mv $@.tmp $@

		emacs.h: emacs.c makelist
		sh ./makelist -h ./emacs.c > $@.tmp && \
		emacs.h: $(srcdir)/emacs.c makelist
		sh ./makelist -h $(srcdir)/emacs.c > $@.tmp && \
		mv $@.tmp $@

		common.h: common.c makelist
		sh ./makelist -h ./common.c > $@.tmp && \
		common.h: $(srcdir)/common.c makelist
		sh ./makelist -h $(srcdir)/common.c > $@.tmp && \
		mv $@.tmp $@

		help.c: ${ASRC} makelist

configure.in

+8 −3

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ romanian russian serbian slovak spanish swedish ukrainian"

		# Generate make rules for all error messages
		AVAILABLE_LANGUAGES_ERRORS=
		AVAILABLE_LANGUAGES_ERRORS_RULES=$srcdir/ac_available_languages_fragment
		AVAILABLE_LANGUAGES_ERRORS_RULES=ac_available_languages_fragment
		rm -f $AVAILABLE_LANGUAGES_ERRORS_RULES
		for i in $AVAILABLE_LANGUAGES
		do
		@@ -2300,6 +2300,7 @@ then
		echo "Warning: extra-tools disabled because --enable-thread-safe-client wasn't used"
		else
		tools_dirs="tools"
		AC_CONFIG_FILES(tools/Makefile)
		fi
		fi
		AC_SUBST(tools_dirs)
		@@ -2310,9 +2311,12 @@ MYSQL_CHECK_VIO
		MYSQL_CHECK_OPENSSL

		libmysqld_dirs=
		linked_libmysqld_targets=
		if test "$with_embedded_server" = "yes"
		then
		libmysqld_dirs=libmysqld
		linked_libmysqld_targets="linked_libmysqld_sources linked_libmysqldex_sources"
		AC_CONFIG_FILES(libmysqld/Makefile libmysqld/examples/Makefile)
		# We can't build embedded library without building the server, because
		# we depend on libmysys, libmystrings, libmyisam, etc.
		with_server=yes
		@@ -2321,6 +2325,7 @@ fi
		# mysql_config --libmysqld-libs will print out something like
		# -L/path/to/lib/mysql -lmysqld -lmyisam -lmysys -lmystrings -ldbug ...
		AC_SUBST([libmysqld_dirs])
		AC_SUBST([linked_libmysqld_targets])

		# Shall we build the docs?
		AC_ARG_WITH(docs,
		@@ -2915,6 +2920,7 @@ if test "$THREAD_SAFE_CLIENT" != "no"
		then
		sql_client_dirs="libmysql_r $sql_client_dirs"
		linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
		AC_CONFIG_FILES(libmysql_r/Makefile)
		AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])
		fi

		@@ -3269,12 +3275,11 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
		myisam/Makefile myisammrg/Makefile dnl
		os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl
		man/Makefile BUILD/Makefile vio/Makefile dnl
		libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile dnl
		libmysql/Makefile client/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
		tests/Makefile Docs/Makefile support-files/Makefile dnl
		support-files/MacOSX/Makefile mysql-test/Makefile dnl
		netware/Makefile dnl