diff options
| author | Martin Willi <martin@revosec.ch> | 2013-07-17 14:45:39 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-07-18 14:59:19 +0200 |
| commit | 19cb07b89050c0e3ea6a11e1914318c4ff1284b5 (patch) | |
| tree | 46313e34da73df7e8474c24122d97261f98b1d06 /src/manager | |
| parent | c577b5eb44bb6f515ebbb532b8c2f802968d7771 (diff) | |
| download | strongswan-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/manager')
| -rw-r--r-- | src/manager/Makefile.am | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/manager/Makefile.am b/src/manager/Makefile.am index 045c77896..41001dd8b 100644 --- a/src/manager/Makefile.am +++ b/src/manager/Makefile.am @@ -13,11 +13,16 @@ controller/gateway_controller.c controller/gateway_controller.h manager_fcgi_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(top_builddir)/src/libfast/libfast.la ${xml_LIBS} main.o : $(top_builddir)/config.status -INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libfast ${xml_CFLAGS} -AM_CFLAGS = -rdynamic \ - -DIPSECDIR=\"${ipsecdir}\" \ - -DIPSEC_PIDDIR=\"${piddir}\" \ - -DPLUGINS=\""${manager_plugins}\"" +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/libstrongswan \ + -I$(top_srcdir)/src/libfast \ + -DIPSECDIR=\"${ipsecdir}\" \ + -DIPSEC_PIDDIR=\"${piddir}\" \ + -DPLUGINS=\""${manager_plugins}\"" + +AM_CFLAGS = \ + ${xml_CFLAGS} \ + -rdynamic # Don't forget to add templates to EXTRA_DIST !!! How to automate? manager_templatesdir = ${managerdir}/templates |