diff options
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/archive/Makefile.am | 7 | ||||
| -rw-r--r-- | storage/csv/Makefile.am | 3 | ||||
| -rw-r--r-- | storage/heap/Makefile.am | 7 |
3 files changed, 10 insertions, 7 deletions
diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am index fabeca81eda..c2ae9d6b728 100644 --- a/storage/archive/Makefile.am +++ b/storage/archive/Makefile.am @@ -17,9 +17,10 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ @ZLIB_INCLUDES@ -LDADD = libarchive.a $(top_srcdir)/mysys/libmysys.a \ - $(top_srcdir)/dbug/libdbug.a \ - $(top_srcdir)/strings/libmystrings.a \ +LDADD = libarchive.a \ + $(top_builddir)/mysys/libmysys.a \ + $(top_builddir)/dbug/libdbug.a \ + $(top_builddir)/strings/libmystrings.a \ @ZLIB_LIBS@ pkglib_LIBRARIES = libarchive.a noinst_PROGRAMS = archive_test diff --git a/storage/csv/Makefile.am b/storage/csv/Makefile.am index 509cef954ff..5573df720a3 100644 --- a/storage/csv/Makefile.am +++ b/storage/csv/Makefile.am @@ -20,7 +20,8 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) MYSQLLIBdir= $(pkglibdir) -INCLUDES = -I$(top_srcdir)/include \ +INCLUDES = -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/regex \ -I$(top_srcdir)/sql \ -I$(srcdir) diff --git a/storage/heap/Makefile.am b/storage/heap/Makefile.am index 2890dc6ee23..79e0379f9a4 100644 --- a/storage/heap/Makefile.am +++ b/storage/heap/Makefile.am @@ -15,9 +15,10 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -LDADD = libheap.a $(top_srcdir)/mysys/libmysys.a \ - $(top_srcdir)/dbug/libdbug.a \ - $(top_srcdir)/strings/libmystrings.a +LDADD = libheap.a \ + $(top_builddir)/mysys/libmysys.a \ + $(top_builddir)/dbug/libdbug.a \ + $(top_builddir)/strings/libmystrings.a pkglib_LIBRARIES = libheap.a noinst_PROGRAMS = hp_test1 hp_test2 hp_test1_LDFLAGS = @NOINST_LDFLAGS@ |