* find/Makefile.am: Use AM_CPPFLAGS instead of deprecated INCLUDES. * lib/Makefile.am: Likewise. * locate/Makefile.am: Likewise. * xargs/Makefile.am: Likewise. --- ChangeLog | 6 ++++++ find/Makefile.am | 2 +- lib/Makefile.am | 2 +- locate/Makefile.am | 2 +- xargs/Makefile.am | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog index c61da2e..d7476d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2013-02-03 Kamil Dudka <[email protected]> + Avoid using 'INCLUDES =' in automake templates. + * find/Makefile.am: Use AM_CPPFLAGS instead of deprecated INCLUDES. + * lib/Makefile.am: Likewise. + * locate/Makefile.am: Likewise. + * xargs/Makefile.am: Likewise. + Eliminate a misleading message of import-gnulib.sh on a fresh repository obtained by 'git clone --recursive'. * import-gnulib.sh (check_old_gnulib_dir_layout): Do not require diff --git a/find/Makefile.am b/find/Makefile.am index 0795b87..f1068bf 100644 --- a/find/Makefile.am +++ b/find/Makefile.am @@ -36,7 +36,7 @@ endif # We don't just include man_MANS in EXTRA_DIST because while the value of # man_MANS is not always the same, we want to distribute all of those files. EXTRA_DIST = defs.h sharefile.h print.h find.1 ftsfind.1 oldfind.1 -INCLUDES = -I../gl/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gl/lib -I../intl -DLOCALEDIR=\"$(localedir)\" +AM_CPPFLAGS = -I../gl/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gl/lib -I../intl -DLOCALEDIR=\"$(localedir)\" LDADD = ./libfindtools.a ../lib/libfind.a ../gl/lib/libgnulib.a $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX) $(LIB_CLOSE) $(MODF_LIBM) $(FINDLIBS) $(GETHOSTNAME_LIB) $(LIB_EACCESS) # gnulib advises we link against <first> because we use <second>: # $(GETHOSTNAME_LIB) uname diff --git a/lib/Makefile.am b/lib/Makefile.am index bbb4dc2..eba43d2 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -28,7 +28,7 @@ DISTCLEANFILES = MAINTAINERCLEANFILES = -INCLUDES = -I../gl/lib -I$(top_srcdir)/gl/lib +AM_CPPFLAGS = -I../gl/lib -I$(top_srcdir)/gl/lib LDADD = ../gl/lib/libgnulib.a $(LIBINTL) libfind_a_SOURCES += printquoted.h listfile.h \ diff --git a/locate/Makefile.am b/locate/Makefile.am index fd02fc8..4792b8c 100644 --- a/locate/Makefile.am +++ b/locate/Makefile.am @@ -30,7 +30,7 @@ locate_SOURCES = locate.c word_io.c code_SOURCES = code.c word_io.c locate_TEXINFOS = dblocation.texi -INCLUDES = -I$(top_srcdir)/lib -I../gl/lib -I$(top_srcdir)/gl/lib -I../intl -DLOCATE_DB=\"$(LOCATE_DB)\" -DLOCALEDIR=\"$(localedir)\" +AM_CPPFLAGS = -I$(top_srcdir)/lib -I../gl/lib -I$(top_srcdir)/gl/lib -I../intl -DLOCATE_DB=\"$(LOCATE_DB)\" -DLOCALEDIR=\"$(localedir)\" LDADD = ../lib/libfind.a ../gl/lib/libgnulib.a $(LIB_CLOSE) $(LIBINTL) diff --git a/xargs/Makefile.am b/xargs/Makefile.am index d34f87a..1cfe3e4 100644 --- a/xargs/Makefile.am +++ b/xargs/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS = $(WARN_CFLAGS) localedir = $(datadir)/locale bin_PROGRAMS = xargs man_MANS = xargs.1 -INCLUDES = -I.. -I../gl/lib -I$(top_srcdir)/gl/lib -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\" +AM_CPPFLAGS = -I.. -I../gl/lib -I$(top_srcdir)/gl/lib -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\" LDADD = ../lib/libfind.a ../gl/lib/libgnulib.a $(LIB_CLOSE) $(LIBINTL) EXTRA_DIST = $(man_MANS) SUBDIRS = . testsuite -- 1.7.1
