Use AM_CPPFLAGS instead of INCLUDES in Makefile.am.

Avoid warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') BTW both were honored so they had to be merged in liby2util-r.
yast · Sep 4, 2013 · ce19cd7 · ce19cd7
1 parent 0dda969
commit ce19cd7
Show file tree

Hide file tree

Showing 29 changed files with 34 additions and 32 deletions.
diff --git a/agent-any/src/Makefile.am b/agent-any/src/Makefile.am
@@ -20,4 +20,4 @@ libpy2ag_anyagent_la_SOURCES =				\
 libpy2ag_anyagent_la_LDFLAGS = -version-info 2:0
 libpy2ag_anyagent_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES = @AGENT_INCLUDES@
+AM_CPPFLAGS = @AGENT_INCLUDES@
diff --git a/agent-any/testsuite/Makefile.am b/agent-any/testsuite/Makefile.am
@@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 export top_srcdir
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 noinst_PROGRAMS = runag_anyagent
 

diff --git a/agent-dummy/src/Makefile.am b/agent-dummy/src/Makefile.am
@@ -13,7 +13,7 @@ libpy2ag_dummy_la_SOURCES =			\
 libpy2ag_dummy_la_LDFLAGS = -version-info 2:0
 libpy2ag_dummy_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)/libycp/src/include	\
 	-I$(top_srcdir)/liby2/src/include	\
 	-I$(top_srcdir)/libscr/src/include	\

diff --git a/agent-ini/src/Makefile.am b/agent-ini/src/Makefile.am
@@ -29,4 +29,4 @@ libpy2ag_ini_la_LIBADD =			\
 	@AGENT_LIBADD@				\
 	${Y2UTIL_LIBS}
 
-INCLUDES = @AGENT_INCLUDES@
+AM_CPPFLAGS = @AGENT_INCLUDES@
diff --git a/agent-ini/testsuite/Makefile.am b/agent-ini/testsuite/Makefile.am
@@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 export top_srcdir
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 noinst_PROGRAMS = runag_ini
 

diff --git a/agent-modules/src/Makefile.am b/agent-modules/src/Makefile.am
@@ -20,4 +20,4 @@ libpy2ag_modules_la_SOURCES =				\
 libpy2ag_modules_la_LDFLAGS = -version-info 2:0
 libpy2ag_modules_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
diff --git a/agent-modules/testsuite/Makefile.am b/agent-modules/testsuite/Makefile.am
@@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 export top_srcdir
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 noinst_PROGRAMS = runmodules
 

diff --git a/agent-process/src/Makefile.am b/agent-process/src/Makefile.am
@@ -20,4 +20,4 @@ libpy2ag_process_la_SOURCES =				\
 libpy2ag_process_la_LDFLAGS = -version-info 2:0
 libpy2ag_process_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES = @AGENT_INCLUDES@
+AM_CPPFLAGS = @AGENT_INCLUDES@
diff --git a/agent-process/testsuite/Makefile.am b/agent-process/testsuite/Makefile.am
@@ -12,7 +12,7 @@ PACKAGE = ag_process
 AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 noinst_PROGRAMS = run_ag_process
 

diff --git a/agent-resolver/src/Makefile.am b/agent-resolver/src/Makefile.am
@@ -12,4 +12,4 @@ libpy2ag_resolver_la_SOURCES =	\
 libpy2ag_resolver_la_LDFLAGS = -version-info 2:0
 libpy2ag_resolver_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
diff --git a/agent-resolver/testsuite/Makefile.am b/agent-resolver/testsuite/Makefile.am
@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 export top_srcdir
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 noinst_PROGRAMS = runresolver
 

diff --git a/agent-system/src/Makefile.am b/agent-system/src/Makefile.am
@@ -14,4 +14,4 @@ libpy2ag_system_la_SOURCES =			\
 libpy2ag_system_la_LDFLAGS = -version-info 2:0
 libpy2ag_system_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES = @AGENT_INCLUDES@
+AM_CPPFLAGS = @AGENT_INCLUDES@
diff --git a/agent-system/testsuite/Makefile.am b/agent-system/testsuite/Makefile.am
@@ -12,7 +12,7 @@ PACKAGE = ag_system
 AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 noinst_PROGRAMS = runag_system
 

diff --git a/base/src/Makefile.am b/base/src/Makefile.am
@@ -36,7 +36,7 @@ AM_CXXFLAGS = -DY2LOG=\"scr\" -DSUSEVERSION=\"${SUSEVERSION}\"
 serversdir = $(execcompdir)/servers
 servers_PROGRAMS = scr
 
-INCLUDES = ${AGENT_INCLUDES}                 		\
+AM_CPPFLAGS = ${AGENT_INCLUDES}                 		\
 	-I$(srcdir)/../../libscr/src/include		\
 	-I$(srcdir)/../../scr/src
 

diff --git a/base/tools/tty_wrapper/Makefile.am b/base/tools/tty_wrapper/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am for tools/ttywrapper
 #
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 ybin_PROGRAMS = tty_wrapper
 

diff --git a/base/tools/ycpc/Makefile.am b/base/tools/ycpc/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = doc
 
 AM_CXXFLAGS = -DY2LOG=\"libycp\"
 
-INCLUDES = -I$(top_srcdir)/libycp/src/include \
+AM_CPPFLAGS = -I$(top_srcdir)/libycp/src/include \
 	-I$(top_srcdir)/liby2/src/include \
 	-I$(top_srcdir)/libscr/src/include \
 	-I$(top_srcdir)/wfm/src		\

diff --git a/debugger/Makefile.am b/debugger/Makefile.am
@@ -13,7 +13,7 @@ liby2debug_la_SOURCES =	\
 
 #liby2debug_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES =	\
