summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Docs/Makefile.am2
-rw-r--r--Docs/manual.texi2
-rw-r--r--Makefile.am6
-rw-r--r--include/Makefile.am11
-rw-r--r--libmysql/Makefile.shared2
-rw-r--r--scripts/Makefile.am4
-rw-r--r--[-rwxr-xr-x]scripts/make_binary_distribution.sh0
-rw-r--r--[-rwxr-xr-x]scripts/mysql_convert_table_format.sh0
-rw-r--r--[-rwxr-xr-x]scripts/mysql_find_rows.sh0
-rw-r--r--[-rwxr-xr-x]scripts/mysql_setpermission.sh0
-rw-r--r--[-rwxr-xr-x]scripts/mysql_zap.sh0
-rw-r--r--[-rwxr-xr-x]scripts/mysqlaccess.conf0
-rw-r--r--[-rwxr-xr-x]scripts/mysqlaccess.sh0
-rw-r--r--[-rwxr-xr-x]scripts/mysqlbug.sh0
-rw-r--r--[-rwxr-xr-x]scripts/mysqlhotcopy.sh0
-rw-r--r--[-rwxr-xr-x]scripts/safe_mysqld-watch.sh0
-rw-r--r--[-rwxr-xr-x]scripts/safe_mysqld.sh0
-rw-r--r--support-files/Makefile.am5
-rw-r--r--[-rwxr-xr-x]support-files/binary-configure.sh0
19 files changed, 21 insertions, 11 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 8f5276b1b22..b9fa5401a37 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -28,6 +28,8 @@ all: $(targets) txt_files
txt_files: ../INSTALL-SOURCE ../COPYING ../COPYING.LIB \
../MIRRORS INSTALL-BINARY
+CLEAN_FILES: manual.ps
+
# The PostScript version is so big that is not included in the
# standard distribution. It is available for download from the home page.
paper: manual_a4.ps manual_letter.ps
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 183c58f23c2..a730f7d15cf 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -5754,8 +5754,6 @@ shell> CC=gcc CFLAGS="-O6" \
If you have the Sun Workshop 4.2 compiler, you can run @code{configure} like
this:
-CC=cc CFLAGS="-xstrconst -Xa -xO4 -native -mt" CXX=CC CXXFLAGS="-xO4 -native -noex -mt" ./configure --prefix=/usr/local/mysql
-
@example
shell> CC=cc CFLAGS="-Xa -fast -xO4 -native -xstrconst -mt" \
CXX=CC CXXFLAGS="-noex -XO4 -mt" \
diff --git a/Makefile.am b/Makefile.am
index a24164f0bca..bdb3502aa3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,11 @@ SUBDIRS = include @docs_dirs@ @readline_dir@ \
CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources
# This is just so that the linking is done early.
-config.h: linked_client_sources linked_server_sources
+config.h: linked_client_sources linked_server_sources linked_include_sources
+
+linked_include_sources:
+ cd include; $(MAKE) link_sources
+ echo timestamp > linked_include_sources
linked_client_sources: @linked_client_targets@
echo timestamp > linked_client_sources
diff --git a/include/Makefile.am b/include/Makefile.am
index 3f6ed988fbb..4e2fdb22574 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -15,13 +15,13 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
-BUILT_SOURCES = my_config.h mysql_version.h m_ctype.h
+BUILT_SOURCES = mysql_version.h m_ctype.h
pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h \
mysqld_error.h my_list.h \
my_pthread.h my_no_pthread.h raid.h errmsg.h \
my_config.h my_global.h my_net.h \
sslopt-case.h sslopt-longopts.h sslopt-usage.h \
- sslopt-vars.h $(BUILT_SOURCES)
+ sslopt-vars.h my_config.h $(BUILT_SOURCES)
noinst_HEADERS = global.h config-win.h \
nisam.h heap.h merge.h \
myisam.h myisampack.h myisammrg.h ft_global.h\
@@ -32,15 +32,16 @@ noinst_HEADERS = global.h config-win.h \
mysql_version.h.in
# mysql_version.h are generated
-SUPERCLEANFILES = mysql_version.h
+SUPERCLEANFILES = mysql_version.h my_global.h
# Some include files that may be moved and patched by configure
DISTCLEANFILES = sched.h
+CLEANFILES = my_config.h
-all-local: my_config.h my_global.h
+all-local: my_global.h
# Since we include my_config.h it better exist from the beginning
-my_config.h: ../config.h
+link_sources:
$(CP) ../config.h my_config.h
# This should be changed in the source and removed.
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared
index b6d0f93cbba..50e7cd95dc3 100644
--- a/libmysql/Makefile.shared
+++ b/libmysql/Makefile.shared
@@ -75,7 +75,7 @@ clean-local:
rm -f `echo $(mystringsobjects) | sed "s;\.lo;.c;g"` \
`echo $(dbugobjects) | sed "s;\.lo;.c;g"` \
`echo $(mysysobjects) | sed "s;\.lo;.c;g"` \
- $(mystringsextra) ctype_extra_sources.c \
+ $(mystringsextra) $(mysysheaders) ctype_extra_sources.c \
../linked_client_sources
ctype_extra_sources.c: conf_to_src
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index d4e62172a08..b3ac40d9959 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -53,12 +53,14 @@ pkgdata_DATA = make_binary_distribution
CLEANFILES = @server_scripts@ \
make_binary_distribution \
msql2mysql \
+ mysql_config \
mysql_fix_privilege_tables \
mysql_setpermission \
mysql_zap \
mysqlaccess \
mysql_convert_table_format \
- mysql_find_rows
+ mysql_find_rows \
+ mysqlhotcopy
SUPERCLEANFILES = mysqlbug
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 3dd4a4a6acd..3dd4a4a6acd 100755..100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
diff --git a/scripts/mysql_convert_table_format.sh b/scripts/mysql_convert_table_format.sh
index 69eede94786..69eede94786 100755..100644
--- a/scripts/mysql_convert_table_format.sh
+++ b/scripts/mysql_convert_table_format.sh
diff --git a/scripts/mysql_find_rows.sh b/scripts/mysql_find_rows.sh
index 3d7bad3323e..3d7bad3323e 100755..100644
--- a/scripts/mysql_find_rows.sh
+++ b/scripts/mysql_find_rows.sh
diff --git a/scripts/mysql_setpermission.sh b/scripts/mysql_setpermission.sh
index 43bf8a14c06..43bf8a14c06 100755..100644
--- a/scripts/mysql_setpermission.sh
+++ b/scripts/mysql_setpermission.sh
diff --git a/scripts/mysql_zap.sh b/scripts/mysql_zap.sh
index b94bbb80ca7..b94bbb80ca7 100755..100644
--- a/scripts/mysql_zap.sh
+++ b/scripts/mysql_zap.sh
diff --git a/scripts/mysqlaccess.conf b/scripts/mysqlaccess.conf
index faf47da5f6c..faf47da5f6c 100755..100644
--- a/scripts/mysqlaccess.conf
+++ b/scripts/mysqlaccess.conf
diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh
index dfc88ecad98..dfc88ecad98 100755..100644
--- a/scripts/mysqlaccess.sh
+++ b/scripts/mysqlaccess.sh
diff --git a/scripts/mysqlbug.sh b/scripts/mysqlbug.sh
index 77744777c1c..77744777c1c 100755..100644
--- a/scripts/mysqlbug.sh
+++ b/scripts/mysqlbug.sh
diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh
index 2084a0b2c02..2084a0b2c02 100755..100644
--- a/scripts/mysqlhotcopy.sh
+++ b/scripts/mysqlhotcopy.sh
diff --git a/scripts/safe_mysqld-watch.sh b/scripts/safe_mysqld-watch.sh
index 30f95fd7a86..30f95fd7a86 100755..100644
--- a/scripts/safe_mysqld-watch.sh
+++ b/scripts/safe_mysqld-watch.sh
diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh
index 5a5f8dddb02..5a5f8dddb02 100755..100644
--- a/scripts/safe_mysqld.sh
+++ b/scripts/safe_mysqld.sh
diff --git a/support-files/Makefile.am b/support-files/Makefile.am
index ef37784c985..923bd7f2f20 100644
--- a/support-files/Makefile.am
+++ b/support-files/Makefile.am
@@ -41,7 +41,10 @@ CLEANFILES = my-small.cnf \
my-huge.cnf \
mysql.spec \
mysql-@VERSION@.spec \
- mysql.server
+ mysql-log-rotate \
+ mysql.server \
+ binary-configure
+
mysql-@VERSION@.spec: mysql.spec
rm -f $@
diff --git a/support-files/binary-configure.sh b/support-files/binary-configure.sh
index c67d2ba2827..c67d2ba2827 100755..100644
--- a/support-files/binary-configure.sh
+++ b/support-files/binary-configure.sh
View Lorry Controller Status