diff options
| author | Sami Kerola <kerolasa@iki.fi> | 2013-01-02 22:01:28 (GMT) |
|---|---|---|
| committer | Mathias Gumz <akira at fluxbox dot org> | 2013-01-03 07:17:27 (GMT) |
| commit | f12e149bafa03de599ed3f8a01771ee937682d38 (patch) | |
| tree | 46d09cd3d00fa7326002b328f57d917c428b3649 /util | |
| parent | ea2464a9eac3f5b4adf640485fa9a5d73bcf1d41 (diff) | |
| download | fluxbox_pavel-f12e149bafa03de599ed3f8a01771ee937682d38.zip fluxbox_pavel-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.am | 2 | ||||
| -rw-r--r-- | util/fbrun/Makefile.am | 4 |
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 |
| 2 | SUBDIRS= fbrun | 2 | SUBDIRS= fbrun |
| 3 | INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk | 3 | AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk |
| 4 | bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox | 4 | bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox |
| 5 | bin_PROGRAMS= fbsetroot fluxbox-update_configs fluxbox-remote | 5 | bin_PROGRAMS= fbsetroot fluxbox-update_configs fluxbox-remote |
| 6 | fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh | 6 | 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 @@ | |||
| 1 | FLUXBOX_SRC_DIR= ../../src/ | 1 | FLUXBOX_SRC_DIR= ../../src/ |
| 2 | INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk | 2 | AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk |
| 3 | bin_PROGRAMS= fbrun | 3 | bin_PROGRAMS= fbrun |
| 4 | fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm | 4 | fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm |
| 5 | fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a | 5 | fbrun_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 |