aboutsummaryrefslogtreecommitdiffstats
path: root/src/charon-cmd/Makefile.am
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2013-07-17 14:45:39 +0200
committerMartin Willi <martin@revosec.ch>2013-07-18 14:59:19 +0200
commit19cb07b89050c0e3ea6a11e1914318c4ff1284b5 (patch)
tree46313e34da73df7e8474c24122d97261f98b1d06 /src/charon-cmd/Makefile.am
parentc577b5eb44bb6f515ebbb532b8c2f802968d7771 (diff)
downloadstrongswan-19cb07b89050c0e3ea6a11e1914318c4ff1284b5.tar.bz2
strongswan-19cb07b89050c0e3ea6a11e1914318c4ff1284b5.tar.xz
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.
Diffstat (limited to 'src/charon-cmd/Makefile.am')
-rw-r--r--src/charon-cmd/Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/charon-cmd/Makefile.am b/src/charon-cmd/Makefile.am
index 4539173a1..9ed82be5e 100644
--- a/src/charon-cmd/Makefile.am
+++ b/src/charon-cmd/Makefile.am
@@ -11,12 +11,10 @@ charon_cmd_SOURCES = \
charon-cmd.o : $(top_builddir)/config.status
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
- -I$(top_srcdir)/src/libcharon
-
-AM_CFLAGS = \
+ -I$(top_srcdir)/src/libcharon \
-DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" \
-DPLUGINS=\""${cmd_plugins}\""