Skip to content

Commit 091bcac

Browse files
author
Alexander Nozdrin
committed
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.
1 parent 2f7945b commit 091bcac

File tree

92 files changed

+1
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1
-288
lines changed

BUILD/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,3 @@ EXTRA_DIST = FINISH.sh \
7878
compile-solaris-sparc-debug \
7979
compile-solaris-sparc-forte \
8080
compile-solaris-sparc-purify
81-
82-
# Don't update the files from bitkeeper
83-
%::SCCS/s.%

Docs/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,3 @@ uninstall-local:
3737
@RM@ -f $(DESTDIR)$(infodir)/mysql.info ; \
3838
@RM@ -f $(DESTDIR)$(pkgdatadir)/ChangeLog ; \
3939
fi
40-
41-
# Don't update the files from bitkeeper
42-
%::SCCS/s.%

Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,3 @@ do_abi_check:
328328
@DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \
329329
@RM@ $(top_builddir)/abi_check.out; \
330330
done
331-
332-
# Don't update the files from bitkeeper
333-
%::SCCS/s.%

client/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,3 @@ link_sources:
124124
rm -f $(srcdir)/my_user.c; \
125125
@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
126126
echo timestamp > link_sources;
127-
128-
# Don't update the files from bitkeeper
129-
%::SCCS/s.%

cmd-line-utils/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,3 @@
1919

2020
SUBDIRS= @readline_basedir@
2121
DIST_SUBDIRS= libedit readline
22-
23-
# Don't update the files from bitkeeper
24-
%::SCCS/s.%

cmd-line-utils/readline/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,3 @@ noinst_HEADERS = readline.h chardefs.h keymaps.h \
3232
EXTRA_DIST= emacs_keymap.c vi_keymap.c CMakeLists.txt
3333

3434
DEFS = -DMYSQL_CLIENT_NO_THREADS -DHAVE_CONFIG_H -DNO_KILL_INTR
35-
36-
# Don't update the files from bitkeeper
37-
%::SCCS/s.%

extra/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,3 @@ EXTRA_DIST = CMakeLists.txt
5555

5656
perror.o: perror.c
5757
$(COMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
58-
59-
# Don't update the files from bitkeeper
60-
%::SCCS/s.%

extra/yassl/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
SUBDIRS = taocrypt src testsuite
22
EXTRA_DIST = CMakeLists.txt
3-
4-
# Don't update the files from bitkeeper
5-
%::SCCS/s.%

extra/yassl/src/Makefile.am

-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,3 @@ libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \
66
template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp
77
EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h)
88
AM_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX
9-
10-
# Don't update the files from bitkeeper
11-
%::SCCS/s.%
12-

