summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-05-19 17:00:23 +0400
committerAlexander Nozdrin <alik@sun.com>2010-05-19 17:00:23 +0400
commit091bcacc79f76878c6842d54cc18a133d5f8e902 (patch)
tree574458923d5c91864006d3e044db236b688fe587 /storage
parent2f7945b8b9a8bc211a7fce9cc521f846e5f05af4 (diff)
downloadmariadb-git-091bcacc79f76878c6842d54cc18a133d5f8e902.tar.gz
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.
Diffstat (limited to 'storage')
-rw-r--r--storage/Makefile.am3
-rw-r--r--storage/archive/Makefile.am3
-rw-r--r--storage/blackhole/Makefile.am3
-rw-r--r--storage/csv/Makefile.am3
-rw-r--r--storage/example/Makefile.am3
-rw-r--r--storage/federated/Makefile.am3
-rw-r--r--storage/heap/Makefile.am3
-rw-r--r--storage/ibmdb2i/Makefile.am2
-rw-r--r--storage/innobase/Makefile.am3
-rw-r--r--storage/myisam/Makefile.am3
-rw-r--r--storage/myisammrg/Makefile.am3
-rw-r--r--storage/ndb/Makefile.am3
-rw-r--r--storage/ndb/docs/Makefile.am3
-rw-r--r--storage/ndb/include/Makefile.am3
-rw-r--r--storage/ndb/src/Makefile.am3
-rw-r--r--storage/ndb/src/common/Makefile.am3
-rw-r--r--storage/ndb/src/common/debugger/Makefile.am3
-rw-r--r--storage/ndb/src/common/debugger/signaldata/Makefile.am3
-rw-r--r--storage/ndb/src/common/logger/Makefile.am2
-rw-r--r--storage/ndb/src/common/mgmcommon/Makefile.am3
-rw-r--r--storage/ndb/src/common/portlib/Makefile.am4
-rw-r--r--storage/ndb/src/common/transporter/Makefile.am3
-rw-r--r--storage/ndb/src/common/util/Makefile.am3
-rw-r--r--storage/ndb/src/cw/Makefile.am3
-rw-r--r--storage/ndb/src/cw/cpcd/Makefile.am3
-rw-r--r--storage/ndb/src/kernel/Makefile.am3
-rw-r--r--storage/ndb/src/kernel/blocks/Makefile.am6
-rw-r--r--storage/ndb/src/kernel/blocks/backup/Makefile.am4
-rw-r--r--storage/ndb/src/kernel/blocks/dbdict/Makefile.am3
-rw-r--r--storage/ndb/src/kernel/blocks/dbdih/Makefile.am3
-rw-r--r--storage/ndb/src/kernel/blocks/dblqh/Makefile.am3
-rw-r--r--storage/ndb/src/kernel/blocks/dbtup/Makefile.am3
-rw-r--r--storage/ndb/src/kernel/error/Makefile.am3
-rw-r--r--storage/ndb/src/kernel/vm/Makefile.am3
-rw-r--r--storage/ndb/src/mgmapi/Makefile.am3
-rw-r--r--storage/ndb/src/mgmclient/Makefile.am3
-rw-r--r--storage/ndb/src/mgmsrv/Makefile.am3
-rw-r--r--storage/ndb/src/ndbapi/Makefile.am3
-rw-r--r--storage/ndb/test/Makefile.am3
-rw-r--r--storage/ndb/test/ndbapi/Makefile.am5
-rw-r--r--storage/ndb/test/ndbapi/bank/Makefile.am3
-rw-r--r--storage/ndb/test/run-test/Makefile.am3
-rw-r--r--storage/ndb/test/src/Makefile.am3
-rw-r--r--storage/ndb/test/tools/Makefile.am3
-rw-r--r--storage/ndb/tools/Makefile.am3
45 files changed, 0 insertions, 140 deletions
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 \