+AM_CPPFLAGS =	\
 	-I$(srcdir)/../libycp/src/include \
 	-I$(srcdir)/../liby2/src/include \
 	-I$(srcdir)/../liby2util-r/src/include \

diff --git a/libscr/src/Makefile.am b/libscr/src/Makefile.am
@@ -11,7 +11,7 @@ lib_LTLIBRARIES = libscr.la
 libscr_la_SOURCES =  \
 	SCRAgent.cc SCR.cc
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(srcdir)/../../libycp/src/include		\
 	-I$(srcdir)/../../liby2/src/include		\
 	-I$(srcdir)/include				\

diff --git a/libscr/testsuite/Makefile.am b/libscr/testsuite/Makefile.am
@@ -4,7 +4,7 @@
 
 AM_CXXFLAGS = -DY2LOG=\"libscr\"
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)/libycp/src/include		\
 	-I$(top_srcdir)/liby2/src/include		\
 	-I$(srcdir)/../src/include			\

diff --git a/liby2/src/Makefile.am b/liby2/src/Makefile.am
@@ -30,7 +30,7 @@ libpy2serial_la_SOURCES =				\
 	Y2SerialComponent.cc Y2CCSerial.cc
 libpy2serial_la_LDFLAGS = -version-info 2:0
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(srcdir)/../../libycp/src/include		\
 	-I$(srcdir)/include				\
 	-I$(srcdir)/include/y2				\

diff --git a/liby2util-r/src/Makefile.am b/liby2util-r/src/Makefile.am
@@ -4,11 +4,9 @@
 
 SUBDIRS = include
 
-INCLUDES = -I$(srcdir)/include #-I$(oldincludedir)/libxml2 
-
 AM_LDFLAGS = -L$(libdir)
 
-AM_CPPFLAGS = -DY2LOG=\"liby2util\" $(DEBUG_FLAGS) -D_GNU_SOURCE -DLOCALEDIR=\"${localedir}\"
+AM_CPPFLAGS = -I$(srcdir)/include -DY2LOG=\"liby2util\" $(DEBUG_FLAGS) -D_GNU_SOURCE -DLOCALEDIR=\"${localedir}\"
 
 lib_LTLIBRARIES = liby2util.la
 

diff --git a/liby2util-r/testsuite/Makefile.am b/liby2util-r/testsuite/Makefile.am
@@ -6,9 +6,7 @@ PACKAGE = liby2util
 AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 
-INCLUDES= -I$(srcdir)/../src/include
-
-AM_CPPFLAGS = -DY2LOG=\"liby2util-testsuite\"
+AM_CPPFLAGS = -I$(srcdir)/../src/include -DY2LOG=\"liby2util-testsuite\"
 
 AM_LDFLAGS = \
 	-Xlinker --whole-archive	\

diff --git a/libycp/src/Makefile.am b/libycp/src/Makefile.am
@@ -60,7 +60,7 @@ BUILT_SOURCES = parser.hh
 
 AM_YFLAGS = -d -v
 
-INCLUDES = -I$(srcdir)/include -I$(srcdir)/include/ycp -I$(top_srcdir)/liby2/src/include ${Y2UTIL_CFLAGS} \
+AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/ycp -I$(top_srcdir)/liby2/src/include ${Y2UTIL_CFLAGS} \
 	-I$(top_srcdir)/debugger
 
 # CURRENT:REVISION:AGE

diff --git a/libycp/testsuite/Makefile.am b/libycp/testsuite/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = config lib libycp.test tests
 
 AM_CXXFLAGS = -DY2LOG=\"libycp\"
 
-INCLUDES = -I$(srcdir)/../src/include -I$(top_srcdir)/liby2/src/include ${Y2UTIL_CFLAGS}
+AM_CPPFLAGS = -I$(srcdir)/../src/include -I$(top_srcdir)/liby2/src/include ${Y2UTIL_CFLAGS}
 
 bindir = $(prefix)/bin
 libdir = ../src/.libs

diff --git a/package/yast2-core.changes b/package/yast2-core.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep  4 14:24:39 UTC 2013 - mvidner@suse.com
+
+- Avoid automake warning:
+  'INCLUDES' is the old name for 'AM_CPPFLAGS'
+
 -------------------------------------------------------------------
 Wed Aug  7 07:46:14 UTC 2013 - dmajda@suse.cz
 

diff --git a/scr/src/Makefile.am b/scr/src/Makefile.am
@@ -18,7 +18,7 @@ libpy2scr_la_LDFLAGS = -version-info 2:0
 
 libpy2scr_la_LIBADD = $(top_builddir)/libscr/src/libscr.la
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 pkgincludedir = $(includedir)/scr
 # these go to $(pkgincludedir)

diff --git a/scr/testsuite/Makefile.am b/scr/testsuite/Makefile.am
@@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 export top_srcdir
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 noinst_PROGRAMS = runscr
 

diff --git a/wfm/src/Makefile.am b/wfm/src/Makefile.am
@@ -29,7 +29,7 @@ libpy2wfm_la_LIBADD = \
 	../../liby2/src/liby2.la		\
 	${Y2UTIL_LIBS}
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)/libycp/src/include	\
 	-I$(top_srcdir)/liby2/src/include	\
 	-I$(top_srcdir)/libscr/src/include	\

diff --git a/wfm/testsuite/Makefile.am b/wfm/testsuite/Makefile.am
@@ -10,7 +10,7 @@ PACKAGE = wfm
 AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)/libycp/src/include	\
 	-I$(top_srcdir)/liby2/src/include	\
 	-I$(top_srcdir)/libscr/src/include	\