Another incarnation of the patch for Bug#30708

(make relies GNU extentions). The patch was partially
backport from 6.0.

Original comment:
bug#30708: make relies GNU extensions.  Now that we no longer use
BitKeeper we can safely remove the SCCS handling with no loss of
functionality.

92 files changed, 1 insertions, 288 deletions

diff --git a/BUILD/Makefile.am b/BUILD/Makefile.am
index 312340e7132..496fb302b16 100644
--- a/BUILD/Makefile.am
+++ b/BUILD/Makefile.am
@@ -78,6 +78,3 @@ EXTRA_DIST =		FINISH.sh \
 			compile-solaris-sparc-debug \
 			compile-solaris-sparc-forte \
 			compile-solaris-sparc-purify
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 24f921a4877..48030153a4e 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -37,6 +37,3 @@ uninstall-local:
 	  @RM@ -f $(DESTDIR)$(infodir)/mysql.info ; \
 	  @RM@ -f $(DESTDIR)$(pkgdatadir)/ChangeLog ; \
 	fi
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/Makefile.am b/Makefile.am
index 8f472ab0b63..fd7b3ddecc0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -328,6 +328,3 @@ do_abi_check:
 	                  @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \
 	                  @RM@ $(top_builddir)/abi_check.out; \
 	done
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/client/Makefile.am b/client/Makefile.am
index 5da59296cdf..04f0ac39b0e 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -124,6 +124,3 @@ link_sources:
 	rm -f $(srcdir)/my_user.c; \
 	@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
 	echo timestamp > link_sources;
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/cmd-line-utils/Makefile.am b/cmd-line-utils/Makefile.am
index 1a84ce7af38..622aa72fd43 100644
--- a/cmd-line-utils/Makefile.am
+++ b/cmd-line-utils/Makefile.am
@@ -19,6 +19,3 @@
 
 SUBDIRS= @readline_basedir@
 DIST_SUBDIRS= libedit readline
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/cmd-line-utils/readline/Makefile.am b/cmd-line-utils/readline/Makefile.am
index d58ce0f1de1..40e74ccaf55 100644
--- a/cmd-line-utils/readline/Makefile.am
+++ b/cmd-line-utils/readline/Makefile.am
@@ -32,6 +32,3 @@ noinst_HEADERS =	readline.h chardefs.h keymaps.h \
 EXTRA_DIST=		emacs_keymap.c vi_keymap.c CMakeLists.txt
 
 DEFS =			-DMYSQL_CLIENT_NO_THREADS -DHAVE_CONFIG_H -DNO_KILL_INTR
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/extra/Makefile.am b/extra/Makefile.am
index 1552a5836ed..ff62749ac4c 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -55,6 +55,3 @@ EXTRA_DIST =		CMakeLists.txt
 
 perror.o: perror.c 
 	$(COMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/extra/yassl/Makefile.am b/extra/yassl/Makefile.am
index ddd57d60a99..43cae0514f9 100644
--- a/extra/yassl/Makefile.am
+++ b/extra/yassl/Makefile.am
@@ -1,5 +1,2 @@
 SUBDIRS = taocrypt src testsuite
 EXTRA_DIST = CMakeLists.txt
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/extra/yassl/src/Makefile.am b/extra/yassl/src/Makefile.am
index bc57e7d05ba..6efd2220c54 100644
--- a/extra/yassl/src/Makefile.am
+++ b/extra/yassl/src/Makefile.am
@@ -6,7 +6,3 @@ libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \
 	template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp
 EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h)
 AM_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
