summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2007-05-02 14:01:49 +0200
committerunknown <joerg@trift2.>2007-05-02 14:01:49 +0200
commit589ae7b4e090aa866b492a823f7e773bda03e1ec (patch)
treefd3abbbab82cfb05e271c65b52e647f89815b82e
parentdc9b20a60301040cfc3801703f4799c5e60477a3 (diff)
downloadmariadb-git-589ae7b4e090aa866b492a823f7e773bda03e1ec.tar.gz
Format corrections for various "Makefile.am": Leading tab, no trailing blank.
client/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. libmysqld/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. netware/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. scripts/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. win/Makefile.am: After a backslash (to mark a continuation line) there must not be a trailing blank.
-rw-r--r--client/Makefile.am14
-rw-r--r--libmysqld/Makefile.am6
-rw-r--r--netware/Makefile.am6
-rw-r--r--scripts/Makefile.am2
-rwxr-xr-xwin/Makefile.am2
5 files changed, 15 insertions, 15 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index 5f1569ba2c4..c7663c7da82 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -64,13 +64,13 @@ link_sources:
for f in $(sql_src) ; do \
rm -f $$f; \
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
- done; \
- for f in $(strings_src) ; do \
- rm -f $(srcdir)/$$f; \
- @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
- done; \
- rm -f $(srcdir)/my_user.c; \
- @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
+ done; \
+ for f in $(strings_src) ; do \
+ rm -f $(srcdir)/$$f; \
+ @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
+ done; \
+ rm -f $(srcdir)/my_user.c; \
+ @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
# Don't update the files from bitkeeper
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 330e72e5507..95e3e539eee 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -127,11 +127,11 @@ link_sources:
for f in $(sqlsources); do \
rm -f $$f; \
if test -e $(top_srcdir)/sql/$$f ; \
- then \
+ then \
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
- else \
+ else \
@LN_CP_F@ $(top_builddir)/sql/$$f $$f; \
- fi ; \
+ fi ; \
done; \
for f in $(libmysqlsources); do \
rm -f $$f; \
diff --git a/netware/Makefile.am b/netware/Makefile.am
index c83a5b389ab..3ec9c7794bf 100644
--- a/netware/Makefile.am
+++ b/netware/Makefile.am
@@ -90,20 +90,20 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def install_test_db.ncf \
# Build init_db.sql from the files that contain
# the system tables for this version of MySQL plus any commands
init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \
- $(top_srcdir)/scripts/mysql_system_tables_data.sql
+ $(top_srcdir)/scripts/mysql_system_tables_data.sql
@echo "Building $@";
@echo "CREATE DATABASE mysql;" > $@;
@echo "CREATE DATABASE test;" >> $@;
@echo "use mysql;" >> $@;
@cat $(top_srcdir)/scripts/mysql_system_tables.sql \
- $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@;
+ $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@;
# Build test_db.sql from init_db.sql plus
# some test data
test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql
@echo "Building $@";
@cat init_db.sql \
- $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@;
+ $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@;
endif
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 79f4666f855..97691318cc6 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -124,7 +124,7 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
$(top_builddir)/scripts/comp_sql$(EXEEXT) \
- mysql_fix_privilege_tables \
+ mysql_fix_privilege_tables \
$(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
diff --git a/win/Makefile.am b/win/Makefile.am
index c6632737d7b..89f0d65b528 100755
--- a/win/Makefile.am
+++ b/win/Makefile.am
@@ -14,7 +14,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
## Process this file with automake to create Makefile.in
-EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat configure.js README \
+EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat configure.js README \
mysql_manifest.cmake create_manifest.js
# Don't update the files from bitkeeper