summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@wiredtiger.com>2012-10-03 18:18:43 +1000
committerMichael Cahill <michael.cahill@wiredtiger.com>2012-10-03 18:18:43 +1000
commit899d510f9814281a00932953c5fb916260f50107 (patch)
treeb896b104f8371787cd297b28a4fbdd66c65c1934
parent71b28462ad9a7f82611afb5de558e1250dc59a21 (diff)
downloadmongo-899d510f9814281a00932953c5fb916260f50107.tar.gz
warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS'
-rw-r--r--bench/tcbench/Makefile.am2
-rw-r--r--build_posix/Make.base2
-rw-r--r--ext/collators/reverse/Makefile.am2
-rw-r--r--ext/compressors/bzip2_compress/Makefile.am2
-rw-r--r--ext/compressors/nop_compress/Makefile.am2
-rw-r--r--ext/compressors/snappy_compress/Makefile.am2
-rw-r--r--lang/python/Makefile.am2
-rw-r--r--test/bloom/Makefile.am2
-rw-r--r--test/fops/Makefile.am2
-rw-r--r--test/format/Makefile.am2
-rw-r--r--test/salvage/Makefile.am2
-rw-r--r--test/thread/Makefile.am2
12 files changed, 12 insertions, 12 deletions
diff --git a/bench/tcbench/Makefile.am b/bench/tcbench/Makefile.am
index 30c551d2564..d56892f8b8c 100644
--- a/bench/tcbench/Makefile.am
+++ b/bench/tcbench/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir)
+AM_CPPFLAGS = -I$(top_builddir)
LDADD = $(top_builddir)/libwiredtiger.la
noinst_PROGRAMS = wttest
diff --git a/build_posix/Make.base b/build_posix/Make.base
index 4ac44b0d88e..dc52d1ac247 100644
--- a/build_posix/Make.base
+++ b/build_posix/Make.base
@@ -31,7 +31,7 @@ wt_SOURCES =\
src/utilities/util_write.c
include_HEADERS= wiredtiger.h
-INCLUDES = -I$(srcdir)/src/include
+AM_CPPFLAGS = -I$(srcdir)/src/include
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = wiredtiger.pc
diff --git a/ext/collators/reverse/Makefile.am b/ext/collators/reverse/Makefile.am
index 33e52907692..4221d6fa4e3 100644
--- a/ext/collators/reverse/Makefile.am
+++ b/ext/collators/reverse/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/include
lib_LTLIBRARIES = reverse_collator.la
reverse_collator_la_LDFLAGS = -avoid-version -module
diff --git a/ext/compressors/bzip2_compress/Makefile.am b/ext/compressors/bzip2_compress/Makefile.am
index ac94ce1ef0a..2f3662f8027 100644
--- a/ext/compressors/bzip2_compress/Makefile.am
+++ b/ext/compressors/bzip2_compress/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/include
lib_LTLIBRARIES = bzip2_compress.la
bzip2_compress_la_LDFLAGS = -avoid-version -module
diff --git a/ext/compressors/nop_compress/Makefile.am b/ext/compressors/nop_compress/Makefile.am
index 13bd2af0734..95bcb13d4fe 100644
--- a/ext/compressors/nop_compress/Makefile.am
+++ b/ext/compressors/nop_compress/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/include
lib_LTLIBRARIES = nop_compress.la
nop_compress_la_LDFLAGS = -avoid-version -module
diff --git a/ext/compressors/snappy_compress/Makefile.am b/ext/compressors/snappy_compress/Makefile.am
index 4592b986f75..300538f61ac 100644
--- a/ext/compressors/snappy_compress/Makefile.am
+++ b/ext/compressors/snappy_compress/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/include
lib_LTLIBRARIES = snappy_compress.la
snappy_compress_la_LDFLAGS = -avoid-version -module
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index fede28ff058..23a2797ce4c 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(abs_top_builddir)
+AM_CPPFLAGS = -I$(abs_top_builddir)
PYSRC = $(top_srcdir)/lang/python
if DEBUG
diff --git a/test/bloom/Makefile.am b/test/bloom/Makefile.am
index 12a877063cc..f6486d18876 100644
--- a/test/bloom/Makefile.am
+++ b/test/bloom/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/include
noinst_PROGRAMS = t
t_SOURCES = test_bloom.c
diff --git a/test/fops/Makefile.am b/test/fops/Makefile.am
index 5ad18e6c29b..aa2d577f4c4 100644
--- a/test/fops/Makefile.am
+++ b/test/fops/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir)
+AM_CPPFLAGS = -I$(top_builddir)
noinst_PROGRAMS = t
t_LDADD = $(top_builddir)/libwiredtiger.la
diff --git a/test/format/Makefile.am b/test/format/Makefile.am
index d79ccfcb9b2..d228e078f6e 100644
--- a/test/format/Makefile.am
+++ b/test/format/Makefile.am
@@ -1,5 +1,5 @@
BDB = $(top_builddir)/db
-INCLUDES = -I$(top_builddir) -I$(BDB)
+AM_CPPFLAGS = -I$(top_builddir) -I$(BDB)
noinst_PROGRAMS = t
noinst_SCRIPTS = s_dumpcmp
diff --git a/test/salvage/Makefile.am b/test/salvage/Makefile.am
index f51caab964f..a908a625f14 100644
--- a/test/salvage/Makefile.am
+++ b/test/salvage/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/include
noinst_PROGRAMS = t
t_SOURCES = salvage.c
diff --git a/test/thread/Makefile.am b/test/thread/Makefile.am
index d43e13b2bbe..3e62b6770a7 100644
--- a/test/thread/Makefile.am
+++ b/test/thread/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir)
+AM_CPPFLAGS = -I$(top_builddir)
noinst_PROGRAMS = t
t_LDADD = $(top_builddir)/libwiredtiger.la