- replace deprecated INCLUDES with AM_CPPFLAGS

48 files changed, 48 insertions, 48 deletions

diff --git a/Makefile.am b/Makefile.am
index 39a37a940..7e1cea0ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 SUBDIRS  = contrib doc m4 src po pkgconfig
 
 EXTRA_DIST = \
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 8e16a4ebe..aadf9cc8f 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 tap32dir = $(pkgdatadir)/openvpn-tap32/tapw32/
 
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index ca0c3938b..9b92ec748 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -77,6 +77,6 @@ EXTRA_DIST = \
        gnunetvpn.pc.in 
 
 CLEANFILES = $(pcfiles)
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index f5f53a368..44dcfdf6f 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 98ac8e916..eace51e5d 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
diff --git a/src/ats-tool/Makefile.am b/src/ats-tool/Makefile.am
index c633a20ca..51e0fe17a 100644
--- a/src/ats-tool/Makefile.am
+++ b/src/ats-tool/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index c1a49af5e..cfab5ea2c 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
diff --git a/src/block/Makefile.am b/src/block/Makefile.am
index d0a5ae752..bc077d3d9 100644
--- a/src/block/Makefile.am
+++ b/src/block/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 plugindir = $(libdir)/gnunet
 
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index 8c5ae0322..1387f6755 100644
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index b34cb5a44..e0c34f54c 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index e8583aacb..fe8787b17 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 plugindir = $(libdir)/gnunet
 
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index a95a162b6..107aaa1bb 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 plugindir = $(libdir)/gnunet
 
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index ed80fdcee..e080b83d2 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -liconv -lstdc++ -lcomdlg32 -lgdi32
 endif
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index 441ffeefd..8b94a3bf6 100644
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am
index ad63e83d1..42b27d3ef 100644
--- a/src/dv/Makefile.am
+++ b/src/dv/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am
index 341df6ad8..aa46c35cc 100644
--- a/src/exit/Makefile.am
+++ b/src/exit/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined,--export-all-symbols
diff --git a/src/experimentation/Makefile.am b/src/experimentation/Makefile.am
index effbbbd00..a67f39ea8 100644
--- a/src/experimentation/Makefile.am
+++ b/src/experimentation/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
diff --git a/src/fragmentation/Makefile.am b/src/fragmentation/Makefile.am
index 333a270e7..138b7ea6a 100644
--- a/src/fragmentation/Makefile.am
+++ b/src/fragmentation/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index a6e680448..37ac79a52 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 332f1324c..2fcbd821a 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if HAVE_GLIBCNSS
 NSS_SUBDIR = nss
diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am
index ef23e8a6e..ab25538ac 100644
--- a/src/hello/Makefile.am
+++ b/src/hello/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 726251aec..560d4f0f2 100644
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index ff0ff2472..e01a47974 100644
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 6c58f6fba..e28e54469 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
diff --git a/src/lockmanager/Makefile.am b/src/lockmanager/Makefile.am
index 9b0391645..9b3d94286 100644
--- a/src/lockmanager/Makefile.am
+++ b/src/lockmanager/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 271d5e994..dd2e7a866 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am
index e5bc04dfa..442dbd75e 100644
--- a/src/multicast/Makefile.am
+++ b/src/multicast/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
diff --git a/src/mysql/Makefile.am b/src/mysql/Makefile.am
index c98c71b44..c91dd80ca 100644
--- a/src/mysql/Makefile.am
+++ b/src/mysql/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index d09dc560d..593f53412 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 plugindir = $(libdir)/gnunet
 
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index e27611ba9..6690026d2 100644
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index 728f23935..155fa9acb 100644
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
index bd8dfbd4a..2309a47e2 100644
--- a/src/peerinfo-tool/Makefile.am
+++ b/src/peerinfo-tool/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -liconv -lstdc++ -lcomdlg32 -lgdi32
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 06e570a43..457b674b3 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
diff --git a/src/postgres/Makefile.am b/src/postgres/Makefile.am
index 0b3be5e2b..85fac752f 100644
--- a/src/postgres/Makefile.am
+++ b/src/postgres/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
diff --git a/src/psycstore/Makefile.am b/src/psycstore/Makefile.am
index dd86f9971..40cd3ce6d 100644
--- a/src/psycstore/Makefile.am
+++ b/src/psycstore/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 plugindir = $(libdir)/gnunet
 
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index e5673fe24..19c8e527b 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index ba3b8f78d..f5e656ae3 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index 73ba2de93..c4c56a802 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index bed44e848..878ff0cbd 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index f149bc5f4..30d01661d 100644
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
diff --git a/src/template/Makefile.am b/src/template/Makefile.am
index d1f87c8d8..275cf2ff8 100644
--- a/src/template/Makefile.am
+++ b/src/template/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 7b1e73fb7..2cf13570d 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index fb6bc091e..f27b46ed0 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
index e5215f7a9..1094325ff 100644
--- a/src/topology/Makefile.am
+++ b/src/topology/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 7b900295b..9ea9209ea 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 plugindir = $(libdir)/gnunet
 
diff --git a/src/tun/Makefile.am b/src/tun/Makefile.am
index 96e79d0d8..f090266a9 100644
--- a/src/tun/Makefile.am
+++ b/src/tun/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index cb058e40d..ca91f94f1 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 plugindir = $(libdir)/gnunet
 
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 8b67a3373..a18019f3a 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined,--export-all-symbols