← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Monty Taylor
  • Date: 2009-12-23 21:16:15 UTC
  • mto: This revision was merged to the branch mainline in revision 1253.
  • Revision ID: mordred@inaugust.com-20091223211615-2d86z9aqztotcqb8
Moved remaining non-public portions of mysys and mystrings to drizzled/internal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
55
55
MAINTAINERCLEANFILES=   autom4te.cache
56
56
 
57
57
CLIENT_LDADD=\
58
 
                mysys/libmysys.la \
59
 
                mystrings/libmystrings.la \
 
58
                drizzled/internal/libinternal.la \
60
59
                $(LIBDRIZZLE) $(LIBINTL) $(LIBZ) \
61
60
                client/libgetpassword.la
62
61
 
63
62
noinst_LTLIBRARIES+= \
64
 
                client/libgetpassword.la \
65
 
                mysys/libmysys.la \
66
 
                mystrings/libmystrings.la
 
63
                client/libgetpassword.la
67
64
 
68
65
noinst_PROGRAMS+=\
69
66
                client/drizzletest \
84
81
 
85
82
client_libgetpassword_la_SOURCES= client/get_password.cc
86
83
 
87
 
noinst_HEADERS+=        \
 
84
noinst_HEADERS+=\
88
85
                client/client_priv.h \
89
86
                client/errname.h \
90
87
                client/get_password.h \
91
88
                client/linebuffer.h \
92
 
                drizzled/configmake.h \
93
 
                mystrings/m_string.h \
94
 
                mystrings/my_uctype.h \
95
 
                mystrings/t_ctype.h \
96
 
                mystrings/utf8.h \
97
 
                mysys/aio_result.h \
98
 
                mysys/iocache.h \
99
 
                mysys/my_bit.h \
100
 
                mysys/my_dir.h \
101
 
                mysys/my_pthread.h \
102
 
                mysys/my_static.h \
103
 
                mysys/my_sys.h \
104
 
                mysys/mysys_priv.h
105
 
 
106
 
mystrings_libmystrings_la_SOURCES= \
107
 
                mystrings/bmove_upp.cc \
108
 
                mystrings/ctype-bin.cc \
109
 
                mystrings/ctype-mb.cc \
110
 
                mystrings/ctype-simple.cc \
111
 
                mystrings/ctype-uca.cc \
112
 
                mystrings/ctype-utf8.cc \
113
 
                mystrings/ctype.cc \
114
 
                mystrings/dtoa.cc \
115
 
                mystrings/int2str.cc \
116
 
                mystrings/llstr.cc \
117
 
                mystrings/longlong2str.cc \
118
 
                mystrings/my_strtoll10.cc
119
 
 
120
 
mysys_libmysys_la_LIBADD= \
121
 
                drizzled/libcharset.la \
122
 
                drizzled/libcached_directory.la \
123
 
                drizzled/libdynamic_array.la \
124
 
                drizzled/liberror.la \
125
 
                drizzled/libgetopt.la \
126
 
                drizzled/libmemory.la \
127
 
                drizzled/libtypelib.la
128
 
mysys_libmysys_la_SOURCES= \
129
 
                mysys/checksum.cc \
130
 
                mysys/default.cc \
131
 
                mysys/mf_arr_appstr.cc \
132
 
                mysys/mf_cache.cc \
133
 
                mysys/mf_dirname.cc \
134
 
                mysys/mf_fn_ext.cc \
135
 
                mysys/mf_format.cc \
136
 
                mysys/mf_getdate.cc \
137
 
                mysys/mf_iocache.cc \
138
 
                mysys/mf_loadpath.cc \
139
 
                mysys/mf_pack.cc \
140
 
                mysys/mf_qsort.cc \
141
 
                mysys/mf_qsort2.cc \
142
 
                mysys/mf_radix.cc \
143
 
                mysys/mf_same.cc \
144
 
                mysys/mf_sort.cc \
145
 
                mysys/mf_tempfile.cc \
146
 
                mysys/mf_wcomp.cc \
147
 
                mysys/my_access.cc \
148
 
                mysys/my_bit.cc \
149
 
                mysys/my_copy.cc \
150
 
                mysys/my_create.cc \
151
 
                mysys/my_delete.cc \
152
 
                mysys/my_getsystime.cc \
153
 
                mysys/my_init.cc \
154
 
                mysys/my_lib.cc \
155
 
                mysys/my_open.cc \
156
 
                mysys/my_read.cc \
157
 
                mysys/my_redel.cc \
158
 
                mysys/my_rename.cc \
159
 
                mysys/my_static.cc \
160
 
                mysys/my_symlink.cc \
161
 
                mysys/my_symlink2.cc \
162
 
                mysys/my_sync.cc \
163
 
                mysys/my_thr_init.cc \
164
 
                mysys/my_write.cc \
165
 
                mysys/ptr_cmp.cc
 
89
                drizzled/configmake.h
 
90
 
166
91
 
167
92
client_drizzle_SOURCES=         client/drizzle.cc client/linebuffer.cc
168
93
client_drizzle_LDADD=           ${CLIENT_LDADD} ${READLINE_LIBS}
185
110
 
186
111
extra_my_print_defaults_SOURCES= extra/my_print_defaults.cc
187
112
extra_my_print_defaults_LDADD= \
188
 
                $(top_builddir)/mysys/libmysys.la \
189
 
                $(top_builddir)/mystrings/libmystrings.la \
 
113
                drizzled/internal/libinternal.la
190
114
                $(LIBINTL)
191
115
 
192
116
EXTRA_DIST+=    ${man_MANS}
265
189
include config/lint-source.am
266
190
 
267
191
include drizzled/include.am
 
192
include drizzled/internal/include.am
268
193
include drizzled/hash/include.am
269
194
include drizzled/util/include.am
270
195
include drizzled/message/include.am