← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/Makefile.am

Renamed strings to mystrings, for include/lib naming consistency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/Makefile.am
15
15
 
16
16
# This file is public domain and comes with NO WARRANTY of any kind
17
17
 
18
 
LDADD=                  $(top_builddir)/libdrizzle/libdrizzle.la \
19
 
                        $(top_builddir)/mysys/libmysys.la \
20
 
                        $(top_builddir)/mystrings/libmystrings.la \
21
 
                        $(LIBINTL) -lz
22
 
 
23
 
 
24
 
noinst_HEADERS =        completion_hash.h \
25
 
                        my_readline.h \
26
 
                        client_priv.h \
27
 
                        errname.h
 
18
LDADD=                          $(top_builddir)/libdrizzle/libdrizzle.la -lz
 
19
 
 
20
 
 
21
noinst_HEADERS =        completion_hash.h my_readline.h client_priv.h
28
22
 
29
23
CLEANFILES =            $(BUILT_SOURCES)
30
24
 
31
25
bin_PROGRAMS =  drizzle \
32
26
                                drizzleadmin \
 
27
                                drizzlebinlog \
33
28
                                drizzlecheck \
34
29
                                drizzledump \
35
30
                                drizzleimport \
36
31
                                drizzletest \
37
 
                                drizzleslap
 
32
                                mysqlslap 
38
33
 
39
 
drizzle_SOURCES =               drizzle.cc readline.cc completion_hash.cc
40
 
drizzle_LDADD =                 $(READLINE_LIBS) $(TERMCAP_LIBS) \
 
34
drizzle_SOURCES =               drizzle.c readline.c completion_hash.c
 
35
drizzle_LDADD =                 $(READLINE_LIBS) $(TERMCAP_LIBS) $(GLIB_LIBS) \
41
36
                                $(LDADD) $(CXXLDFLAGS)
42
 
drizzle_CXXFLAGS =              ${AM_CXXFLAGS} ${W_EXCEPTIONS}
 
37
drizzle_CPPFLAGS =              $(AM_CPPFLAGS) $(GLIB_CFLAGS)
43
38
drizzleadmin_SOURCES =          drizzleadmin.cc
44
39
 
45
 
drizzlecheck_SOURCES =          drizzlecheck.cc
46
 
drizzledump_SOURCES=            drizzledump.cc 
47
 
 
48
 
drizzleimport_SOURCES=          drizzleimport.cc
49
 
 
50
 
drizzleslap_SOURCES=            drizzleslap.cc
 
40
drizzlebinlog_SOURCES =     drizzlebinlog.cc \
 
41
                $(top_srcdir)/mysys/mf_tempdir.c \
 
42
                $(top_srcdir)/mysys/my_new.cc \
 
43
                $(top_srcdir)/mysys/my_bit.c \
 
44
                $(top_srcdir)/mysys/my_bitmap.c \
 
45
                $(top_srcdir)/mysys/base64.c
 
46
drizzlebinlog_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/drizzled
 
47
 
 
48
drizzledump_SOURCES=            drizzledump.c 
 
49
 
 
50
drizzleimport_SOURCES=          drizzleimport.c
 
51
 
 
52
mysqlslap_SOURCES=              mysqlslap.c
 
53
mysqlslap_CFLAGS=               -DTHREAD -UUNDEF_THREADS_HACK
51
54
 
52
55
drizzletest_SOURCES=            drizzletest.cc 
53
56
drizzletest_LDADD =             ${LDADD} $(PCRE_LIBS)
54
 
drizzletest_CXXFLAGS =          ${AM_CXXFLAGS} $(PCRE_CFLAGS)
 
57
drizzletest_CFLAGS =            ${AM_CPPFLAGS} $(PCRE_CFLAGS)
55
58
 
56
 
DEFS =  -DDEFAULT_DRIZZLE_HOME="\"$(prefix)\"" \
57
 
        -DDATADIR="\"$(localstatedir)\"" \
58
 
        -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
59
# Fix for mit-threads
 
60
DEFS =                  -DUNDEF_THREADS_HACK \
 
61
                        -DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \
 
62
                        -DDATADIR="\"$(localstatedir)\""