← 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-04-15 23:57:15 UTC
  • mto: (997.2.5 mordred)
  • mto: This revision was merged to the branch mainline in revision 994.
  • Revision ID: mordred@inaugust.com-20090415235715-m9rkie0qmsvt4j0x
Moved client build into root Makefile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
25
25
          gnulib \
26
26
          drizzled/message \
27
27
          . \
28
 
          client \
29
28
          storage \
30
29
          plugin \
31
30
          drizzled \
32
31
          tests \
33
32
          support-files
34
33
 
35
 
EXTRA_DIST = config/config.rpath m4/gnulib-cache.m4
36
 
CLEANFILES = drizzled/configmake.h
37
 
DISTCLEANFILES = ac_available_languages_fragment
38
 
MAINTAINERCLEANFILES = autom4te.cache
39
 
 
40
34
BUILT_SOURCES=          drizzled/configmake.h
41
 
noinst_LTLIBRARIES=     mysys/libmysys.la mystrings/libmystrings.la
 
35
EXTRA_DIST=             config/config.rpath m4/gnulib-cache.m4
 
36
CLEANFILES=             ${BUILT_SOURCES}
 
37
DISTCLEANFILES=         ac_available_languages_fragment
 
38
MAINTAINERCLEANFILES=   autom4te.cache
 
39
 
 
40
CLIENT_LDADD=           mysys/libmysys.la \
 
41
                        mystrings/libmystrings.la \
 
42
                        $(LIBDRIZZLE) $(LIBINTL) $(LIBZ) \
 
43
                        client/libgetpassword.la
 
44
 
 
45
noinst_LTLIBRARIES= \
 
46
                client/libgetpassword.la \
 
47
                mysys/libmysys.la \
 
48
                mystrings/libmystrings.la
42
49
 
43
50
nobase_bin_PROGRAMS= \
 
51
                client/drizzle \
 
52
                client/drizzlecheck \
 
53
                client/drizzledump \
 
54
                client/drizzleimport \
 
55
                client/drizzletest \
 
56
                client/drizzleslap \
44
57
                extra/my_print_defaults \
45
58
                extra/mysql_waitpid \
46
59
                extra/innochecksum
47
60
 
 
61
 
 
62
client_libgetpassword_la_SOURCES= client/get_password.cc
 
63
 
48
64
noinst_HEADERS= \
 
65
                client/client_priv.h \
 
66
                client/errname.h
 
67
                client/get_password.h \
 
68
                client/my_readline.h \
49
69
                drizzled/configmake.h \
50
70
                mystrings/decimal.h \
51
71
                mystrings/m_ctype.h \
153
173
                mysys/tree.cc \
154
174
                mysys/typelib.cc
155
175
 
 
176
client_drizzle_SOURCES=         client/drizzle.cc client/readline.cc
 
177
client_drizzle_LDADD=           ${CLIENT_LDADD} ${READLINE_LIBS}
 
178
 
 
179
client_drizzlecheck_SOURCES =   client/drizzlecheck.cc
 
180
client_drizzlecheck_LDADD=      ${CLIENT_LDADD}
 
181
 
 
182
client_drizzledump_SOURCES=     client/drizzledump.cc
 
183
client_drizzledump_LDADD=       ${CLIENT_LDADD}
 
184
 
 
185
client_drizzleimport_SOURCES=   client/drizzleimport.cc
 
186
client_drizzleimport_LDADD=     ${CLIENT_LDADD}
 
187
 
 
188
client_drizzleslap_SOURCES=     client/drizzleslap.cc
 
189
client_drizzleslap_LDADD=       ${CLIENT_LDADD}
 
190
 
 
191
client_drizzletest_SOURCES=     client/drizzletest.cc
 
192
client_drizzletest_LDADD=       ${CLIENT_LDADD} ${LIBPCRE}
 
193
 
156
194
extra_my_print_defaults_SOURCES= extra/my_print_defaults.cc
157
195
extra_my_print_defaults_LDADD= \
158
196
                $(top_builddir)/mysys/libmysys.la \