From f12e149bafa03de599ed3f8a01771ee937682d38 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Wed, 2 Jan 2013 22:01:28 +0000 Subject: automake: use AM_CPPFLAGS rather than INCLUDES The INCLUDES macro deprecated in favour of AM_CPPFLAGS. References: http://www.gnu.org/software/automake/manual/html_node/Program-Variables.html --- src/tests/Makefile.am | 2 +- util/Makefile.am | 2 +- util/fbrun/Makefile.am | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 53e1ddc..6b3809d 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= -I$(top_srcdir)/src +AM_CPPFLAGS= -I$(top_srcdir)/src noinst_PROGRAMS= \ testTexture \ diff --git a/util/Makefile.am b/util/Makefile.am index e33dd30..f47924f 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,6 +1,6 @@ # util/Makefile.am for Fluxbox SUBDIRS= fbrun -INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk +AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox bin_PROGRAMS= fbsetroot fluxbox-update_configs fluxbox-remote fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh diff --git a/util/fbrun/Makefile.am b/util/fbrun/Makefile.am index 83b45b0..35317df 100644 --- a/util/fbrun/Makefile.am +++ b/util/fbrun/Makefile.am @@ -1,8 +1,8 @@ FLUXBOX_SRC_DIR= ../../src/ -INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk +AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk bin_PROGRAMS= fbrun fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a: - cd ${FLUXBOX_SRC_DIR}FbTk && make \ No newline at end of file + cd ${FLUXBOX_SRC_DIR}FbTk && make -- cgit v0.11.2