Format corrections for various "Makefile.am": Leading tab, no trailing blank.
This commit is contained in:
parent
90468a7274
commit
bb2996f487
@ -64,13 +64,13 @@ link_sources:
|
|||||||
for f in $(sql_src) ; do \
|
for f in $(sql_src) ; do \
|
||||||
rm -f $$f; \
|
rm -f $$f; \
|
||||||
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
|
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
|
||||||
done; \
|
done; \
|
||||||
for f in $(strings_src) ; do \
|
for f in $(strings_src) ; do \
|
||||||
rm -f $(srcdir)/$$f; \
|
rm -f $(srcdir)/$$f; \
|
||||||
@LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
|
@LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
|
||||||
done; \
|
done; \
|
||||||
rm -f $(srcdir)/my_user.c; \
|
rm -f $(srcdir)/my_user.c; \
|
||||||
@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
|
@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
|
||||||
|
|
||||||
|
|
||||||
# Don't update the files from bitkeeper
|
# Don't update the files from bitkeeper
|
||||||
|
@ -127,11 +127,11 @@ link_sources:
|
|||||||
for f in $(sqlsources); do \
|
for f in $(sqlsources); do \
|
||||||
rm -f $$f; \
|
rm -f $$f; \
|
||||||
if test -e $(top_srcdir)/sql/$$f ; \
|
if test -e $(top_srcdir)/sql/$$f ; \
|
||||||
then \
|
then \
|
||||||
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
|
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
|
||||||
else \
|
else \
|
||||||
@LN_CP_F@ $(top_builddir)/sql/$$f $$f; \
|
@LN_CP_F@ $(top_builddir)/sql/$$f $$f; \
|
||||||
fi ; \
|
fi ; \
|
||||||
done; \
|
done; \
|
||||||
for f in $(libmysqlsources); do \
|
for f in $(libmysqlsources); do \
|
||||||
rm -f $$f; \
|
rm -f $$f; \
|
||||||
|
@ -90,20 +90,20 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def install_test_db.ncf \
|
|||||||
# Build init_db.sql from the files that contain
|
# Build init_db.sql from the files that contain
|
||||||
# the system tables for this version of MySQL plus any commands
|
# the system tables for this version of MySQL plus any commands
|
||||||
init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \
|
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 "Building $@";
|
||||||
@echo "CREATE DATABASE mysql;" > $@;
|
@echo "CREATE DATABASE mysql;" > $@;
|
||||||
@echo "CREATE DATABASE test;" >> $@;
|
@echo "CREATE DATABASE test;" >> $@;
|
||||||
@echo "use mysql;" >> $@;
|
@echo "use mysql;" >> $@;
|
||||||
@cat $(top_srcdir)/scripts/mysql_system_tables.sql \
|
@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
|
# Build test_db.sql from init_db.sql plus
|
||||||
# some test data
|
# some test data
|
||||||
test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql
|
test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql
|
||||||
@echo "Building $@";
|
@echo "Building $@";
|
||||||
@cat init_db.sql \
|
@cat init_db.sql \
|
||||||
$(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@;
|
$(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@;
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -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
|
mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
|
||||||
$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
|
$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
|
||||||
$(top_builddir)/scripts/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 $@
|
$(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
|
||||||
|
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
## Process this file with automake to create Makefile.in
|
## 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
|
mysql_manifest.cmake create_manifest.js
|
||||||
|
|
||||||
# Don't update the files from bitkeeper
|
# Don't update the files from bitkeeper
|
||||||
|
Loading…
x
Reference in New Issue
Block a user