aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorSami Kerola <kerolasa@iki.fi>2013-01-02 22:01:28 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2013-01-03 07:17:27 (GMT)
commitf12e149bafa03de599ed3f8a01771ee937682d38 (patch)
tree46d09cd3d00fa7326002b328f57d917c428b3649 /util
parentea2464a9eac3f5b4adf640485fa9a5d73bcf1d41 (diff)
downloadfluxbox-f12e149bafa03de599ed3f8a01771ee937682d38.zip
fluxbox-f12e149bafa03de599ed3f8a01771ee937682d38.tar.bz2
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
Diffstat (limited to 'util')
-rw-r--r--util/Makefile.am2
-rw-r--r--util/fbrun/Makefile.am4
2 files changed, 3 insertions, 3 deletions
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 @@
1# util/Makefile.am for Fluxbox 1# util/Makefile.am for Fluxbox
2SUBDIRS= fbrun 2SUBDIRS= fbrun
3INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk 3AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
4bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox 4bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox
5bin_PROGRAMS= fbsetroot fluxbox-update_configs fluxbox-remote 5bin_PROGRAMS= fbsetroot fluxbox-update_configs fluxbox-remote
6fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh 6fbsetroot_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 @@
1FLUXBOX_SRC_DIR= ../../src/ 1FLUXBOX_SRC_DIR= ../../src/
2INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk 2AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
3bin_PROGRAMS= fbrun 3bin_PROGRAMS= fbrun
4fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm 4fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm
5fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a 5fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
6 6
7${FLUXBOX_SRC_DIR}FbTk/libFbTk.a: 7${FLUXBOX_SRC_DIR}FbTk/libFbTk.a:
8 cd ${FLUXBOX_SRC_DIR}FbTk && make \ No newline at end of file 8 cd ${FLUXBOX_SRC_DIR}FbTk && make