← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to extra/Makefile.am

  • Committer: Brian Aker
  • Date: 2008-07-18 20:10:26 UTC
  • mfrom: (51.3.29 remove-dbug)
  • Revision ID: brian@tangent.org-20080718201026-tto5golt0xhwqe4a
Merging in Jay's final patch on dbug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/Makefile.am
13
13
# along with this program; if not, write to the Free Software
14
14
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
15
15
 
16
 
if BUILD_DBUG
17
 
  d_dbug = $(top_builddir)/dbug/libdbuglt.la
18
 
endif
 
16
AM_CPPFLAGS =                   -I$(top_builddir)/include -I$(top_srcdir)/include \
 
17
                                                                        -I$(top_srcdir)/server
19
18
 
20
 
AM_CPPFLAGS =           -I$(top_builddir)/include -I$(top_srcdir)/include \
21
 
                        -I$(top_srcdir)/server
22
 
LDADD =                 $(top_builddir)/mysys/libmysyslt.la \
23
 
                        $(d_dbug) \
24
 
                        $(top_builddir)/strings/libmystringslt.la \
25
 
                        -lz
 
19
LDADD =                                         $(top_builddir)/mysys/libmysyslt.la \
 
20
                                $(top_builddir)/strings/libmystringslt.la \
 
21
                                                                        -lz
26
22
 
27
23
BUILT_SOURCES=          $(top_builddir)/include/mysqld_error.h \
28
 
                        $(top_builddir)/include/sql_state.h \
29
 
                        $(top_builddir)/include/mysqld_ername.h
 
24
                  $(top_builddir)/include/sql_state.h \
 
25
                  $(top_builddir)/include/mysqld_ername.h
 
26
 
30
27
pkginclude_HEADERS=     $(BUILT_SOURCES)
 
28
 
31
29
DISTCLEANFILES =        $(BUILT_SOURCES) comp_err
 
30
 
32
31
SUBDIRS =               
 
32
 
33
33
DIST_SUBDIRS =          
34
34
 
35
35
# This will build mysqld_error.h, mysqld_ername.h and sql_state.h
45
45
        --name_file=$(top_builddir)/include/mysqld_ername.h \
46
46
        --state_file=$(top_builddir)/include/sql_state.h \
47
47
        --in_file=$(top_srcdir)/server/share/errmsg.txt
 
48
 
48
49
$(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
49
50
$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
50
51
 
51
 
bin_PROGRAMS =          my_print_defaults \
52
 
                        mysql_waitpid innochecksum
 
52
bin_PROGRAMS =                  my_print_defaults \
 
53
                                                                                mysql_waitpid \
 
54
                                                                                innochecksum
 
55
 
53
56
noinst_PROGRAMS =       
 
57
 
54
58
EXTRA_PROGRAMS =        comp_err