← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to scripts/Makefile.am

  • Committer: Monty Taylor
  • Date: 2008-07-02 13:07:35 UTC
  • mto: (28.2.1 packaging)
  • mto: This revision was merged to the branch mainline in revision 51.
  • Revision ID: monty@inaugust.com-20080702130735-4ok4lzi8bzyvsh31
Removed ZLIB references and the craziness of whether to build the server or not.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/Makefile.am
16
16
## Process this file with automake to create Makefile.in
17
17
 
18
18
 
19
 
bin_SCRIPTS =           @server_scripts@ \
 
19
bin_SCRIPTS =           mysqld_safe \
 
20
                        mysql_install_db \
20
21
                        mysql_config \
21
22
                        mysql_fix_extensions \
22
23
                        mysql_convert_table_format \
48
49
                        mysql_system_tables.sql \
49
50
                        mysql_test_data_timezone.sql
50
51
 
51
 
CLEANFILES =            @server_scripts@ \
 
52
CLEANFILES =            mysqld_safe \
 
53
                        mysql_install_db \
52
54
                        make_binary_distribution \
53
55
                        make_sharedlib_distribution \
54
56
                        mysql_config \
102
104
          -e 's!@''CXXFLAGS''@!@CXXFLAGS@!'\
103
105
          -e 's!@''LDFLAGS''@!@LDFLAGS@!'\
104
106
          -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
105
 
          -e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \
106
107
          -e 's!@''LIBS''@!@LIBS@!' \
107
108
          -e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \
108
109
          -e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
124
125
          -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
125
126
          -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
126
127
          -e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \
127
 
          -e 's!@''NON_THREADED_LIBS''@!@NON_THREADED_LIBS@!' \
128
 
          -e 's!@''ZLIB_DEPS''@!@ZLIB_DEPS@!' \
129
128
          -e "s!@MAKE@!$(MAKE)!" \
130
129
        $< > $@-t
131
130
        @CHMOD@ +x $@-t