← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/Makefile.am

  • Committer: Brian Aker
  • Date: 2008-07-01 20:52:03 UTC
  • mfrom: (28.1.23 libtool-patch)
  • Revision ID: brian@tangent.org-20080701205203-3jm6ga57uzxy8k4t
Merge of taylor's work

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
 
LIBMYSQLCLIENT_LA =             $(top_builddir)/libmysql/libmysqlclient.la
19
 
 
20
 
INCLUDES =                      -I$(top_builddir)/include \
 
18
AM_CPPFLAGS =                   -I$(top_builddir)/include \
21
19
                                -I$(top_srcdir)/include \
22
 
                                -I$(top_srcdir)/regex
 
20
                                -I$(top_srcdir)/regex \
 
21
                                -I$(top_srcdir)/sql \
 
22
                                -I$(top_srcdir)/strings
23
23
 
24
24
LIBS =                          @CLIENT_LIBS@ -lz
25
25
 
26
26
LDADD=                          $(CLIENT_THREAD_LIBS) \
27
 
                                $(top_builddir)/libmysql/libmysqlclient.la -lz \
28
 
                                $(top_builddir)/mysys/libmysys.a
 
27
                                $(top_builddir)/sql-common/libsqlcommon.la \
 
28
                                $(top_builddir)/libmysql/libmysqlclient.la -lz
29
29
 
30
30
 
31
31
noinst_HEADERS =                sql_string.h completion_hash.h my_readline.h \
33
33
 
34
34
EXTRA_DIST =                    get_password.c CMakeLists.txt echo.c
35
35
 
36
 
BUILT_SOURCES =                 link_sources
37
 
 
38
36
CLEANFILES =                    $(BUILT_SOURCES)
39
37
 
40
38
bin_PROGRAMS =                  mysql \
60
58
                                $(top_srcdir)/mysys/my_bit.c \
61
59
                                $(top_srcdir)/mysys/my_bitmap.c \
62
60
                                $(top_srcdir)/mysys/base64.c
63
 
mysqlbinlog_LDADD =             $(LDADD) $(CXXLDFLAGS)
 
61
mysqlbinlog_LDADD =             $(LDADD) $(CXXLDFLAGS) 
64
62
 
65
63
mysqldump_SOURCES=              mysqldump.c \
66
 
                                my_user.c \
67
64
                                $(top_srcdir)/mysys/mf_getdate.c
68
65
 
69
66
mysqlimport_SOURCES=            mysqlimport.c
70
67
 
71
 
mysqlimport_LDADD =             $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
72
 
                                $(LIBMYSQLCLIENT_LA) \
73
 
                                $(top_builddir)/mysys/libmysys.a
74
 
 
75
68
mysqlshow_SOURCES=              mysqlshow.c
76
69
 
77
70
mysqlslap_SOURCES=              mysqlslap.c
78
71
mysqlslap_CFLAGS=               -DTHREAD -UUNDEF_THREADS_HACK
79
 
mysqlslap_LDADD =               $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
80
 
                                $(LIBMYSQLCLIENT_LA) \
81
 
                                $(top_builddir)/mysys/libmysys.a
82
72
 
83
73
mysqltest_SOURCES=              mysqltest.c \
84
74
                                $(top_srcdir)/mysys/my_getsystime.c \
93
83
DEFS =                  -DUNDEF_THREADS_HACK \
94
84
                        -DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \
95
85
                        -DDATADIR="\"$(localstatedir)\""
96
 
 
97
 
sql_src=log_event.h mysql_priv.h rpl_constants.h \
98
 
        log_event.cc my_decimal.h my_decimal.cc \
99
 
        log_event_old.h log_event_old.cc \
100
 
        rpl_record_old.h rpl_record_old.cc
101
 
strings_src=decimal.c dtoa.c
102
 
 
103
 
link_sources:
104
 
        for f in $(sql_src) ; do \
105
 
          rm -f $$f; \
106
 
          @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
107
 
        done; \
108
 
        for f in $(strings_src) ; do \
109
 
          rm -f $(srcdir)/$$f; \
110
 
          @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
111
 
        done; \
112
 
        rm -f $(srcdir)/my_user.c; \
113
 
        @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
114
 
        echo timestamp > link_sources;
115
 
 
116
 
# Don't update the files from bitkeeper
117
 
%::SCCS/s.%