Changeset: 22a83e891492 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22a83e891492
Modified Files:
buildtools/autogen/autogen/am.py
Branch: Oct2012
Log Message:
autogen: use AM_CPPFLAGS iso INCLUDES
automake-1.12.4 warns about using the deprecated INCLUDES, and having to
use AM_CPPFLAGS instead
Since INCLUDES is now mapped onto something for both MSVC, as well as
automake, we just stick to INCLUDES in our Makefile.ag files and
translate it into AM_CPPFLAGS for automake. Since we don't do
per-target includes currently, we can't use the *_CPPFLAGS that automake
also supports.
diffs (12 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -1133,7 +1133,7 @@ def am_includes(fd, var, values, am):
else:
incs = incs + " -I" + am_translate_dir(i, am) \
+ am_add_srcdir(i, am, " -I")
- fd.write("INCLUDES = " + incs + "\n")
+ fd.write("AM_CPPFLAGS = " + incs + "\n")
output_funcs = {'SUBDIRS': am_subdirs,
'EXTRA_DIST': am_extra_dist,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
