← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to extra/Makefile.am

  • Committer: Stewart Smith
  • Date: 2008-07-07 02:40:36 UTC
  • mto: This revision was merged to the branch mainline in revision 111.
  • Revision ID: stewart@flamingspork.com-20080707024036-evzdmi8fjvcxm1lb
sql => server (initial patch)

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/Makefile.am
18
18
endif
19
19
 
20
20
AM_CPPFLAGS =           -I$(top_builddir)/include -I$(top_srcdir)/include \
21
 
                        -I$(top_srcdir)/sql
 
21
                        -I$(top_srcdir)/server
22
22
LDADD =                 $(top_builddir)/mysys/libmysyslt.la \
23
23
                        $(d_dbug) \
24
24
                        $(top_builddir)/strings/libmystringslt.la \
36
36
# NOTE Built files should depend on their sources to avoid
37
37
# the built files being rebuilt in source dist
38
38
$(top_builddir)/include/mysqld_error.h: comp_err.c \
39
 
                        $(top_srcdir)/sql/share/errmsg.txt
 
39
                        $(top_srcdir)/server/share/errmsg.txt
40
40
        $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
41
41
        $(top_builddir)/extra/comp_err$(EXEEXT) \
42
 
        --charset=$(top_srcdir)/sql/share/charsets \
43
 
        --out-dir=$(top_builddir)/sql/share/ \
 
42
        --charset=$(top_srcdir)/server/share/charsets \
 
43
        --out-dir=$(top_builddir)/server/share/ \
44
44
        --header_file=$(top_builddir)/include/mysqld_error.h \
45
45
        --name_file=$(top_builddir)/include/mysqld_ername.h \
46
46
        --state_file=$(top_builddir)/include/sql_state.h \
47
 
        --in_file=$(top_srcdir)/sql/share/errmsg.txt
 
47
        --in_file=$(top_srcdir)/server/share/errmsg.txt
48
48
$(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
49
49
$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
50
50