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/medsrv | |
| 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/medsrv')
| -rw-r--r-- | src/medsrv/Makefile.am | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/medsrv/Makefile.am b/src/medsrv/Makefile.am index 43da9c4e5..40bafd856 100644 --- a/src/medsrv/Makefile.am +++ b/src/medsrv/Makefile.am @@ -10,11 +10,15 @@ controller/peer_controller.c controller/peer_controller.h medsrv_fcgi_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(top_builddir)/src/libfast/libfast.la main.o : $(top_builddir)/config.status -INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libfast -AM_CFLAGS = -rdynamic \ - -DIPSECDIR=\"${ipsecdir}\" \ - -DIPSEC_PIDDIR=\"${piddir}\" \ - -DPLUGINS=\""${medsrv_plugins}\"" +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/libstrongswan \ + -I$(top_srcdir)/src/libfast \ + -DIPSECDIR=\"${ipsecdir}\" \ + -DIPSEC_PIDDIR=\"${piddir}\" \ + -DPLUGINS=\""${medsrv_plugins}\"" + +AM_CFLAGS = \ + -rdynamic # Don't forget to add templates to EXTRA_DIST !!! How to automate? medsrv_templatesdir = ${medsrvdir}/templates |