[Commits] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2922)

Michael Widenius michael.widenius at gmail.com
Mon Nov 29 11:28:09 EET 2010


#At lp:maria based on revid:monty at askmonty.org-20101126223734-fwrdjg81aqsn0gfj

 2922 Michael Widenius	2010-11-29
      Fixed compiler and gmake warnings
      - Removed SCCS rule from Makefile.am
      - Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label.
      Don't use maintainer mode with valgrind (as we don't want to initialize all variables)
      modified:
        cmd-line-utils/readline/Makefile.am
        config/ac-macros/maintainer.m4
        configure.in
        extra/yassl/Makefile.am
        extra/yassl/src/Makefile.am
        extra/yassl/taocrypt/Makefile.am
        extra/yassl/taocrypt/benchmark/Makefile.am
        extra/yassl/taocrypt/src/Makefile.am
        extra/yassl/taocrypt/test/Makefile.am
        extra/yassl/testsuite/Makefile.am
        libmysql/Makefile.shared
        libmysqld/examples/Makefile.am
        mysql-test/lib/My/SafeProcess/Makefile.am
        plugin/daemon_example/Makefile.am
        plugin/fulltext/Makefile.am
        pstack/aout/Makefile.am
        server-tools/instance-manager/Makefile.am
        sql/share/Makefile.am
        sql/sql_yacc.yy
        storage/archive/Makefile.am
        storage/blackhole/Makefile.am
        storage/csv/Makefile.am
        storage/example/Makefile.am
        storage/federated/Makefile.am
        storage/federatedx/Makefile.am
        storage/heap/Makefile.am
        storage/ibmdb2i/Makefile.am
        storage/innobase/Makefile.am
        storage/innodb_plugin/Makefile.am
        storage/maria/Makefile.am
        storage/maria/unittest/Makefile.am
        storage/myisam/Makefile.am
        storage/myisammrg/Makefile.am
        storage/ndb/Makefile.am
        storage/ndb/docs/Makefile.am
        storage/ndb/include/Makefile.am
        storage/ndb/src/Makefile.am
        storage/ndb/src/common/Makefile.am
        storage/ndb/src/common/debugger/Makefile.am
        storage/ndb/src/common/debugger/signaldata/Makefile.am
        storage/ndb/src/common/logger/Makefile.am
        storage/ndb/src/common/mgmcommon/Makefile.am
        storage/ndb/src/common/portlib/Makefile.am
        storage/ndb/src/common/transporter/Makefile.am
        storage/ndb/src/common/util/Makefile.am
        storage/ndb/src/cw/Makefile.am
        storage/ndb/src/cw/cpcd/Makefile.am
        storage/ndb/src/kernel/Makefile.am
        storage/ndb/src/kernel/blocks/Makefile.am
        storage/ndb/src/kernel/blocks/backup/Makefile.am
        storage/ndb/src/kernel/blocks/dbdict/Makefile.am
        storage/ndb/src/kernel/blocks/dbdih/Makefile.am
        storage/ndb/src/kernel/blocks/dblqh/Makefile.am
        storage/ndb/src/kernel/blocks/dbtup/Makefile.am
        storage/ndb/src/kernel/error/Makefile.am
        storage/ndb/src/kernel/vm/Makefile.am
        storage/ndb/src/mgmapi/Makefile.am
        storage/ndb/src/mgmclient/Makefile.am
        storage/ndb/src/mgmsrv/Makefile.am
        storage/ndb/src/ndbapi/Makefile.am
        storage/ndb/test/Makefile.am
        storage/ndb/test/ndbapi/Makefile.am
        storage/ndb/test/ndbapi/bank/Makefile.am
        storage/ndb/test/run-test/Makefile.am
        storage/ndb/test/src/Makefile.am
        storage/ndb/test/tools/Makefile.am
        storage/ndb/tools/Makefile.am
        storage/xtradb/Makefile.am
        support-files/MacOSX/Makefile.am
        support-files/RHEL4-SElinux/Makefile.am
        unittest/examples/Makefile.am
        unittest/mysys/Makefile.am
        unittest/mytap/Makefile.am
        unittest/mytap/t/Makefile.am
        unittest/strings/Makefile.am

per-file messages:
  config/ac-macros/maintainer.m4
    Don't use maintainer mode with valgrind (as we don't want to initialize all variables)
    Force initialization of variables when using -Werror (To get rid of compiler warnings)
  configure.in
    Don't use maintainer mode with valgrind (as we don't want to initialize all variables)
  sql/sql_yacc.yy
    Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label.
