nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

automake: use AM_CPPFLAGS rather than INCLUDES

Browse source 
The INCLUDES macro deprecated in favour of AM_CPPFLAGS.

References: http://www.gnu.org/software/automake/manual/html_node/Program-Variables.html
This commit is contained in:
Sami Kerola 2013-01-02 22:01:28 +00:00 committed by Mathias Gumz
parent ea2464a9ea
commit f12e149baf
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tests/Makefile.am
View file

@ -1,4 +1,4 @@
INCLUDES= -I$(top_srcdir)/src AM_CPPFLAGS= -I$(top_srcdir)/src
noinst_PROGRAMS= \ noinst_PROGRAMS= \
testTexture \ testTexture \

2
util/Makefile.am
View file

@ -1,6 +1,6 @@
# util/Makefile.am for Fluxbox # util/Makefile.am for Fluxbox
SUBDIRS= fbrun 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_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox
bin_PROGRAMS= fbsetroot fluxbox-update_configs fluxbox-remote bin_PROGRAMS= fbsetroot fluxbox-update_configs fluxbox-remote
fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh

4
util/fbrun/Makefile.am
View file

@ -1,8 +1,8 @@
FLUXBOX_SRC_DIR= ../../src/ 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 bin_PROGRAMS= fbrun
fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm
fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
${FLUXBOX_SRC_DIR}FbTk/libFbTk.a: ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a:
cd ${FLUXBOX_SRC_DIR}FbTk && make cd ${FLUXBOX_SRC_DIR}FbTk && make