automake: replace INCLUDES by AM_CPPFLAGS

INCLUDES are now deprecated and throw warnings when using automake 1.13.
We now also differentiate AM_CPPFLAGS and AM_CFLAGS, where includes and
defines are passed to AM_CPPFLAGS only.

src/libcharon/plugins/android_dns/Makefile.am

@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/libstrongswan \
+	-I$(top_srcdir)/src/libhydra \
 	-I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+	-rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-android-dns.la
@@ -15,4 +17,4 @@ libstrongswan_android_dns_la_SOURCES = \
 	android_dns_handler.c android_dns_handler.h
 
 libstrongswan_android_dns_la_LDFLAGS = -module -avoid-version
-libstrongswan_android_dns_la_LIBADD  = -lcutils
+libstrongswan_android_dns_la_LIBADD  = -lcutils