← Back to branch summary

~linuxjedi/drizzle/trunk-bug-733587

« back to all changes in this revision

Viewing changes to include/Makefile.am

  • Committer: Brian Aker
  • Date: 2008-07-27 21:07:26 UTC
  • Revision ID: brian@tangent.org-20080727210726-zxwx10dy0w55qswh
Rename of fields (fix issue with string and decimal .h clashing).

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/Makefile.am
71
71
                        base64.h \
72
72
                        drizzle_version.h.in \
73
73
                        my_handler.h \
74
 
                        my_time.h \
75
 
                        drizzle/server/field/blob.h \
76
 
                        drizzle/server/field/date.h \
77
 
                        drizzle/server/field/datetime.h \
78
 
                        drizzle/server/field/decimal.h \
79
 
                        drizzle/server/field/double.h \
80
 
                        drizzle/server/field/int64_t.h \
81
 
                        drizzle/server/field/long.h \
82
 
                        drizzle/server/field/null.h \
83
 
                        drizzle/server/field/set.h \
84
 
                        drizzle/server/field/short.h \
85
 
                        drizzle/server/field/string.h \
86
 
                        drizzle/server/field/timestamp.h \
87
 
                        drizzle/server/field/timetype.h \
88
 
                        drizzle/server/field/varstring.h \
89
 
                        drizzle/server/field/year.h
 
74
                        my_time.h
90
75
 
91
76
LDADD = $(top_builddir)/mysys/libmysyslt.la \
92
77
        $(top_builddir)/strings/libmystringslt.la $(ZLIB_LIBS)
93
78
 
94
79
EXTRA_PROGRAMS = comp_err
95
 
comperr_CFLAGS = -I${top_srcdir}/server
 
80
comperr_CFLAGS = -I${top_srcdir}/drizzled
96
81
 
97
82
# This will build mysqld_error.h, mysqld_ername.h and sql_state.h
98
83
# NOTE Built files should depend on their sources to avoid
99
84
# the built files being rebuilt in source dist
100
 
mysqld_error.h: comp_err$(EXEEXT) $(top_srcdir)/server/share/errmsg.txt
 
85
mysqld_error.h: comp_err$(EXEEXT) $(top_srcdir)/drizzled/share/errmsg.txt
101
86
        $(top_builddir)/include/comp_err$(EXEEXT) \
102
 
        --charset=$(top_srcdir)/server/share/charsets \
103
 
        --out-dir=$(top_builddir)/server/share/ \
 
87
        --charset=$(top_srcdir)/drizzled/share/charsets \
 
88
        --out-dir=$(top_builddir)/drizzled/share/ \
104
89
        --header_file=$(top_builddir)/include/mysqld_error.h \
105
90
        --name_file=$(top_builddir)/include/mysqld_ername.h \
106
91
        --state_file=$(top_builddir)/include/sql_state.h \
107
 
        --in_file=$(top_srcdir)/server/share/errmsg.txt
 
92
        --in_file=$(top_srcdir)/drizzled/share/errmsg.txt
108
93
 
109
94
mysqld_ername.h: mysqld_error.h
110
95
sql_state.h: mysqld_error.h