extra/yassl/taocrypt/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
SUBDIRS = src test benchmark
22
EXTRA_DIST = CMakeLists.txt $(wildcard mySTL/*.hpp)
3-
4-
# Don't update the files from bitkeeper
5-
%::SCCS/s.%

extra/yassl/taocrypt/benchmark/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@ benchmark_SOURCES = benchmark.cpp
44
benchmark_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
55
benchmark_CXXFLAGS = -DYASSL_PURE_C
66
EXTRA_DIST = benchmark.dsp rsa1024.der dh1024.der dsa1024.der make.bat
7-
8-
# Don't update the files from bitkeeper
9-
%::SCCS/s.%

extra/yassl/taocrypt/src/Makefile.am

-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,3 @@ libtaocrypt_la_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp \
1111
libtaocrypt_la_CXXFLAGS = @yassl_taocrypt_extra_cxxflags@ -DYASSL_PURE_C
1212

1313
EXTRA_DIST = $(wildcard ../include/*.hpp)
14-
15-
# Don't update the files from bitkeeper
16-
%::SCCS/s.%
17-

extra/yassl/taocrypt/test/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@ test_SOURCES = test.cpp
44
test_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
55
test_CXXFLAGS = -DYASSL_PURE_C
66
EXTRA_DIST = make.bat
7-
8-
# Don't update the files from bitkeeper
9-
%::SCCS/s.%

extra/yassl/testsuite/Makefile.am

-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,3 @@ testsuite_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX -DNO_MAIN_DRIVER
88
testsuite_LDADD = $(top_builddir)/extra/yassl/src/libyassl.la \
99
$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
1010
EXTRA_DIST = testsuite.dsp test.hpp input quit make.bat
11-
12-
# Don't update the files from bitkeeper
13-
%::SCCS/s.%
14-

include/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,3 @@ endif
9696

9797
probes_mysql_nodtrace.h: $(DTRACEPROVIDER)
9898
@PERL@ $(top_srcdir)/scripts/dheadgen.pl -f $(DTRACEPROVIDER) > $@
99-
100-
# Don't update the files from bitkeeper
101-
%::SCCS/s.%

libmysql/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,3 @@ do-lib-dist:
113113
echo ' $$(AR) r $$@ $$?' >>$$dir/Makefile; \
114114
gtar cvzf $$dir.tar.gz $$dir; \
115115
cd $$dir; gmake
116-
117-
# Don't update the files from bitkeeper
118-
%::SCCS/s.%

libmysql/Makefile.shared

-3
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,3 @@ conf_to_src_LDADD=
116116
#force static linking of conf_to_src - essential when linking against
117117
#custom installation of libc
118118
conf_to_src_LDFLAGS=@NOINST_LDFLAGS@
119-
120-
# Don't update the files from bitkeeper
121-
%::SCCS/s.%

libmysql_r/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,3 @@ link_sources:
4444
done; \
4545
done
4646
echo timestamp > link_sources
47-
48-
# Don't update the files from bitkeeper
49-
%::SCCS/s.%

libmysqld/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,3 @@ link_sources:
234234
clean-local:
235235
rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlstoragesources) $(storagesources) | sed "s;\.lo;.c;g"`; \
236236
rm -f client_settings.h
237-
238-
# Don't update the files from bitkeeper
239-
%::SCCS/s.%

libmysqld/examples/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,3 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
5050

5151
mysql_client_test_embedded_LINK = $(CXXLINK)
5252
nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c
53-
54-
# Don't update the files from bitkeeper
55-
%::SCCS/s.%

man/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,3 @@ EXTRA_DIST = $(man1_MANS) $(man8_MANS) CMakeLists.txt
2424
# "make_win_*" are not needed in Unix binary packages,
2525
install-data-hook:
2626
rm -f $(DESTDIR)$(mandir)/man1/make_win_*
27-
28-
# Don't update the files from bitkeeper
29-
%::SCCS/s.%

mysql-test/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,3 @@ mtr:
148148
mysql-test-run:
149149
$(RM) -f mysql-test-run
150150
$(LN_S) mysql-test-run.pl mysql-test-run
151-
152-
# Don't update the files from bitkeeper
153-
%::SCCS/s.%

mysql-test/lib/My/SafeProcess/Makefile.am

-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,3 @@ my_safe_process_SOURCES = safe_process.cc
2323
EXTRA_DIST = safe_kill_win.cc \
2424
safe_process_win.cc \
2525
CMakeLists.txt
26-
27-
28-
# Don't update the files from bitkeeper
29-
%::SCCS/s.%

mysys/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,3 @@ probes_mysql.d:
159159
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
160160
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
161161
endif
162-
163-
# Don't update the files from bitkeeper
164-
%::SCCS/s.%

netware/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,3 @@ test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql
115115
@echo "Building $@";
116116
@cat init_db.sql \
117117
$(top_srcdir)/scripts/mysql_test_data_timezone.sql > $@;
118-
119-
# Don't update the files from bitkeeper
120-
%::SCCS/s.%

plugin/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,3 @@ DIST_SUBDIRS = @mysql_pg_distdirs@
2828
install-exec-hook:
2929
$(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkglibdir)/plugin
3030
test ! -d debug || $(TAR) cf - debug | ( cd $(DESTDIR)$(pkglibdir)/plugin && $(TAR) xvf - )
31-
32-
# Don't update the files from bitkeeper
33-
%::SCCS/s.%

plugin/daemon_example/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,3 @@ libdaemon_example_a_CXXFLAGS = $(AM_CFLAGS)
3939
libdaemon_example_a_CFLAGS = $(AM_CFLAGS)
4040
libdaemon_example_a_SOURCES= daemon_example.cc
4141
EXTRA_DIST = CMakeLists.txt
42-
43-
# Don't update the files from bitkeeper
44-
%::SCCS/s.%

plugin/fulltext/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,3 @@ mypluglib_la_SOURCES= plugin_example.c
2323
mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir)
2424
mypluglib_la_CFLAGS= -DMYSQL_DYNAMIC_PLUGIN
2525
EXTRA_DIST= CMakeLists.txt
26-
27-
# Don't update the files from bitkeeper
28-
%::SCCS/s.%

pstack/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,3 @@ libpstack_a_SOURCES = bucomm.c filemode.c linuxthreads.c rddbg.c \
2727
debug.c ieee.c pstack.c stabs.c
2828
noinst_HEADERS = bucomm.h debug.h ieee.h budbg.h demangle.h \
2929
linuxthreads.h pstack.h pstacktrace.h
30-
31-
# Don't update the files from bitkeeper
32-
%::SCCS/s.%

pstack/aout/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
11
noinst_HEADERS = aout64.h stab.def stab_gnu.h
2-
3-
# Don't update the files from bitkeeper
4-
%::SCCS/s.%

regex/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,3 @@ test: re tests
3131
./re < tests
3232
./re -el < tests
3333
./re -er < tests
34-
35-
# Don't update the files from bitkeeper
36-
%::SCCS/s.%

scripts/Makefile.am

-4
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,3 @@ SUFFIXES = .sh
190190
$< > $@-t
191191
@CHMOD@ +x $@-t
192192
@MV@ $@-t $@
193-
194-
195-
# Don't update the files from bitkeeper
196-
%::SCCS/s.%

sql-bench/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,3 @@ SUFFIXES = .sh
8181
$< > $@-t
8282
@CHMOD@ +x $@-t
8383
@MV@ $@-t $@
84-
85-
# Don't update the files from bitkeeper
86-
%::SCCS/s.%

sql-common/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,3 @@
1515

1616
## Process this file with automake to create Makefile.in
1717
EXTRA_DIST = client.c pack.c my_time.c my_user.c
18-
19-
# Don't update the files from bitkeeper
20-
%::SCCS/s.%

sql/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,3 @@ probes_libndb.o: probes_mysql.d libndb_la-ha_ndbcluster.lo
271271
fi
272272

273273
endif
274-
275-
# Don't update the files from bitkeeper
276-
%::SCCS/s.%

sql/share/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,3 @@ distclean-local:
5858

5959
# Do nothing
6060
link_sources:
61-
62-
# Don't update the files from bitkeeper
63-
%::SCCS/s.%

storage/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,3 @@ AUTOMAKE_OPTIONS = foreign
2020
# These are built from source in the Docs directory
2121
SUBDIRS = @mysql_se_dirs@
2222
DIST_SUBDIRS = @mysql_se_distdirs@
23-
24-
# Don't update the files from bitkeeper
25-
%::SCCS/s.%

storage/archive/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,3 @@ probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
102102
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
103103

104104
endif
105-
106-
# Don't update the files from bitkeeper
107-
%::SCCS/s.%

storage/blackhole/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,3 @@ probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
8383
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
8484

8585
endif
86-
87-
# Don't update the files from bitkeeper
88-
%::SCCS/s.%

storage/csv/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,3 @@ probes_mysql.d:
6262
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
6363
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
6464
endif
65-
66-
# Don't update the files from bitkeeper
67-
%::SCCS/s.%

storage/example/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,3 @@ probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
8383
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
8484

8585
endif
86-
87-
# Don't update the files from bitkeeper
88-
%::SCCS/s.%

storage/federated/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,3 @@ probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
8484
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
8585

8686
endif
87-
88-
# Don't update the files from bitkeeper
89-
%::SCCS/s.%

storage/heap/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,3 @@ probes_mysql.d:
7171
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
7272
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
7373
endif
74-
75-
# Don't update the files from bitkeeper
76-
%::SCCS/s.%

storage/ibmdb2i/Makefile.am

-2
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,3 @@ libibmdb2i_a_SOURCES= $(ha_ibmdb2i_la_SOURCES)
5050

5151

5252
EXTRA_DIST = CMakeLists.txt plug.in
53-
# Don't update the files from bitkeeper
54-
%::SCCS/s.%

storage/innobase/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,3 @@ ha_innodb_la_SOURCES= $(libinnobase_a_SOURCES)
337337
EXTRA_DIST= CMakeLists.txt plug.in \
338338
pars/make_bison.sh pars/make_flex.sh \
339339
pars/pars0grm.y pars/pars0lex.l
340-
341-
# Don't update the files from bitkeeper
342-
%::SCCS/s.%

storage/myisam/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,3 @@ probes_mysql.d:
170170
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
171171
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
172172
endif
173-
174-
# Don't update the files from bitkeeper
175-
%::SCCS/s.%

storage/myisammrg/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,3 @@ probes_mysql.d:
6060
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
6161
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
6262
endif
63-
64-
# Don't update the files from bitkeeper
65-
%::SCCS/s.%

storage/ndb/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,3 @@ all-windoze-dsp: windoze
4444
find . -name '*.dsp' | grep -v SCCS | xargs unix2dos
4545
$(top_srcdir)/storage/ndb/config/make-win-dsw.sh | unix2dos > ndb.dsw
4646
tar cvfz ndb-win-dsp.tar.gz ndb.dsw `find . -name '*.dsp' | grep -v SCCS`
47-
48-
# Don't update the files from bitkeeper
49-
%::SCCS/s.%

storage/ndb/docs/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,3 @@ testdoc: DUMMY
127127
cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test
128128

129129
windoze-dsp:
130-
131-
# Don't update the files from bitkeeper
132-
%::SCCS/s.%

storage/ndb/include/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,3 @@ dist-hook:
6363
-rm -rf `find $(distdir) -type d -name SCCS`
6464

6565
windoze-dsp:
66-
67-
# Don't update the files from bitkeeper
68-
%::SCCS/s.%

storage/ndb/src/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,3 @@ libndbclient.dsp: Makefile \
4848
@$(top_srcdir)/storage/ndb/config/win-sources $@ dummy.cpp
4949
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD)
5050
@touch dummy.cpp
51-
52-
# Don't update the files from bitkeeper
53-
%::SCCS/s.%

storage/ndb/src/common/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,3 @@ libcommon_la_LIBADD = \
2828
util/libgeneral.la
2929

3030
windoze-dsp:
31-
32-
# Don't update the files from bitkeeper
33-
%::SCCS/s.%

storage/ndb/src/common/debugger/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp E
2222
include $(top_srcdir)/storage/ndb/config/common.mk.am
2323
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
2424

25-
# Don't update the files from bitkeeper
26-
%::SCCS/s.%
27-
2825
windoze-dsp: libtrace.dsp
2926

3027
libtrace.dsp: Makefile \

storage/ndb/src/common/debugger/signaldata/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ libsignaldataprint_la_SOURCES = \
4343
include $(top_srcdir)/storage/ndb/config/common.mk.am
4444
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
4545

46-
# Don't update the files from bitkeeper
47-
%::SCCS/s.%
48-
4946
windoze-dsp: libsignaldataprint.dsp
5047

5148
libsignaldataprint.dsp: Makefile \

storage/ndb/src/common/logger/Makefile.am

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ liblogger_la_SOURCES = $(SOURCE_WIN) SysLogHandler.cpp
2222
include $(top_srcdir)/storage/ndb/config/common.mk.am
2323
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
2424

25-
# Don't update the files from bitkeeper
26-
%::SCCS/s.%
2725
windoze-dsp: liblogger.dsp
2826

2927
liblogger.dsp: Makefile \

0 commit comments

Comments
 (0)