← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/archive/Makefile.am

Replaced INCLUDES with AM_CPPFLAGS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/archive/Makefile.am
15
15
 
16
16
#called from the top level Makefile
17
17
 
18
 
LIBMYSQLCLIENT_LA =             $(top_builddir)/libmysql/libmysqlclient.la
19
 
 
20
18
MYSQLDATAdir =          $(localstatedir)
21
19
MYSQLSHAREdir =         $(pkgdatadir)
22
20
MYSQLBASEdir=           $(prefix)
23
21
MYSQLLIBdir=            $(pkglibdir)
24
22
pkgplugindir =          $(pkglibdir)/plugin
25
 
INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
 
23
AM_CPPFLAGS =              -I$(top_srcdir)/include -I$(top_builddir)/include \
26
24
                        -I$(top_srcdir)/regex \
27
25
                        -I$(top_srcdir)/sql \
28
26
                        -I$(srcdir)
82
80
concurrency_test_LDADD =        $(top_builddir)/mysys/libmysyslt.la \
83
81
                        $(top_builddir)/dbug/libdbuglt.la \
84
82
                        $(top_builddir)/strings/libmystringslt.la \
85
 
                        $(LIBMYSQLCLIENT_LA) \
 
83
                        $(top_builddir)/libmysql/libmysqlclient.la \
86
84
                        $(LDADD) \
87
85
                        -lz
88
86
concurrency_test_LDFLAGS =