← 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 08:01:21 UTC
  • mto: This revision was merged to the branch mainline in revision 1253.
  • Revision ID: mordred@inaugust.com-20091223080121-iveugdrewkp7iqyi
Oy. Bigger change than I normally like - but this stuff is all intertwined.
Moved a bunch of things to public drizzled/ area. Split some files. Made some
convenience libs. EVENTUALLY, some of this will be able to be re-factored, but
for now I'm ok with erring on the side of too many files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
54
54
 
55
55
MAINTAINERCLEANFILES=   autom4te.cache
56
56
 
57
 
CLIENT_LDADD=           mysys/libmysys.la \
58
 
                        mystrings/libmystrings.la \
59
 
                        $(LIBDRIZZLE) $(LIBINTL) $(LIBZ) \
60
 
                        client/libgetpassword.la
 
57
CLIENT_LDADD=\
 
58
                mysys/libmysys.la \
 
59
                mystrings/libmystrings.la \
 
60
                $(LIBDRIZZLE) $(LIBINTL) $(LIBZ) \
 
61
                client/libgetpassword.la
61
62
 
62
63
noinst_LTLIBRARIES+= \
63
64
                client/libgetpassword.la \
90
91
                client/linebuffer.h \
91
92
                drizzled/configmake.h \
92
93
                mystrings/decimal.h \
93
 
                mysys/dynamic_array.h \
94
94
                mystrings/m_ctype.h \
95
95
                mystrings/m_string.h \
96
96
                mystrings/my_uctype.h \
97
97
                mystrings/t_ctype.h \
98
98
                mystrings/utf8.h \
99
99
                mysys/aio_result.h \
100
 
                mysys/hash.h \
101
100
                mysys/iocache.h \
102
101
                mysys/my_bit.h \
103
102
                mysys/my_dir.h \
104
 
                mysys/my_getopt.h \
105
103
                mysys/my_pthread.h \
106
104
                mysys/my_static.h \
107
105
                mysys/my_sys.h \
108
 
                mysys/mysys_err.h \
109
 
                mysys/mysys_priv.h \
110
 
                mysys/typelib.h
 
106
                mysys/mysys_priv.h
111
107
 
112
108
mystrings_libmystrings_la_SOURCES= \
113
109
                mystrings/bmove_upp.cc \
124
120
                mystrings/longlong2str.cc \
125
121
                mystrings/my_strtoll10.cc
126
122
 
127
 
mysys_libmysys_la_LIBADD= drizzled/libcached_directory.la drizzled/libmemory.la
128
 
mysys_libmysys_la_DEPENDENCIES= drizzled/libcached_directory.la drizzled/libmemory.la
 
123
mysys_libmysys_la_LIBADD= \
 
124
                drizzled/libcharset.la \
 
125
                drizzled/libcached_directory.la \
 
126
                drizzled/libdynamic_array.la \
 
127
                drizzled/liberror.la \
 
128
                drizzled/libgetopt.la \
 
129
                drizzled/libmemory.la \
 
130
                drizzled/libtypelib.la
129
131
mysys_libmysys_la_SOURCES= \
130
 
                mysys/charset-def.cc \
131
 
                mysys/charset.cc \
132
132
                mysys/checksum.cc \
133
133
                mysys/default.cc \
134
 
                mysys/dynamic_array.cc \
135
 
                mysys/errors.cc \
136
 
                mysys/hash.cc \
137
134
                mysys/mf_arr_appstr.cc \
138
135
                mysys/mf_cache.cc \
139
136
                mysys/mf_dirname.cc \
155
152
                mysys/my_copy.cc \
156
153
                mysys/my_create.cc \
157
154
                mysys/my_delete.cc \
158
 
                mysys/my_error.cc \
159
 
                mysys/my_getopt.cc \
160
155
                mysys/my_getsystime.cc \
161
156
                mysys/my_init.cc \
162
157
                mysys/my_lib.cc \
170
165
                mysys/my_sync.cc \
171
166
                mysys/my_thr_init.cc \
172
167
                mysys/my_write.cc \
173
 
                mysys/ptr_cmp.cc \
174
 
                mysys/typelib.cc
 
168
                mysys/ptr_cmp.cc
175
169
 
176
170
client_drizzle_SOURCES=         client/drizzle.cc client/linebuffer.cc
177
171
client_drizzle_LDADD=           ${CLIENT_LDADD} ${READLINE_LIBS}