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/charon-nm/Makefile.am

@@ -1,24 +1,24 @@
 ipsec_PROGRAMS = charon-nm
 
 charon_nm_SOURCES = \
-charon-nm.c \
-nm/nm_backend.c nm/nm_backend.h \
-nm/nm_creds.c nm/nm_creds.h \
-nm/nm_handler.c nm/nm_handler.h \
-nm/nm_service.c nm/nm_service.h
+	charon-nm.c \
+	nm/nm_backend.c nm/nm_backend.h \
+	nm/nm_creds.c nm/nm_creds.h \
+	nm/nm_handler.c nm/nm_handler.h \
+	nm/nm_service.c nm/nm_service.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/libstrongswan \
 	-I$(top_srcdir)/src/libhydra \
 	-I$(top_srcdir)/src/libcharon \
-	${nm_CFLAGS}
-
-AM_CFLAGS = \
 	-DIPSEC_DIR=\"${ipsecdir}\" \
 	-DIPSEC_PIDDIR=\"${piddir}\" \
 	-DNM_CA_DIR=\"${nm_ca_dir}\" \
 	-DPLUGINS=\""${nm_plugins}\""
 
+AM_CFLAGS = \
+	${nm_CFLAGS}
+
 charon_nm_LDADD = \
 	$(top_builddir)/src/libstrongswan/libstrongswan.la \
 	$(top_builddir)/src/libhydra/libhydra.la \