diff --git a/extra/yassl/taocrypt/Makefile.am b/extra/yassl/taocrypt/Makefile.am
index 11fea2064f0..deab5227f7f 100644
--- a/extra/yassl/taocrypt/Makefile.am
+++ b/extra/yassl/taocrypt/Makefile.am
@@ -1,5 +1,2 @@
 SUBDIRS = src test benchmark
 EXTRA_DIST = CMakeLists.txt $(wildcard mySTL/*.hpp)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/extra/yassl/taocrypt/benchmark/Makefile.am b/extra/yassl/taocrypt/benchmark/Makefile.am
index 2fe1c90c90d..f3f71379ff7 100644
--- a/extra/yassl/taocrypt/benchmark/Makefile.am
+++ b/extra/yassl/taocrypt/benchmark/Makefile.am
@@ -4,6 +4,3 @@ benchmark_SOURCES  = benchmark.cpp
 benchmark_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
 benchmark_CXXFLAGS = -DYASSL_PURE_C
 EXTRA_DIST = benchmark.dsp rsa1024.der dh1024.der dsa1024.der make.bat
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/extra/yassl/taocrypt/src/Makefile.am b/extra/yassl/taocrypt/src/Makefile.am
index 61032d4c381..c763d670928 100644
--- a/extra/yassl/taocrypt/src/Makefile.am
+++ b/extra/yassl/taocrypt/src/Makefile.am
@@ -11,7 +11,3 @@ libtaocrypt_la_SOURCES  = aes.cpp aestables.cpp algebra.cpp arc4.cpp \
 libtaocrypt_la_CXXFLAGS = @yassl_taocrypt_extra_cxxflags@ -DYASSL_PURE_C
 
 EXTRA_DIST = $(wildcard ../include/*.hpp)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
diff --git a/extra/yassl/taocrypt/test/Makefile.am b/extra/yassl/taocrypt/test/Makefile.am
index 73e7f729bdb..06b48cc42d5 100644
--- a/extra/yassl/taocrypt/test/Makefile.am
+++ b/extra/yassl/taocrypt/test/Makefile.am
@@ -4,6 +4,3 @@ test_SOURCES = test.cpp
 test_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
 test_CXXFLAGS = -DYASSL_PURE_C
 EXTRA_DIST = make.bat
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/extra/yassl/testsuite/Makefile.am b/extra/yassl/testsuite/Makefile.am
index cae34e7bbc0..9c9ba9b375c 100644
--- a/extra/yassl/testsuite/Makefile.am
+++ b/extra/yassl/testsuite/Makefile.am
@@ -8,7 +8,3 @@ testsuite_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX -DNO_MAIN_DRIVER
 testsuite_LDADD    = $(top_builddir)/extra/yassl/src/libyassl.la \
                      $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
 EXTRA_DIST = testsuite.dsp test.hpp input quit make.bat
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
diff --git a/include/Makefile.am b/include/Makefile.am
index da50ecf2178..e610a8e325c 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -96,6 +96,3 @@ endif
 
 probes_mysql_nodtrace.h: $(DTRACEPROVIDER)
 	@PERL@ $(top_srcdir)/scripts/dheadgen.pl -f $(DTRACEPROVIDER) > $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am
index c8dd0d3061c..b1d23a175d4 100644
--- a/libmysql/Makefile.am
+++ b/libmysql/Makefile.am
@@ -113,6 +113,3 @@ do-lib-dist:
 	echo '	$$(AR) r $$@ $$?'  >>$$dir/Makefile; \
 	gtar cvzf $$dir.tar.gz $$dir; \
 	cd $$dir; gmake
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared
index dbe801ecd17..71649b83991 100644
--- a/libmysql/Makefile.shared
+++ b/libmysql/Makefile.shared
@@ -116,6 +116,3 @@ conf_to_src_LDADD=
 #force static linking of conf_to_src - essential when linking against
 #custom installation of libc
 conf_to_src_LDFLAGS=@NOINST_LDFLAGS@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am
index 94b66f29419..dab45d93673 100644
--- a/libmysql_r/Makefile.am
+++ b/libmysql_r/Makefile.am
@@ -44,6 +44,3 @@ link_sources:
 	  done; \
 	done
 	echo timestamp > link_sources
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 68c31fbf79c..5ff23be42ba 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -234,6 +234,3 @@ link_sources:
 clean-local:
 	rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlstoragesources) $(storagesources) | sed "s;\.lo;.c;g"`; \
 	rm -f client_settings.h
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index abae608550e..e7b053d9766 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -50,6 +50,3 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
 
 mysql_client_test_embedded_LINK = $(CXXLINK)
 nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/man/Makefile.am b/man/Makefile.am
index 8ccada67828..027edccc249 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -24,6 +24,3 @@ EXTRA_DIST =  $(man1_MANS) $(man8_MANS) CMakeLists.txt
 # "make_win_*" are not needed in Unix binary packages,
 install-data-hook:
 	rm -f $(DESTDIR)$(mandir)/man1/make_win_*
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 59db0d9f537..030a4823b36 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -148,6 +148,3 @@ mtr:
 mysql-test-run:
 	$(RM) -f mysql-test-run
 	$(LN_S) mysql-test-run.pl mysql-test-run
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/mysql-test/lib/My/SafeProcess/Makefile.am b/mysql-test/lib/My/SafeProcess/Makefile.am
index 722331453fe..33cab066611 100644
--- a/mysql-test/lib/My/SafeProcess/Makefile.am
+++ b/mysql-test/lib/My/SafeProcess/Makefile.am
@@ -23,7 +23,3 @@ my_safe_process_SOURCES = safe_process.cc
 EXTRA_DIST = 	safe_kill_win.cc \
 		safe_process_win.cc \
 		CMakeLists.txt
-
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index 476b63d3ad5..ad7f244e0fb 100644
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -159,6 +159,3 @@ probes_mysql.d:
 probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
 	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
 endif
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/netware/Makefile.am b/netware/Makefile.am
index 3d0402ce714..f537022495b 100644
--- a/netware/Makefile.am
+++ b/netware/Makefile.am
@@ -115,6 +115,3 @@ 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  > $@;
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index 30ccd1236dd..4a84ce4915a 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -28,6 +28,3 @@ DIST_SUBDIRS =	@mysql_pg_distdirs@
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkglibdir)/plugin
 	test ! -d debug || $(TAR) cf - debug | ( cd $(DESTDIR)$(pkglibdir)/plugin && $(TAR) xvf - )
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/plugin/daemon_example/Makefile.am b/plugin/daemon_example/Makefile.am
index d1f2555594c..75151bdd4d9 100644
--- a/plugin/daemon_example/Makefile.am
+++ b/plugin/daemon_example/Makefile.am
@@ -39,6 +39,3 @@ libdaemon_example_a_CXXFLAGS =	$(AM_CFLAGS)
 libdaemon_example_a_CFLAGS =	$(AM_CFLAGS)
 libdaemon_example_a_SOURCES=	daemon_example.cc
 EXTRA_DIST = CMakeLists.txt
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/plugin/fulltext/Makefile.am b/plugin/fulltext/Makefile.am
index 0747e6d0193..80a8753b332 100644
--- a/plugin/fulltext/Makefile.am
+++ b/plugin/fulltext/Makefile.am
@@ -23,6 +23,3 @@ mypluglib_la_SOURCES= plugin_example.c
 mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir)
 mypluglib_la_CFLAGS= -DMYSQL_DYNAMIC_PLUGIN
 EXTRA_DIST= CMakeLists.txt
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/pstack/Makefile.am b/pstack/Makefile.am
index 870fed6ceeb..25feadf9d06 100644
--- a/pstack/Makefile.am
+++ b/pstack/Makefile.am
@@ -27,6 +27,3 @@ libpstack_a_SOURCES =	bucomm.c filemode.c linuxthreads.c rddbg.c \
 			debug.c ieee.c pstack.c stabs.c
 noinst_HEADERS =	bucomm.h debug.h ieee.h budbg.h demangle.h \
 			linuxthreads.h pstack.h pstacktrace.h
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/pstack/aout/Makefile.am b/pstack/aout/Makefile.am
index 2e61555db87..0b02cb7b643 100644
--- a/pstack/aout/Makefile.am
+++ b/pstack/aout/Makefile.am
@@ -1,4 +1 @@
 noinst_HEADERS = aout64.h stab.def stab_gnu.h
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/regex/Makefile.am b/regex/Makefile.am
index e2304ff7309..0fd62a777f6 100644
--- a/regex/Makefile.am
+++ b/regex/Makefile.am
@@ -31,6 +31,3 @@ test: re tests
 	./re < tests
 	./re -el < tests
 	./re -er < tests
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 4d89718f9f0..0200410fd8f 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -190,7 +190,3 @@ SUFFIXES = .sh
 	$< > $@-t
 	@CHMOD@ +x $@-t
 	@MV@ $@-t $@
-
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/sql-bench/Makefile.am b/sql-bench/Makefile.am
index ff726ff561e..a7a2975ea87 100644
--- a/sql-bench/Makefile.am
+++ b/sql-bench/Makefile.am
@@ -81,6 +81,3 @@ SUFFIXES = .sh
 	  $< > $@-t
 	@CHMOD@ +x $@-t
 	@MV@ $@-t $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/sql-common/Makefile.am b/sql-common/Makefile.am
index 614ccffde9d..3193efee754 100644
--- a/sql-common/Makefile.am
+++ b/sql-common/Makefile.am
@@ -15,6 +15,3 @@
 
 ## Process this file with automake to create Makefile.in
 EXTRA_DIST = client.c pack.c my_time.c my_user.c
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 93595a964eb..f57d1f3bc34 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -271,6 +271,3 @@ probes_libndb.o: probes_mysql.d libndb_la-ha_ndbcluster.lo
 	fi
 
 endif
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am
index 03f9a1652b7..73f2ca13bb6 100644
--- a/sql/share/Makefile.am
+++ b/sql/share/Makefile.am
@@ -58,6 +58,3 @@ distclean-local:
 
 # Do nothing
 link_sources:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/Makefile.am b/storage/Makefile.am
index 5b4e32374ae..a188d8967be 100644
--- a/storage/Makefile.am
+++ b/storage/Makefile.am
@@ -20,6 +20,3 @@ AUTOMAKE_OPTIONS =	foreign
 # These are built from source in the Docs directory
 SUBDIRS = @mysql_se_dirs@
 DIST_SUBDIRS = @mysql_se_distdirs@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am
index ca7942c082d..adc11358df6 100644
--- a/storage/archive/Makefile.am
+++ b/storage/archive/Makefile.am
@@ -102,6 +102,3 @@ probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
 	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
 
 endif
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/blackhole/Makefile.am b/storage/blackhole/Makefile.am
index 04ec7a64aa9..f3bdbdbd070 100644
--- a/storage/blackhole/Makefile.am
+++ b/storage/blackhole/Makefile.am
@@ -83,6 +83,3 @@ probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
 	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
 
 endif
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/csv/Makefile.am b/storage/csv/Makefile.am
index 96fc26bed07..36d6b464fcc 100644
--- a/storage/csv/Makefile.am
+++ b/storage/csv/Makefile.am
@@ -62,6 +62,3 @@ probes_mysql.d:
 probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
 	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
 endif
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/example/Makefile.am b/storage/example/Makefile.am
index 14787f082c8..47d95d4663c 100644
--- a/storage/example/Makefile.am
+++ b/storage/example/Makefile.am
@@ -83,6 +83,3 @@ probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
 	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
 
 endif
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/federated/Makefile.am b/storage/federated/Makefile.am
index aa275b909ea..f4cd634567d 100644
--- a/storage/federated/Makefile.am
+++ b/storage/federated/Makefile.am
@@ -84,6 +84,3 @@ probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
 	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
 
 endif
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/heap/Makefile.am b/storage/heap/Makefile.am
index c30fd1590f0..677b2d60269 100644
--- a/storage/heap/Makefile.am
+++ b/storage/heap/Makefile.am
@@ -71,6 +71,3 @@ probes_mysql.d:
 probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
 	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
 endif
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ibmdb2i/Makefile.am b/storage/ibmdb2i/Makefile.am
index 768ca15f4cf..041bdc270e4 100644
--- a/storage/ibmdb2i/Makefile.am
+++ b/storage/ibmdb2i/Makefile.am
@@ -50,5 +50,3 @@ libibmdb2i_a_SOURCES=	$(ha_ibmdb2i_la_SOURCES)
 
 
 EXTRA_DIST =		CMakeLists.txt plug.in
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/innobase/Makefile.am b/storage/innobase/Makefile.am
index 6051fe9ef96..0caf623bcc2 100644
--- a/storage/innobase/Makefile.am
+++ b/storage/innobase/Makefile.am
@@ -337,6 +337,3 @@ ha_innodb_la_SOURCES=	$(libinnobase_a_SOURCES)
 EXTRA_DIST=		CMakeLists.txt plug.in \
 			pars/make_bison.sh pars/make_flex.sh \
 			pars/pars0grm.y pars/pars0lex.l
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/myisam/Makefile.am b/storage/myisam/Makefile.am
index c659d05be40..d0f7f5b86dc 100644
--- a/storage/myisam/Makefile.am
+++ b/storage/myisam/Makefile.am
@@ -170,6 +170,3 @@ probes_mysql.d:
 probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
 	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
 endif
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/myisammrg/Makefile.am b/storage/myisammrg/Makefile.am
index b7eab6bfdb7..43dec3ae3d9 100644
--- a/storage/myisammrg/Makefile.am
+++ b/storage/myisammrg/Makefile.am
@@ -60,6 +60,3 @@ probes_mysql.d:
 probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
 	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
 endif
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/Makefile.am b/storage/ndb/Makefile.am
index 5e519ec1c98..0da8ec136c9 100644
--- a/storage/ndb/Makefile.am
+++ b/storage/ndb/Makefile.am
@@ -44,6 +44,3 @@ all-windoze-dsp: windoze
 	find . -name '*.dsp' | grep -v SCCS | xargs unix2dos
 	$(top_srcdir)/storage/ndb/config/make-win-dsw.sh | unix2dos > ndb.dsw
 	tar cvfz ndb-win-dsp.tar.gz ndb.dsw `find . -name '*.dsp' | grep -v SCCS`
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/docs/Makefile.am b/storage/ndb/docs/Makefile.am
index 66d116c02b7..b0166d40779 100644
--- a/storage/ndb/docs/Makefile.am
+++ b/storage/ndb/docs/Makefile.am
@@ -127,6 +127,3 @@ testdoc: DUMMY
 	cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test
 
 windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/include/Makefile.am b/storage/ndb/include/Makefile.am
index 9e6ad016d75..34a243d82a1 100644
--- a/storage/ndb/include/Makefile.am
+++ b/storage/ndb/include/Makefile.am
@@ -63,6 +63,3 @@ dist-hook:
 	-rm -rf `find $(distdir) -type d -name SCCS`
 
 windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/src/Makefile.am b/storage/ndb/src/Makefile.am
index 627347daf02..e879249bed6 100644
--- a/storage/ndb/src/Makefile.am
+++ b/storage/ndb/src/Makefile.am
@@ -48,6 +48,3 @@ libndbclient.dsp: Makefile \
 	@$(top_srcdir)/storage/ndb/config/win-sources $@ dummy.cpp
 	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD)
 	@touch dummy.cpp
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/src/common/Makefile.am b/storage/ndb/src/common/Makefile.am
index 9d601c7a18a..34e9871da55 100644
--- a/storage/ndb/src/common/Makefile.am
+++ b/storage/ndb/src/common/Makefile.am
@@ -28,6 +28,3 @@ libcommon_la_LIBADD = \
               util/libgeneral.la 
 
 windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/src/common/debugger/Makefile.am b/storage/ndb/src/common/debugger/Makefile.am
index 56910ee8ea4..30b8563af6d 100644
--- a/storage/ndb/src/common/debugger/Makefile.am
+++ b/storage/ndb/src/common/debugger/Makefile.am
@@ -22,9 +22,6 @@ libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp E
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp: libtrace.dsp
 
 libtrace.dsp: Makefile \
diff --git a/storage/ndb/src/common/debugger/signaldata/Makefile.am b/storage/ndb/src/common/debugger/signaldata/Makefile.am
index 280cd6a5a39..028049cf67b 100644
--- a/storage/ndb/src/common/debugger/signaldata/Makefile.am
+++ b/storage/ndb/src/common/debugger/signaldata/Makefile.am
@@ -43,9 +43,6 @@ libsignaldataprint_la_SOURCES = \
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp: libsignaldataprint.dsp
 
 libsignaldataprint.dsp: Makefile \
diff --git a/storage/ndb/src/common/logger/Makefile.am b/storage/ndb/src/common/logger/Makefile.am
index 77615212e0d..870946c1e9d 100644
--- a/storage/ndb/src/common/logger/Makefile.am
+++ b/storage/ndb/src/common/logger/Makefile.am
@@ -22,8 +22,6 @@ liblogger_la_SOURCES = $(SOURCE_WIN) SysLogHandler.cpp
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
 windoze-dsp: liblogger.dsp
 
 liblogger.dsp: Makefile \
diff --git a/storage/ndb/src/common/mgmcommon/Makefile.am b/storage/ndb/src/common/mgmcommon/Makefile.am
index ad56e8c1459..2b41c2bfdd9 100644
--- a/storage/ndb/src/common/mgmcommon/Makefile.am
+++ b/storage/ndb/src/common/mgmcommon/Makefile.am
@@ -25,9 +25,6 @@ include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
 include $(top_srcdir)/storage/ndb/config/type_mgmapiclient.mk.am
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp: libmgmsrvcommon.dsp
 
 libmgmsrvcommon.dsp: Makefile \
diff --git a/storage/ndb/src/common/portlib/Makefile.am b/storage/ndb/src/common/portlib/Makefile.am
index f427b2170b4..b0c5d5cf619 100644
--- a/storage/ndb/src/common/portlib/Makefile.am
+++ b/storage/ndb/src/common/portlib/Makefile.am
@@ -29,7 +29,6 @@ EXTRA_PROGRAMS = memtest PortLibTest munmaptest
 PortLibTest_SOURCES = NdbPortLibTest.cpp
 munmaptest_SOURCES = munmaptest.cpp
 
-# Don't update the files from bitkeeper
 WIN_src = win32/NdbCondition.c \
               win32/NdbDaemon.c \
               win32/NdbEnv.c \
@@ -54,6 +53,3 @@ libportlib.dsp: Makefile \
 	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
 	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(WIN_src)
 	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/src/common/transporter/Makefile.am b/storage/ndb/src/common/transporter/Makefile.am
index 83ac3b6121d..ccf51b352b1 100644
--- a/storage/ndb/src/common/transporter/Makefile.am
+++ b/storage/ndb/src/common/transporter/Makefile.am
@@ -32,9 +32,6 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/mgmapi -I$(top_srcdir)/storag
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_util.mk.am
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp: libtransporter.dsp
 
 libtransporter.dsp: Makefile \
diff --git a/storage/ndb/src/common/util/Makefile.am b/storage/ndb/src/common/util/Makefile.am
index 5379a425c49..4a69924192e 100644
--- a/storage/ndb/src/common/util/Makefile.am
+++ b/storage/ndb/src/common/util/Makefile.am
@@ -46,9 +46,6 @@ testBitmask.o:	$(testBitmask_SOURCES)
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_util.mk.am
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp: libgeneral.dsp
 
 libgeneral.dsp: Makefile \
diff --git a/storage/ndb/src/cw/Makefile.am b/storage/ndb/src/cw/Makefile.am
index d9a40002062..3695e197cfb 100644
--- a/storage/ndb/src/cw/Makefile.am
+++ b/storage/ndb/src/cw/Makefile.am
@@ -16,6 +16,3 @@
 SUBDIRS = cpcd
 
 windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/src/cw/cpcd/Makefile.am b/storage/ndb/src/cw/cpcd/Makefile.am
index efc828e21a9..722ceaf22e8 100644
--- a/storage/ndb/src/cw/cpcd/Makefile.am
+++ b/storage/ndb/src/cw/cpcd/Makefile.am
@@ -28,7 +28,4 @@ include $(top_srcdir)/storage/ndb/config/type_util.mk.am
 
 ndb_cpcd_LDFLAGS = -static @ndb_bin_am_ldflags@
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp:
diff --git a/storage/ndb/src/kernel/Makefile.am b/storage/ndb/src/kernel/Makefile.am
index 343d5eeab6d..9596c53da37 100644
--- a/storage/ndb/src/kernel/Makefile.am
+++ b/storage/ndb/src/kernel/Makefile.am
@@ -70,6 +70,3 @@ storage/ndbd.dsp: Makefile \
 	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
 	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndbd_SOURCES)
 	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/src/kernel/blocks/Makefile.am b/storage/ndb/src/kernel/blocks/Makefile.am
index ebb2e48ad14..f17f274defb 100644
--- a/storage/ndb/src/kernel/blocks/Makefile.am
+++ b/storage/ndb/src/kernel/blocks/Makefile.am
@@ -64,10 +64,4 @@ ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/src/kernel/blocks/backup/Makefile.am b/storage/ndb/src/kernel/blocks/backup/Makefile.am
index 4594e0fe717..085b4c9ff65 100644
--- a/storage/ndb/src/kernel/blocks/backup/Makefile.am
+++ b/storage/ndb/src/kernel/blocks/backup/Makefile.am
@@ -23,7 +23,3 @@ ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am
index 0ee3df7036d..678aa54684e 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am
+++ b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am
@@ -30,6 +30,3 @@ ndb_print_schema_file_LDFLAGS = @ndb_bin_am_ldflags@ \
          $(top_builddir)/dbug/libdbug.a \
          $(top_builddir)/mysys/libmysys.a \
          $(top_builddir)/strings/libmystrings.a
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am
index 1c84714289d..651c966cad1 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am
+++ b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am
@@ -24,6 +24,3 @@ ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am
index b545096dc83..74ac3fd3a17 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am
+++ b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am
@@ -26,6 +26,3 @@ ndbd_redo_log_reader_LDFLAGS = @ndb_bin_am_ldflags@ \
          $(top_builddir)/dbug/libdbug.a \
          $(top_builddir)/mysys/libmysys.a \
          $(top_builddir)/strings/libmystrings.a
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am
index 7feda3d8ac5..9fe51d30fab 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am
+++ b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am
@@ -23,6 +23,3 @@ test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \
   $(top_builddir)/mysys/libmysys.a \
   $(top_builddir)/dbug/libdbug.a \
   $(top_builddir)/strings/libmystrings.a
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/src/kernel/error/Makefile.am b/storage/ndb/src/kernel/error/Makefile.am
index 6db5c0e4ede..9d3c460eae8 100644
--- a/storage/ndb/src/kernel/error/Makefile.am
+++ b/storage/ndb/src/kernel/error/Makefile.am
@@ -22,9 +22,6 @@ liberror_a_SOURCES = TimeModule.cpp \
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp: liberror.dsp
 
 liberror.dsp: Makefile \
diff --git a/storage/ndb/src/kernel/vm/Makefile.am b/storage/ndb/src/kernel/vm/Makefile.am
index 4964b4ea85a..fdc7854e822 100644
--- a/storage/ndb/src/kernel/vm/Makefile.am
+++ b/storage/ndb/src/kernel/vm/Makefile.am
@@ -43,9 +43,6 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp: libkernel.dsp
 
 libkernel.dsp: Makefile \
diff --git a/storage/ndb/src/mgmapi/Makefile.am b/storage/ndb/src/mgmapi/Makefile.am
index 96ee65d7d9e..ed4404245b7 100644
--- a/storage/ndb/src/mgmapi/Makefile.am
+++ b/storage/ndb/src/mgmapi/Makefile.am
@@ -29,9 +29,6 @@ include $(top_srcdir)/storage/ndb/config/type_util.mk.am
 
 #ndbtest_PROGRAMS = ndb_test_mgmapi
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp: libmgmapi.dsp
 
 libmgmapi.dsp: Makefile \
diff --git a/storage/ndb/src/mgmclient/Makefile.am b/storage/ndb/src/mgmclient/Makefile.am
index 41f659cf68d..4cb5990e75f 100644
--- a/storage/ndb/src/mgmclient/Makefile.am
+++ b/storage/ndb/src/mgmclient/Makefile.am
@@ -44,9 +44,6 @@ LDADD_LOC = $(noinst_LTLIBRARIES) \
 
 ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp: ndb_mgm.dsp libndbmgmclient.dsp
 
 ndb_mgm.dsp: Makefile \
diff --git a/storage/ndb/src/mgmsrv/Makefile.am b/storage/ndb/src/mgmsrv/Makefile.am
index 3f37280d7a5..3ae70155554 100644
--- a/storage/ndb/src/mgmsrv/Makefile.am
+++ b/storage/ndb/src/mgmsrv/Makefile.am
@@ -57,9 +57,6 @@ include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
 
 ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp: ndb_mgmd.dsp
 
 ndb_mgmd.dsp: Makefile \
diff --git a/storage/ndb/src/ndbapi/Makefile.am b/storage/ndb/src/ndbapi/Makefile.am
index 8ff427772b0..6a18649039d 100644
--- a/storage/ndb/src/ndbapi/Makefile.am
+++ b/storage/ndb/src/ndbapi/Makefile.am
@@ -71,9 +71,6 @@ ndberror_check_LDFLAGS = \
          $(top_builddir)/mysys/libmysys.a \
          $(top_builddir)/strings/libmystrings.a
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp: libndbapi.dsp
 
 libndbapi.dsp: Makefile \
diff --git a/storage/ndb/test/Makefile.am b/storage/ndb/test/Makefile.am
index c746f526769..57e9db7b543 100644
--- a/storage/ndb/test/Makefile.am
+++ b/storage/ndb/test/Makefile.am
@@ -21,6 +21,3 @@ dist-hook:
 	-rm -rf `find $(distdir) -type d -name SCCS`
 
 windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/ndb/test/ndbapi/Makefile.am b/storage/ndb/test/ndbapi/Makefile.am
index 81bb346417f..84b1105913c 100644
--- a/storage/ndb/test/ndbapi/Makefile.am
+++ b/storage/ndb/test/ndbapi/Makefile.am
@@ -125,11 +125,6 @@ testBackup_LDADD = $(LDADD) bank/libbank.a
 testSRBank_LDADD = bank/libbank.a $(LDADD) 
 NdbRepStress_LDADD = $(LDADD) $(top_builddir)/libmysql_r/libmysqlclient_r.la
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-
-
 windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \
              testScan.dsp
 
diff --git a/storage/ndb/test/ndbapi/bank/Makefile.am b/storage/ndb/test/ndbapi/bank/Makefile.am
index 8e6c0f23eea..aee3ec57449 100644
--- a/storage/ndb/test/ndbapi/bank/Makefile.am
+++ b/storage/ndb/test/ndbapi/bank/Makefile.am
@@ -32,7 +32,4 @@ LDADD_LOC = $(noinst_LIBRARIES)
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp:
diff --git a/storage/ndb/test/run-test/Makefile.am b/storage/ndb/test/run-test/Makefile.am
index 54ca0c009b2..e1bc71fb4a9 100644
--- a/storage/ndb/test/run-test/Makefile.am
+++ b/storage/ndb/test/run-test/Makefile.am
@@ -51,7 +51,4 @@ wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run
 
 EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) $(wrappers_SCRIPTS) README.ATRT atrt.hpp
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp:
diff --git a/storage/ndb/test/src/Makefile.am b/storage/ndb/test/src/Makefile.am
index 1e4f30c3f39..148304adc47 100644
--- a/storage/ndb/test/src/Makefile.am
+++ b/storage/ndb/test/src/Makefile.am
@@ -31,9 +31,6 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/common/mgmcommon -I$(top_srcdir)/
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp: libNDBT.dsp
 
 libNDBT.dsp: Makefile \
diff --git a/storage/ndb/test/tools/Makefile.am b/storage/ndb/test/tools/Makefile.am
index da715caa1cb..6a93b1a36ba 100644
--- a/storage/ndb/test/tools/Makefile.am
+++ b/storage/ndb/test/tools/Makefile.am
@@ -43,7 +43,4 @@ include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
 ndb_cpcc_LDADD = $(LDADD)
 ndb_cpcc_LDFLAGS = -static
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp:
diff --git a/storage/ndb/tools/Makefile.am b/storage/ndb/tools/Makefile.am
index de0f36963bf..ef74198e2bd 100644
--- a/storage/ndb/tools/Makefile.am
+++ b/storage/ndb/tools/Makefile.am
@@ -75,9 +75,6 @@ ndb_select_count_LDFLAGS = @ndb_bin_am_ldflags@
 ndb_restore_LDFLAGS = @ndb_bin_am_ldflags@
 ndb_config_LDFLAGS = @ndb_bin_am_ldflags@
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp: \
   ndb_waiter.dsp \
   ndb_drop_table.dsp \
diff --git a/strings/Makefile.am b/strings/Makefile.am
index ff4436ddbcb..9b32f42c49a 100644
--- a/strings/Makefile.am
+++ b/strings/Makefile.am
@@ -88,7 +88,3 @@ test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES)
 	$(CP) $(srcdir)/decimal.c ./test_decimal.c
 	$(LINK) $(FLAGS) -DMAIN  ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES)
 	$(RM) -f ./test_decimal.c
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
diff --git a/support-files/MacOSX/Makefile.am b/support-files/MacOSX/Makefile.am
index 3f11107d714..7d4384a2a56 100644
--- a/support-files/MacOSX/Makefile.am
+++ b/support-files/MacOSX/Makefile.am
@@ -52,6 +52,3 @@ SUFFIXES = .sh
 		-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
 	$< > $@-t
 	@MV@ $@-t $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/support-files/Makefile.am b/support-files/Makefile.am
index 42e7ecb1797..7ddb39e1c7c 100644
--- a/support-files/Makefile.am
+++ b/support-files/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST =		mysql.spec.sh \
 			magic mysql.m4 \
 			MySQL-shared-compat.spec.sh \
 			ndb-config-2-node.ini.sh \
-			compiler_warnings.supp \ 
+			compiler_warnings.supp \
 			dtrace \
 			CMakeLists.txt
 
@@ -129,6 +129,3 @@ SUFFIXES = .sh
 	  -e 's!@''PERL_DATA_DUMPER''@!@PERL_DATA_DUMPER@!' \
 	$< > $@-t
 	@MV@ $@-t $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/support-files/RHEL4-SElinux/Makefile.am b/support-files/RHEL4-SElinux/Makefile.am
index 52292136877..d2143a5285c 100644
--- a/support-files/RHEL4-SElinux/Makefile.am
+++ b/support-files/RHEL4-SElinux/Makefile.am
@@ -18,6 +18,3 @@
 ## Process this file with automake to create Makefile.in
 
 EXTRA_DIST =		mysql.fc mysql.te
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ddc6da86e1c..ca4a2a4e986 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -60,6 +60,3 @@ DEFS =			-DMYSQL_CLIENT_NO_THREADS
 
 thread_test.o:		thread_test.c
 			$(COMPILE) -c $(INCLUDES) $<
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/unittest/Makefile.am b/unittest/Makefile.am
index 65fa615fb98..6197586b008 100644
--- a/unittest/Makefile.am
+++ b/unittest/Makefile.am
@@ -25,6 +25,3 @@ test:
 
 test-verbose:
 	HARNESS_VERBOSE=1 perl unit.pl run $(unittests)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/unittest/examples/Makefile.am b/unittest/examples/Makefile.am
index 94032c00928..cfb22e678d4 100644
--- a/unittest/examples/Makefile.am
+++ b/unittest/examples/Makefile.am
@@ -21,6 +21,3 @@ AM_LDFLAGS         = -L$(top_builddir)/unittest/mytap
 LDADD              = -lmytap
 
 noinst_PROGRAMS    = simple-t skip-t todo-t skip_all-t no_plan-t core-t
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/unittest/mytap/t/Makefile.am b/unittest/mytap/t/Makefile.am
index e89a088bb3a..bce72a88c05 100644
--- a/unittest/mytap/t/Makefile.am
+++ b/unittest/mytap/t/Makefile.am
@@ -20,6 +20,3 @@ AM_LDFLAGS      = -L$(top_builddir)/unittest/mytap
 LDADD           = -lmytap
 
 noinst_PROGRAMS = basic-t
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/vio/Makefile.am b/vio/Makefile.am
index 27596bb2fa4..c70af1008cd 100644
--- a/vio/Makefile.am
+++ b/vio/Makefile.am
@@ -23,6 +23,3 @@ noinst_HEADERS =	vio_priv.h
 libvio_a_SOURCES =	vio.c viosocket.c viossl.c viosslfactories.c
 
 EXTRA_DIST=		CMakeLists.txt
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/win/Makefile.am b/win/Makefile.am
index e5813010740..5b71b7342a9 100644
--- a/win/Makefile.am
+++ b/win/Makefile.am
@@ -17,6 +17,3 @@
 EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat build-vs9.bat \
              build-vs9_x64.bat configure.js README mysql_manifest.cmake \
              create_manifest.js create_def_file.js
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/zlib/Makefile.am b/zlib/Makefile.am
index edcbd5f4a75..277f6445a85 100644
--- a/zlib/Makefile.am
+++ b/zlib/Makefile.am
@@ -33,6 +33,3 @@ libz_la_SOURCES    = adler32.c compress.c crc32.c deflate.c gzio.c \
 libzlt_la_SOURCES  = $(libz_la_SOURCES)
 
 EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3 CMakeLists.txt
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%