← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/tests/Makefile.am

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/tests/Makefile.am
16
16
MYSQLDATAdir =          $(localstatedir)
17
17
MYSQLSHAREdir =         $(pkgdatadir)
18
18
MYSQLBASEdir=           $(prefix)
19
 
AM_CPPFLAGS =           -I$(top_builddir)/include \
20
 
                        -I$(top_srcdir)/include -I$(srcdir)  \
21
 
                        -I$(top_srcdir)/mysys
22
 
LDADD =                 $(top_builddir)/mysys/libmysyslt.la $(top_builddir)/strings/libmystrings.la
 
19
LDADD =                 $(top_builddir)/mysys/libmysyslt.la \
 
20
                        $(top_builddir)/mystrings/libmystrings.la
23
21
 
24
22
DEFS =                  -DMAIN \
25
23
                        -DDEFAULT_BASEDIR=\"$(prefix)\" \
46
44
testhash_SOURCES = testhash.c
47
45
test_gethwaddr_SOURCES = $(top_srcdir)/mysys/my_gethwaddr.c
48
46
test_base64_SOURCES = $(top_srcdir)/mysys/base64.c
49
 
test_base64_LDADD = $(top_builddir)/mysys/libmysyslt.la $(top_builddir)/strings/libmystrings.la