- replace deprecated INCLUDES with AM_CPPFLAGS

diff --git a/Makefile.am b/Makefile.am
index 39a37a9402d345ced0dcd3887ffa21c07d7055b7..7e1cea0ce31d349b8f08378534acc2c776a7a32f 100644 (file)
--- 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 8e16a4ebe2442fd2c6ab4853b5e4f84283db400b..aadf9cc8fe501954c5968b492245d64964511da6 100644 (file)
--- 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 ca0c3938b7c5061902e1963093786c4c1fa569a6..9b92ec748dfcb1f575e7e9a5ec44dfb817ebe25b 100644 (file)
--- 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 f5f53a368024e25470aa179909294ee2689a5fcb..44dcfdf6fe19d7c77472b5f3c33ef736dea8a553 100644 (file)
--- 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 98ac8e916f8754cc388ebc064eb1be3e9ccf90b6..eace51e5d65364ad9c55a4723dea0c7660f6c358 100644 (file)
--- 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 c633a20ca2a9325f8fa91c9e809389a460ce2f55..51e0fe17a1f840b6d64f0ac7a2ca94b98ccbdb32 100644 (file)
--- 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 c1a49af5efab16fd64ca10e5e0cd2c894612c2ac..cfab5ea2c7d20c3ce04e2c4faf408f7f40638a3e 100644 (file)
--- 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 d0a5ae752bb4b9b9d968327070db2991ccddff85..bc077d3d9a4b5143a793f6221fda29c528102cbe 100644 (file)
--- 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 8c5ae0322674f406c41af55119e9b5558eb4ea14..1387f6755a8293f5e4034ab5c1ea8481f18a4eba 100644 (file)
--- 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 b34cb5a442f59f661ad8f7ee2cf5ffc36d7ae385..e0c34f54c6be065acd9cf5fdff234581b8ebd3d3 100644 (file)
--- 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 e8583aacb139f1e68eb3a781e769f55b35c52aba..fe8787b1711bfe5e8679d7cb24e978178dd244eb 100644 (file)
--- 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 a95a162b659df916893071f1c1f989cb857f215c..107aaa1bb24f8ff04d3976cc4c66c0e277c6360e 100644 (file)
--- 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 ed80fdcee8c8755e20e6bc5af6b7b410be78b33f..e080b83d29038ff99ccf20aa328966b174284b29 100644 (file)
--- 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 441ffeefdbce1dda33993a5d369aa28a7fb98c56..8b94a3bf641433c25101e0faf207de4da9dbf5ec 100644 (file)
--- 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 ad63e83d12c12ced8eec1bb74ffb0610adc0fcac..42b27d3efc603689f94eed9c0237b258c6873981 100644 (file)
--- 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 341df6ad89e5c5f8a11f4bb9d369b44f28d7d184..aa46c35ccd2c5569a9ecd33642fa618e5c1fc6d3 100644 (file)
--- 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 effbbbd00f27ace4d3b84166fa5a5235f5bade74..a67f39ea8543fd67d2ecd8dd5bed212c84c2fd26 100644 (file)
--- 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 333a270e7fd56afb1861350fe18b6c910bb61be2..138b7ea6ad7cd4deb46d3736f63428ad79aa0d4e 100644 (file)
--- 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 a6e680448a0f90b7f594a5deb14f35d257378988..37ac79a52862cf5766efe3dd8076f8ec603826c6 100644 (file)
--- 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 332f1324cea4c67cd6dffabbe66ef93fab878806..2fcbd821aaece6d08405dbb9e30a3a857c9b87e4 100644 (file)
--- 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 ef23e8a6e145fd89c97de024145c815b34505921..ab25538ac138a023a901bb1e172832e4391c307c 100644 (file)
--- 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 726251aec03851ac6f04c1a3e2aea947a1d3221c..560d4f0f2a3611104a59d24555730ae64352ef5b 100644 (file)
--- 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 ff0ff2472999336adc4c8ed86f55c6e7826880fa..e01a479745e01370fe8d26cf8c532b5eeda373a1 100644 (file)
--- 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 6c58f6fba59331d61885bc48659d4e4f7b6ae5f7..e28e5446995d44ef89dac015990e16d7c940b2a9 100644 (file)
--- 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 9b03916451ab532a1c2f0d544923279e65263be2..9b3d94286156096e4f475e2836f0cc57a36622e9 100644 (file)
--- 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 271d5e9949360e90c71c64beeebcb942131042d5..dd2e7a866163c69c53fad43af57313c4e5a5fb18 100644 (file)
--- 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 e5bc04dface2a49e2f682a75fc4efbc88fa08f58..442dbd75e2ecbbb443372ed1a88f83f893d6db41 100644 (file)
--- 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 c98c71b4428d93542e99804bd6c3daca27e41bf6..c91dd80ca446fcd3358d81175a5e286492ed04d1 100644 (file)
--- 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 d09dc560d09dde75eed6a24eedccdbc1f39f6312..593f534128c634913db378de8bc779b2a2bdb281 100644 (file)
--- 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 e27611ba9114f3284e65e07aca60876f3489c549..6690026d26bdf28f1e601a5e9ca43733af07beec 100644 (file)
--- 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 728f23935d82fae3de6866e2aa851bf3b8dbb3b3..155fa9acb30ad6deeddc77af629520c62e2f5730 100644 (file)
--- 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 bd8dfbd4a2e85380f7fbccc39e1b45fee2507377..2309a47e28a8eca31baaca47d88fe268786c5890 100644 (file)
--- 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 06e570a4327015783c1ce1eee8a767671116d92a..457b674b3917f7b9cabba1634ebdb7b570f11262 100644 (file)
--- 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 0b3be5e2be6dbc32d038f70e4db7d837c4a1155d..85fac752f755c17e15a0fea2b1f38174f2aebe0a 100644 (file)
--- 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 dd86f9971b0848626dceb73b9beae46fb5920999..40cd3ce6d240e2660a249409f9c5131b40cc7b0e 100644 (file)
--- 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 e5673fe24f626edb550b2c443b2be12687e209f4..19c8e527bc8b07581b98d1b421241d2937b010dd 100644 (file)
--- 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 ba3b8f78df1242954e6a4f742562b57768f2f149..f5e656ae371658724aec82f2a164be7b224565fc 100644 (file)
--- 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 73ba2de93e6ad0b18d430e60052760b883aa0237..c4c56a802d739a9b2d439305d3271c91a0401ee4 100644 (file)
--- 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 bed44e848a02c8710db90de8c29165110d05f3eb..878ff0cbd722012db46c05fd3c8c64297d3cee99 100644 (file)
--- 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 f149bc5f4320ef1d89735dc5e62ddfe8617db8c7..30d01661d197ef61a2003e8e638b478ffef1ddf4 100644 (file)
--- 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 d1f87c8d8f6bdca46e8f417719ed2450cefc7ab0..275cf2ff896f12f497e1cd65688bd7f970f2c78d 100644 (file)
--- 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 7b1e73fb7bd7fc2857fdb42503f6aa08831f4b48..2cf13570d6cc528fa247eda14762417176c6153b 100644 (file)
--- 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 fb6bc091e0ce28554f3d899c661fe3d2b9857062..f27b46ed021130012648f0b470e7afe54f59b757 100644 (file)
--- 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 e5215f7a918d5a2aa7960bab1e9ca2a6f22be823..1094325ff5b9a78d38aec97118eb8347eda2d55e 100644 (file)
--- 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 7b900295bfca1ee0419d9bc703fa14b2f843e545..9ea9209ea77d0493e5731d639423cbc476e46c34 100644 (file)
--- 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 96e79d0d8dc563b4b65f14ef4fb05517aac9a61d..f090266a97163eae38fdaaba0292a8dcf2332d59 100644 (file)
--- 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 cb058e40d6533e5acb8de1c399466cd0747d70eb..ca91f94f1329b28da565bd012be3949fd4d182fe 100644 (file)
--- 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 8b67a3373780061542928c102239a24950c5f024..a18019f3af81c007de6bed76ec158d104a796ffb 100644 (file)
--- 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