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.
This commit is contained in:
Martin Willi
2013-07-18 14:59:19 +02:00
parent c577b5eb44
commit 19cb07b890
149 changed files with 745 additions and 545 deletions
+7 -3
View File
@@ -13,9 +13,13 @@ libdumm_la_LIBADD = -lbridge -lfuse -lutil $(top_builddir)/src/libstrongswan/lib
dumm_LDADD = libdumm.la ${gtk_LIBS} $(top_builddir)/src/libstrongswan/libstrongswan.la
irdumm_LDADD = libdumm.la ${RUBYLIB} $(top_builddir)/src/libstrongswan/libstrongswan.la
INCLUDES = -I$(top_srcdir)/src/libstrongswan ${gtk_CFLAGS} \
${RUBYINCLUDE}
AM_CFLAGS = -D_FILE_OFFSET_BITS=64
AM_CPPFLAGS = \
-D_FILE_OFFSET_BITS=64 \
-I$(top_srcdir)/src/libstrongswan \
${RUBYINCLUDE}
AM_CFLAGS = \
${gtk_CFLAGS}
all-local: ext