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.
16 years ago · 759d5bc535
92 changed files with 1 additions and 288 deletions
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
-
--- 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.%
--- 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.%
--- 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.%
-
--- 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.%
--- 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.%
-
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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.%
--- 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 \
--- 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 \
--- 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.%
--- 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:
--- 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.%
--- 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.%
--- 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.%
-
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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.%
--- 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

--- 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:
--- 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:
--- 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 \
--- 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:
--- 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 \
--- 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.%
-
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%
--- 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.%