← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to client/Makefile.am

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/Makefile.am
86
86
                                $(LIBMYSQLCLIENT_LA) \
87
87
                                $(top_builddir)/mysys/libmysys.a
88
88
 
89
 
mysqltest_SOURCES=              mysqltest.c \
90
 
                                $(top_srcdir)/mysys/my_getsystime.c \
91
 
                                $(top_srcdir)/mysys/my_copy.c \
92
 
                                $(top_srcdir)/mysys/my_mkdir.c
93
 
mysqltest_LDADD =               $(top_builddir)/regex/libregex.a $(LDADD)
 
89
mysqltest_SOURCES=              mysqltest.c
 
90
mysqltest_CFLAGS=               -DTHREAD -UUNDEF_THREADS_HACK
 
91
mysqltest_LDADD =               $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
 
92
                                @CLIENT_EXTRA_LDFLAGS@ \
 
93
                                $(LIBMYSQLCLIENT_LA) \
 
94
                                $(top_builddir)/mysys/libmysys.a \
 
95
                                $(top_builddir)/regex/libregex.a
94
96
 
95
97
mysql_upgrade_SOURCES=          mysql_upgrade.c \
96
98
                                $(top_srcdir)/mysys/my_getpagesize.c