=== modified file 'cmd-line-utils/readline/Makefile.am'
--- a/cmd-line-utils/readline/Makefile.am	2010-07-02 18:30:47 +0000
+++ b/cmd-line-utils/readline/Makefile.am	2010-11-29 09:27:52 +0000
@@ -32,6 +32,3 @@ noinst_HEADERS =	readline.h chardefs.h k
 EXTRA_DIST=		emacs_keymap.c vi_keymap.c
 
 DEFS =			-DMYSQL_CLIENT_NO_THREADS -DHAVE_CONFIG_H -DNO_KILL_INTR -D_GNU_SOURCE=1
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'config/ac-macros/maintainer.m4'
--- a/config/ac-macros/maintainer.m4	2010-11-25 13:11:37 +0000
+++ b/config/ac-macros/maintainer.m4	2010-11-29 09:27:52 +0000
@@ -8,7 +8,7 @@ AC_DEFUN([MY_MAINTAINER_MODE], [
     [AS_HELP_STRING([--enable-mysql-maintainer-mode],
                     [Enable a MySQL maintainer-specific development environment])],
     [USE_MYSQL_MAINTAINER_MODE=$enableval],
-    [AS_IF([test "$with_debug" != "no"],
+    [AS_IF([test "$with_debug" != "no" -a "$with_valgrind" = "no"],
     [USE_MYSQL_MAINTAINER_MODE=yes], [USE_MYSQL_MAINTAINER_MODE=no])])
   AC_MSG_RESULT([$USE_MYSQL_MAINTAINER_MODE])
 ])
@@ -17,7 +17,7 @@ AC_DEFUN([MY_MAINTAINER_MODE], [
 AC_DEFUN([MY_MAINTAINER_MODE_WARNINGS], [
   # Setup GCC warning options.
   AS_IF([test "$GCC" = "yes"], [
-    C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror"
+    C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror -DFORCE_INIT_OF_VARS"
     CXX_WARNINGS="${C_WARNINGS} -Wno-unused-parameter"
   ])
 

=== modified file 'configure.in'
--- a/configure.in	2010-11-24 22:57:34 +0000
+++ b/configure.in	2010-11-29 09:27:52 +0000
@@ -111,6 +111,17 @@ AC_ARG_WITH([debug],
     [with_debug=$withval],
     [with_debug=no])
 
+AC_ARG_WITH([valgrind],
+  [AS_HELP_STRING([--with-valgrind],
+    [Valgrind instrumentation @<:@default=no@:>@])],
+    [], [with_valgrind=no])
+
+if test "$with_valgrind" != "no"
+then
+  AC_CHECK_HEADERS([valgrind/valgrind.h valgrind/memcheck.h],
+    [AC_DEFINE([HAVE_VALGRIND], [1], [Define for Valgrind support])])
+fi
+
 # Whether the maintainer mode should be enabled.
 MY_MAINTAINER_MODE
 
@@ -1728,17 +1739,6 @@ else
   CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"
 fi
 
-AC_ARG_WITH([valgrind],
-  [AS_HELP_STRING([--with-valgrind],
-    [Valgrind instrumentation @<:@default=no@:>@])],
-    [], [with_valgrind=no])
-
-if test "$with_valgrind" != "no"
-then
-  AC_CHECK_HEADERS([valgrind/valgrind.h valgrind/memcheck.h],
-    [AC_DEFINE([HAVE_VALGRIND], [1], [Define for Valgrind support])])
-fi
-
 # Debug Sync Facility. NOTE: depends on 'with_debug'. Must be behind it.
 AC_MSG_CHECKING(if Debug Sync Facility should be enabled.)
 AC_ARG_ENABLE(debug_sync,

=== modified file 'extra/yassl/Makefile.am'
--- a/extra/yassl/Makefile.am	2008-09-01 21:27:14 +0000
+++ b/extra/yassl/Makefile.am	2010-11-29 09:27:52 +0000
@@ -1,5 +1,2 @@
 SUBDIRS = taocrypt src testsuite
 EXTRA_DIST = CMakeLists.txt
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'extra/yassl/src/Makefile.am'
--- a/extra/yassl/src/Makefile.am	2010-06-08 21:14:18 +0000
+++ b/extra/yassl/src/Makefile.am	2010-11-29 09:27:52 +0000
@@ -6,7 +6,3 @@ libyassl_la_SOURCES = buffer.cpp cert_wr
 	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 @yassl_thread_cxxflags@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-

=== modified file 'extra/yassl/taocrypt/Makefile.am'
--- a/extra/yassl/taocrypt/Makefile.am	2008-09-01 21:27:14 +0000
+++ b/extra/yassl/taocrypt/Makefile.am	2010-11-29 09:27:52 +0000
@@ -1,5 +1,2 @@
 SUBDIRS = src test benchmark
 EXTRA_DIST = CMakeLists.txt $(wildcard mySTL/*.hpp)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'extra/yassl/taocrypt/benchmark/Makefile.am'
--- a/extra/yassl/taocrypt/benchmark/Makefile.am	2010-06-08 21:14:18 +0000
+++ b/extra/yassl/taocrypt/benchmark/Makefile.am	2010-11-29 09:27:52 +0000
@@ -4,6 +4,3 @@ benchmark_SOURCES  = benchmark.cpp
 benchmark_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
 benchmark_CXXFLAGS = -DYASSL_PURE_C @yassl_thread_cxxflags@
 EXTRA_DIST = benchmark.dsp rsa1024.der dh1024.der dsa1024.der make.bat
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'extra/yassl/taocrypt/src/Makefile.am'
--- a/extra/yassl/taocrypt/src/Makefile.am	2010-06-08 21:14:18 +0000
+++ b/extra/yassl/taocrypt/src/Makefile.am	2010-11-29 09:27:52 +0000
@@ -12,7 +12,3 @@ libtaocrypt_la_CXXFLAGS = @yassl_taocryp
 			  @yassl_thread_cxxflags@
 
 EXTRA_DIST = $(wildcard ../include/*.hpp)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-

=== modified file 'extra/yassl/taocrypt/test/Makefile.am'
--- a/extra/yassl/taocrypt/test/Makefile.am	2010-06-08 21:14:18 +0000
+++ b/extra/yassl/taocrypt/test/Makefile.am	2010-11-29 09:27:52 +0000
@@ -4,6 +4,3 @@ test_SOURCES = test.cpp
 test_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
 test_CXXFLAGS = -DYASSL_PURE_C @yassl_thread_cxxflags@
 EXTRA_DIST = make.bat
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'extra/yassl/testsuite/Makefile.am'
--- a/extra/yassl/testsuite/Makefile.am	2010-06-08 21:14:18 +0000
+++ b/extra/yassl/testsuite/Makefile.am	2010-11-29 09:27:52 +0000
@@ -8,7 +8,3 @@ testsuite_CXXFLAGS = -DYASSL_PURE_C -DYA
 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.%
-

=== modified file 'libmysql/Makefile.shared'
--- a/libmysql/Makefile.shared	2010-08-27 14:12:44 +0000
+++ b/libmysql/Makefile.shared	2010-11-29 09:27:52 +0000
@@ -115,6 +115,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.%

=== modified file 'libmysqld/examples/Makefile.am'
--- a/libmysqld/examples/Makefile.am	2010-11-17 12:24:20 +0000
+++ b/libmysqld/examples/Makefile.am	2010-11-29 09:27:52 +0000
@@ -52,6 +52,3 @@ mysql_LDADD = @readline_link@ @TERMCAP_L
 
 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.%

=== modified file 'mysql-test/lib/My/SafeProcess/Makefile.am'
--- a/mysql-test/lib/My/SafeProcess/Makefile.am	2009-10-13 18:21:42 +0000
+++ b/mysql-test/lib/My/SafeProcess/Makefile.am	2010-11-29 09:27:52 +0000
@@ -23,7 +23,3 @@ my_safe_process_SOURCES = safe_process.c
 EXTRA_DIST = 	safe_kill_win.cc \
 		safe_process_win.cc \
 		CMakeLists.txt
-
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'plugin/daemon_example/Makefile.am'
--- a/plugin/daemon_example/Makefile.am	2010-09-09 13:35:47 +0000
+++ b/plugin/daemon_example/Makefile.am	2010-11-29 09:27:52 +0000
@@ -34,6 +34,3 @@ EXTRA_LIBRARIES =	libdaemon_example.a
 noinst_LIBRARIES =	@plugin_daemon_example_static_target@
 libdaemon_example_a_CXXFLAGS =	$(AM_CXXFLAGS)
 libdaemon_example_a_SOURCES=	daemon_example.cc
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'plugin/fulltext/Makefile.am'
--- a/plugin/fulltext/Makefile.am	2010-09-09 13:35:47 +0000
+++ b/plugin/fulltext/Makefile.am	2010-11-29 09:27:52 +0000
@@ -22,6 +22,3 @@ pkgplugin_LTLIBRARIES= mypluglib.la
 mypluglib_la_SOURCES= plugin_example.c
 mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir)
 mypluglib_la_CFLAGS= -shared -DMYSQL_DYNAMIC_PLUGIN
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'pstack/aout/Makefile.am'
--- a/pstack/aout/Makefile.am	2006-12-31 00:02:27 +0000
+++ b/pstack/aout/Makefile.am	2010-11-29 09:27:52 +0000
@@ -1,4 +1 @@
 noinst_HEADERS = aout64.h stab.def stab_gnu.h
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'server-tools/instance-manager/Makefile.am'
--- a/server-tools/instance-manager/Makefile.am	2007-02-18 12:45:28 +0000
+++ b/server-tools/instance-manager/Makefile.am	2010-11-29 09:27:52 +0000
@@ -98,6 +98,3 @@ EXTRA_DIST =		WindowsService.cpp Windows
 
 tags:
 	ctags -R *.h *.cc
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'sql/share/Makefile.am'
--- a/sql/share/Makefile.am	2010-04-01 11:19:15 +0000
+++ b/sql/share/Makefile.am	2010-11-29 09:27:52 +0000
@@ -57,6 +57,3 @@ distclean-local:
 
 # Do nothing
 link_sources:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2010-11-24 22:57:34 +0000
+++ b/sql/sql_yacc.yy	2010-11-29 09:27:52 +0000
@@ -1268,6 +1268,8 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  YEAR_SYM                      /* SQL-2003-R */
 %token  ZEROFILL
 
+%token IMPOSSIBLE_ACTION		/* To avoid warning for yyerrlab1 */
+
 %left   JOIN_SYM INNER_SYM STRAIGHT_JOIN CROSS LEFT RIGHT
 /* A dummy token to force the priority of table_ref production in a join. */
 %left   TABLE_REF_PRIORITY
@@ -1466,6 +1468,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
         init_key_options normal_key_options normal_key_opts all_key_opt 
         spatial_key_options fulltext_key_options normal_key_opt 
         fulltext_key_opt spatial_key_opt fulltext_key_opts spatial_key_opts
+	keep_gcc_happy
         key_using_alg
         server_def server_options_list server_option
         definer_opt no_definer definer
@@ -1595,11 +1598,12 @@ statement:
         | help
         | insert
         | install
+	| keep_gcc_happy
+        | keycache
         | kill
         | load
         | lock
         | optimize
-        | keycache
         | partition_entry
         | preload
         | prepare
@@ -13765,6 +13769,13 @@ uninstall:
           }
         ;
 
+/* Avoid compiler warning from sql_yacc.cc where yyerrlab1 is not used */
+keep_gcc_happy:
+	IMPOSSIBLE_ACTION
+	{
+	  YYERROR;
+	}
+
 /**
   @} (end of group Parser)
 */

=== modified file 'storage/archive/Makefile.am'
--- a/storage/archive/Makefile.am	2010-11-17 12:24:20 +0000
+++ b/storage/archive/Makefile.am	2010-11-29 09:27:52 +0000
@@ -65,5 +65,3 @@ archive_reader_LDFLAGS = @NOINST_LDFLAGS
 
 
 EXTRA_DIST =		CMakeLists.txt plug.in
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/blackhole/Makefile.am'
--- a/storage/blackhole/Makefile.am	2010-11-17 12:24:20 +0000
+++ b/storage/blackhole/Makefile.am	2010-11-29 09:27:52 +0000
@@ -45,5 +45,3 @@ libblackhole_la_SOURCES=	ha_blackhole.cc
 
 
 EXTRA_DIST =		CMakeLists.txt plug.in
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/csv/Makefile.am'
--- a/storage/csv/Makefile.am	2010-11-17 12:24:20 +0000
+++ b/storage/csv/Makefile.am	2010-11-29 09:27:52 +0000
@@ -40,5 +40,3 @@ libcsv_la_CXXFLAGS =	$(AM_CXXFLAGS)
 libcsv_la_SOURCES =	transparent_file.cc ha_tina.cc
 
 EXTRA_DIST =		CMakeLists.txt plug.in
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/example/Makefile.am'
--- a/storage/example/Makefile.am	2010-11-17 12:24:20 +0000
+++ b/storage/example/Makefile.am	2010-11-29 09:27:52 +0000
@@ -45,5 +45,4 @@ libexample_la_SOURCES=	ha_example.cc
 
 
 EXTRA_DIST =		CMakeLists.txt plug.in
-# Don't update the files from bitkeeper
-%::SCCS/s.%
+

=== modified file 'storage/federated/Makefile.am'
--- a/storage/federated/Makefile.am	2010-11-17 12:24:20 +0000
+++ b/storage/federated/Makefile.am	2010-11-29 09:27:52 +0000
@@ -48,5 +48,3 @@ libfederated_embedded_la_SOURCES=	ha_fed
 
 
 EXTRA_DIST =		CMakeLists.txt plug.in
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/federatedx/Makefile.am'
--- a/storage/federatedx/Makefile.am	2010-11-17 12:24:20 +0000
+++ b/storage/federatedx/Makefile.am	2010-11-29 09:27:52 +0000
@@ -68,6 +68,3 @@ ha_federatedx_la_LIBADD =
 #	$(DTRACE) $(DTRACEFLAGS) -G -s federatedx_probes.d $(DTRACEFILES)
 
 # End
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/heap/Makefile.am'
--- a/storage/heap/Makefile.am	2010-11-17 12:24:20 +0000
+++ b/storage/heap/Makefile.am	2010-11-29 09:27:52 +0000
@@ -64,6 +64,3 @@ libheap.a: libheap.la
 
 
 EXTRA_DIST =		CMakeLists.txt plug.in
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/ibmdb2i/Makefile.am'
--- a/storage/ibmdb2i/Makefile.am	2010-07-09 11:37:51 +0000
+++ b/storage/ibmdb2i/Makefile.am	2010-11-29 09:27:52 +0000
@@ -50,5 +50,3 @@ libibmdb2i_a_SOURCES=	$(ha_ibmdb2i_la_SO
 
 
 EXTRA_DIST =		CMakeLists.txt plug.in
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/innobase/Makefile.am'
--- a/storage/innobase/Makefile.am	2010-11-17 12:24:20 +0000
+++ b/storage/innobase/Makefile.am	2010-11-29 09:27:52 +0000
@@ -169,6 +169,3 @@ ha_innodb_la_SOURCES=	$(libinnobase_a_SO
 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.%

=== modified file 'storage/innodb_plugin/Makefile.am'
--- a/storage/innodb_plugin/Makefile.am	2010-11-17 12:24:20 +0000
+++ b/storage/innodb_plugin/Makefile.am	2010-11-29 09:27:52 +0000
@@ -338,6 +338,3 @@ ha_innodb_plugin_la_SOURCES=	$(libinnoba
 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.%

=== modified file 'storage/maria/Makefile.am'
--- a/storage/maria/Makefile.am	2010-11-17 12:24:20 +0000
+++ b/storage/maria/Makefile.am	2010-11-29 09:27:52 +0000
@@ -206,6 +206,3 @@ test:
 
 test-verbose:
 	HARNESS_VERBOSE=1 perl $(top_srcdir)/unittest/unit.pl run $(unittests)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/maria/unittest/Makefile.am'
--- a/storage/maria/unittest/Makefile.am	2008-10-16 19:44:12 +0000
+++ b/storage/maria/unittest/Makefile.am	2010-11-29 09:27:52 +0000
@@ -110,6 +110,3 @@ ma_pagecache_rwconsist2_1k_t_CPPFLAGS =
 # so we don't build lockman-t and lockman1-t and lockman2-t 
 CLEANFILES =		maria_log_control page_cache_test_file_1 \
 			maria_log.????????
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/myisam/Makefile.am'
--- a/storage/myisam/Makefile.am	2010-11-17 12:24:20 +0000
+++ b/storage/myisam/Makefile.am	2010-11-29 09:27:52 +0000
@@ -165,6 +165,3 @@ SUFFIXES = .sh
 	$< > $@-t
 	@CHMOD@ +x $@-t
 	@MV@ $@-t $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/myisammrg/Makefile.am'
--- a/storage/myisammrg/Makefile.am	2010-11-17 12:24:20 +0000
+++ b/storage/myisammrg/Makefile.am	2010-11-29 09:27:52 +0000
@@ -49,6 +49,3 @@ libmyisammrg.a: libmyisammrg.la
 	$(CP) .libs/libmyisammrg.a $@
 
 EXTRA_DIST =		CMakeLists.txt plug.in
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/ndb/Makefile.am'
--- a/storage/ndb/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/Makefile.am	2010-11-29 09:27:52 +0000
@@ -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.%

=== modified file 'storage/ndb/docs/Makefile.am'
--- a/storage/ndb/docs/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/docs/Makefile.am	2010-11-29 09:27:52 +0000
@@ -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.%

=== modified file 'storage/ndb/include/Makefile.am'
--- a/storage/ndb/include/Makefile.am	2007-06-14 10:57:32 +0000
+++ b/storage/ndb/include/Makefile.am	2010-11-29 09:27:52 +0000
@@ -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.%

=== modified file 'storage/ndb/src/Makefile.am'
--- a/storage/ndb/src/Makefile.am	2007-01-20 00:58:03 +0000
+++ b/storage/ndb/src/Makefile.am	2010-11-29 09:27:52 +0000
@@ -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.%

=== modified file 'storage/ndb/src/common/Makefile.am'
--- a/storage/ndb/src/common/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/Makefile.am	2010-11-29 09:27:52 +0000
@@ -28,6 +28,3 @@ libcommon_la_LIBADD = \
               util/libgeneral.la 
 
 windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/ndb/src/common/debugger/Makefile.am'
--- a/storage/ndb/src/common/debugger/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/debugger/Makefile.am	2010-11-29 09:27:52 +0000
@@ -22,9 +22,6 @@ libtrace_la_SOURCES = SignalLoggerManage
 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 \

=== modified file 'storage/ndb/src/common/debugger/signaldata/Makefile.am'
--- a/storage/ndb/src/common/debugger/signaldata/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/debugger/signaldata/Makefile.am	2010-11-29 09:27:52 +0000
@@ -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 \

=== modified file 'storage/ndb/src/common/logger/Makefile.am'
--- a/storage/ndb/src/common/logger/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/logger/Makefile.am	2010-11-29 09:27:52 +0000
@@ -22,8 +22,6 @@ liblogger_la_SOURCES = $(SOURCE_WIN) Sys
 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 \

=== modified file 'storage/ndb/src/common/mgmcommon/Makefile.am'
--- a/storage/ndb/src/common/mgmcommon/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/mgmcommon/Makefile.am	2010-11-29 09:27:52 +0000
@@ -25,9 +25,6 @@ include $(top_srcdir)/storage/ndb/config
 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 \

=== modified file 'storage/ndb/src/common/portlib/Makefile.am'
--- a/storage/ndb/src/common/portlib/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/portlib/Makefile.am	2010-11-29 09:27:52 +0000
@@ -54,6 +54,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.%

=== modified file 'storage/ndb/src/common/transporter/Makefile.am'
--- a/storage/ndb/src/common/transporter/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/transporter/Makefile.am	2010-11-29 09:27:52 +0000
@@ -32,9 +32,6 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/n
 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 \

=== modified file 'storage/ndb/src/common/util/Makefile.am'
--- a/storage/ndb/src/common/util/Makefile.am	2010-04-01 11:19:15 +0000
+++ b/storage/ndb/src/common/util/Makefile.am	2010-11-29 09:27:52 +0000
@@ -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 \

=== modified file 'storage/ndb/src/cw/Makefile.am'
--- a/storage/ndb/src/cw/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/cw/Makefile.am	2010-11-29 09:27:52 +0000
@@ -16,6 +16,3 @@
 SUBDIRS = cpcd
 
 windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/ndb/src/cw/cpcd/Makefile.am'
--- a/storage/ndb/src/cw/cpcd/Makefile.am	2007-02-13 01:38:54 +0000
+++ b/storage/ndb/src/cw/cpcd/Makefile.am	2010-11-29 09:27:52 +0000
@@ -28,7 +28,4 @@ include $(top_srcdir)/storage/ndb/config
 
 ndb_cpcd_LDFLAGS = -static @ndb_bin_am_ldflags@
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp:

=== modified file 'storage/ndb/src/kernel/Makefile.am'
--- a/storage/ndb/src/kernel/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/kernel/Makefile.am	2010-11-29 09:27:52 +0000
@@ -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.%

=== modified file 'storage/ndb/src/kernel/blocks/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/kernel/blocks/Makefile.am	2010-11-29 09:27:52 +0000
@@ -64,10 +64,4 @@ ndb_print_file_LDFLAGS = @ndb_bin_am_ldf
 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.%

=== modified file 'storage/ndb/src/kernel/blocks/backup/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/backup/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/Makefile.am	2010-11-29 09:27:52 +0000
@@ -24,6 +24,3 @@ ndb_print_backup_file_LDFLAGS = @ndb_bin
 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.%
-

=== modified file 'storage/ndb/src/kernel/blocks/dbdict/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2010-11-29 09:27:52 +0000
@@ -30,6 +30,3 @@ ndb_print_schema_file_LDFLAGS = @ndb_bin
          $(top_builddir)/dbug/libdbug.a \
          $(top_builddir)/mysys/libmysys.a \
          $(top_builddir)/strings/libmystrings.a
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/ndb/src/kernel/blocks/dbdih/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2010-11-29 09:27:52 +0000
@@ -24,6 +24,3 @@ ndb_print_sys_file_LDFLAGS = @ndb_bin_am
 
 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.%

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2007-05-29 21:39:57 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2010-11-29 09:27:52 +0000
@@ -26,6 +26,3 @@ ndbd_redo_log_reader_LDFLAGS = @ndb_bin_
          $(top_builddir)/dbug/libdbug.a \
          $(top_builddir)/mysys/libmysys.a \
          $(top_builddir)/strings/libmystrings.a
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2010-11-29 09:27:52 +0000
@@ -23,6 +23,3 @@ test_varpage_LDFLAGS = @ndb_bin_am_ldfla
   $(top_builddir)/mysys/libmysys.a \
   $(top_builddir)/dbug/libdbug.a \
   $(top_builddir)/strings/libmystrings.a
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'storage/ndb/src/kernel/error/Makefile.am'
--- a/storage/ndb/src/kernel/error/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/kernel/error/Makefile.am	2010-11-29 09:27:52 +0000
@@ -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 \

=== modified file 'storage/ndb/src/kernel/vm/Makefile.am'
--- a/storage/ndb/src/kernel/vm/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/kernel/vm/Makefile.am	2010-11-29 09:27:52 +0000
@@ -43,9 +43,6 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/n
 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 \

=== modified file 'storage/ndb/src/mgmapi/Makefile.am'
--- a/storage/ndb/src/mgmapi/Makefile.am	2007-04-13 09:33:08 +0000
+++ b/storage/ndb/src/mgmapi/Makefile.am	2010-11-29 09:27:52 +0000
@@ -29,9 +29,6 @@ include $(top_srcdir)/storage/ndb/config
 
 #ndbtest_PROGRAMS = ndb_test_mgmapi
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp: libmgmapi.dsp
 
 libmgmapi.dsp: Makefile \

=== modified file 'storage/ndb/src/mgmclient/Makefile.am'
--- a/storage/ndb/src/mgmclient/Makefile.am	2007-08-01 07:24:01 +0000
+++ b/storage/ndb/src/mgmclient/Makefile.am	2010-11-29 09:27:52 +0000
@@ -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 \

=== modified file 'storage/ndb/src/mgmsrv/Makefile.am'
--- a/storage/ndb/src/mgmsrv/Makefile.am	2009-07-31 19:28:15 +0000
+++ b/storage/ndb/src/mgmsrv/Makefile.am	2010-11-29 09:27:52 +0000
@@ -57,9 +57,6 @@ include $(top_srcdir)/storage/ndb/config
 
 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 \

=== modified file 'storage/ndb/src/ndbapi/Makefile.am'
--- a/storage/ndb/src/ndbapi/Makefile.am	2007-04-11 13:51:09 +0000
+++ b/storage/ndb/src/ndbapi/Makefile.am	2010-11-29 09:27:52 +0000
@@ -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 \

=== modified file 'storage/ndb/test/Makefile.am'
--- a/storage/ndb/test/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/test/Makefile.am	2010-11-29 09:27:52 +0000
@@ -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.%

=== modified file 'storage/ndb/test/ndbapi/Makefile.am'
--- a/storage/ndb/test/ndbapi/Makefile.am	2008-01-18 21:55:02 +0000
+++ b/storage/ndb/test/ndbapi/Makefile.am	2010-11-29 09:27:52 +0000
@@ -125,10 +125,6 @@ testBackup_LDADD = $(LDADD) bank/libbank
 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

=== modified file 'storage/ndb/test/ndbapi/bank/Makefile.am'
--- a/storage/ndb/test/ndbapi/bank/Makefile.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/test/ndbapi/bank/Makefile.am	2010-11-29 09:27:52 +0000
@@ -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:

=== modified file 'storage/ndb/test/run-test/Makefile.am'
--- a/storage/ndb/test/run-test/Makefile.am	2009-10-13 18:21:42 +0000
+++ b/storage/ndb/test/run-test/Makefile.am	2010-11-29 09:27:52 +0000
@@ -51,7 +51,4 @@ wrappers_SCRIPTS=atrt-testBackup atrt-my
 
 EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) $(wrappers_SCRIPTS) README.ATRT atrt.hpp
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp:

=== modified file 'storage/ndb/test/src/Makefile.am'
--- a/storage/ndb/test/src/Makefile.am	2008-01-18 21:55:02 +0000
+++ b/storage/ndb/test/src/Makefile.am	2010-11-29 09:27:52 +0000
@@ -31,9 +31,6 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/n
 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 \

=== modified file 'storage/ndb/test/tools/Makefile.am'
--- a/storage/ndb/test/tools/Makefile.am	2007-11-14 12:28:45 +0000
+++ b/storage/ndb/test/tools/Makefile.am	2010-11-29 09:27:52 +0000
@@ -43,7 +43,4 @@ include $(top_srcdir)/storage/ndb/config
 ndb_cpcc_LDADD = $(LDADD)
 ndb_cpcc_LDFLAGS = -static
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
 windoze-dsp:

=== modified file 'storage/ndb/tools/Makefile.am'
--- a/storage/ndb/tools/Makefile.am	2007-04-24 20:43:13 +0000
+++ b/storage/ndb/tools/Makefile.am	2010-11-29 09:27:52 +0000
@@ -75,9 +75,6 @@ ndb_select_count_LDFLAGS = @ndb_bin_am_l
 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 \

=== modified file 'storage/xtradb/Makefile.am'
--- a/storage/xtradb/Makefile.am	2010-11-17 12:24:20 +0000
+++ b/storage/xtradb/Makefile.am	2010-11-29 09:27:52 +0000
@@ -339,6 +339,3 @@ ha_xtradb_la_SOURCES=	$(libxtradb_la_SOU
 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.%

=== modified file 'support-files/MacOSX/Makefile.am'
--- a/support-files/MacOSX/Makefile.am	2008-02-26 17:36:06 +0000
+++ b/support-files/MacOSX/Makefile.am	2010-11-29 09:27:52 +0000
@@ -52,6 +52,3 @@ SUFFIXES = .sh
 		-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
 	$< > $@-t
 	@MV@ $@-t $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'support-files/RHEL4-SElinux/Makefile.am'
--- a/support-files/RHEL4-SElinux/Makefile.am	2007-01-25 16:51:21 +0000
+++ b/support-files/RHEL4-SElinux/Makefile.am	2010-11-29 09:27:52 +0000
@@ -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.%

=== modified file 'unittest/examples/Makefile.am'
--- a/unittest/examples/Makefile.am	2010-06-10 11:15:35 +0000
+++ b/unittest/examples/Makefile.am	2010-11-29 09:27:52 +0000
@@ -22,6 +22,3 @@ LDADD              = -lmytap
 
 # We omit core-t here, since it will always fail.
 noinst_PROGRAMS    = simple-t skip-t todo-t skip_all-t no_plan-t
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'unittest/mysys/Makefile.am'
--- a/unittest/mysys/Makefile.am	2010-08-27 14:12:44 +0000
+++ b/unittest/mysys/Makefile.am	2010-11-29 09:27:52 +0000
@@ -25,6 +25,3 @@ LDADD 		= $(top_builddir)/unittest/mytap
 
 EXTRA_DIST       = CMakeLists.txt 
 noinst_PROGRAMS  = bitmap-t base64-t my_atomic-t lf-t waiting_threads-t
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'unittest/mytap/Makefile.am'
--- a/unittest/mytap/Makefile.am	2008-01-10 12:21:53 +0000
+++ b/unittest/mytap/Makefile.am	2010-11-29 09:27:52 +0000
@@ -23,6 +23,3 @@ libmytap_a_SOURCES = tap.c
 EXTRA_DIST         = CMakeLists.txt 
 
 SUBDIRS            = . t
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'unittest/mytap/t/Makefile.am'
--- a/unittest/mytap/t/Makefile.am	2007-05-28 20:18:51 +0000
+++ b/unittest/mytap/t/Makefile.am	2010-11-29 09:27:52 +0000
@@ -20,6 +20,3 @@ AM_LDFLAGS      = -L$(top_builddir)/unit
 LDADD           = -lmytap
 
 noinst_PROGRAMS = basic-t
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

=== modified file 'unittest/strings/Makefile.am'
--- a/unittest/strings/Makefile.am	2010-07-26 05:06:18 +0000
+++ b/unittest/strings/Makefile.am	2010-11-29 09:27:52 +0000
@@ -22,6 +22,3 @@ LDADD 		= $(top_builddir)/unittest/mytap
 		  $(top_builddir)/strings/libmystrings.a
 
 noinst_PROGRAMS  = strings-t
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%



More information about the commits mailing list