← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to scripts/Makefile.am

  • Committer: Brian Aker
  • Date: 2008-07-02 21:31:48 UTC
  • mfrom: (28.1.41 libtool-patch)
  • Revision ID: brian@tangent.org-20080702213148-pc4f4hjt5c9qvp00
Merge from Monty Taylor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/Makefile.am
15
15
 
16
16
## Process this file with automake to create Makefile.in
17
17
 
18
 
BUILT_SOURCES = mysql_fix_privilege_tables.sql \
19
 
                mysql_fix_privilege_tables_sql.c
20
 
 
21
 
EXTRA_PROGRAMS =        comp_sql
22
 
 
23
 
bin_SCRIPTS =           @server_scripts@ \
24
 
                        msql2mysql \
 
18
 
 
19
bin_SCRIPTS =           mysqld_safe \
 
20
                        mysql_install_db \
25
21
                        mysql_config \
26
 
                        mysql_fix_privilege_tables \
27
22
                        mysql_fix_extensions \
28
 
                        mysql_setpermission \
29
 
                        mysql_secure_installation \
30
 
                        mysql_zap \
31
 
                        mysqlaccess \
32
 
                        mysqlbug \
33
23
                        mysql_convert_table_format \
34
24
                        mysql_find_rows \
35
25
                        mysqlhotcopy \
41
31
 
42
32
EXTRA_SCRIPTS =         make_binary_distribution.sh \
43
33
                        make_sharedlib_distribution.sh \
44
 
                        msql2mysql.sh \
45
34
                        mysql_config.sh \
46
35
                        mysql_config.pl.in \
47
 
                        mysql_fix_privilege_tables.sh \
48
36
                        mysql_fix_extensions.sh \
49
37
                        mysql_install_db.sh \
50
 
                        mysql_install_db.pl.in \
51
 
                        mysql_setpermission.sh \
52
 
                        mysql_secure_installation.sh \
53
 
                        mysql_secure_installation.pl.in \
54
 
                        mysql_zap.sh \
55
 
                        mysqlaccess.sh \
56
 
                        mysqlbug.sh \
57
38
                        mysql_convert_table_format.sh \
58
39
                        mysql_find_rows.sh \
59
40
                        mysqlhotcopy.sh \
62
43
                        mysqld_safe.sh
63
44
 
64
45
EXTRA_DIST =            $(EXTRA_SCRIPTS) \
65
 
                        mysqlaccess.conf \
66
 
                        mysqlbug \
67
 
                        make_win_bin_dist \
68
 
                        mysql_fix_privilege_tables_sql.c \
69
46
                        mysql_system_tables_fix.sql
70
47
 
71
48
dist_pkgdata_DATA =     fill_help_tables.sql \
72
 
                        mysql_fix_privilege_tables.sql \
73
49
                        mysql_system_tables.sql \
74
 
                        mysql_system_tables_data.sql \
75
50
                        mysql_test_data_timezone.sql
76
51
 
77
 
CLEANFILES =            @server_scripts@ \
78
 
                        comp_sql \
 
52
CLEANFILES =            mysqld_safe \
 
53
                        mysql_install_db \
79
54
                        make_binary_distribution \
80
55
                        make_sharedlib_distribution \
81
 
                        msql2mysql \
82
56
                        mysql_config \
83
 
                        mysql_fix_privilege_tables \
84
57
                        mysql_fix_extensions \
85
 
                        mysql_setpermission \
86
 
                        mysql_secure_installation \
87
 
                        mysql_zap \
88
 
                        mysqlaccess \
89
58
                        mysql_convert_table_format \
90
59
                        mysql_find_rows \
91
60
                        mysqlhotcopy \
97
66
# Default same as 'pkgdatadir', but we can override it
98
67
pkgsuppdir =            $(datadir)/@PACKAGE@
99
68
 
100
 
# mysqlbug should be distributed built so that people can report build
101
 
# failures with it.
102
 
DISTCLEANFILES =        $(BUILT_SOURCES) mysqlbug
103
 
 
104
 
# We want the right version and configure comand line in mysqlbug
105
 
mysqlbug: ${top_builddir}/config.status mysqlbug.sh
106
 
 
107
 
# Build mysql_fix_privilege_tables.sql from the files that contain
108
 
# the system tables for this version of MySQL plus any commands
109
 
# needed to upgrade the system tables from an older version
110
 
mysql_fix_privilege_tables.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \
111
 
                                $(top_srcdir)/scripts/mysql_system_tables_fix.sql
112
 
        @echo "Building $@";
113
 
        @cat $(srcdir)/mysql_system_tables.sql $(srcdir)/mysql_system_tables_fix.sql > $@
114
 
 
115
 
 
116
 
#
117
 
# Build mysql_fix_privilege_tables_sql.c from
118
 
# mysql_fix_privileges_tables.sql using comp_sql
119
 
# The "sleep" ensures the generated file has a younger timestamp than its source
120
 
# (which may have been generated in this very same "make" run).
121
 
#
122
 
mysql_fix_privilege_tables_sql.c: $(builddir)/comp_sql$(EXEEXT) mysql_fix_privilege_tables.sql
123
 
        $(builddir)/comp_sql$(EXEEXT) \
124
 
          mysql_fix_privilege_tables \
125
 
            $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
126
 
 
127
69
 
128
70
SUFFIXES = .sh
129
71
 
162
104
          -e 's!@''CXXFLAGS''@!@CXXFLAGS@!'\
163
105
          -e 's!@''LDFLAGS''@!@LDFLAGS@!'\
164
106
          -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
165
 
          -e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \
166
107
          -e 's!@''LIBS''@!@LIBS@!' \
167
108
          -e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \
168
109
          -e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
184
125
          -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
185
126
          -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
186
127
          -e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \
187
 
          -e 's!@''NON_THREADED_LIBS''@!@NON_THREADED_LIBS@!' \
188
 
          -e 's!@''ZLIB_DEPS''@!@ZLIB_DEPS@!' \
189
128
          -e "s!@MAKE@!$(MAKE)!" \
190
129
        $< > $@-t
191
130
        @CHMOD@ +x $@-t