denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

automake: replace INCLUDES by AM_CPPFLAGS

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/Makefile.am
+3 -2
View File
@@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif
AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libtncif
ipseclib_LTLIBRARIES = libimcv.la
src/libimcv/plugins/imc_os/Makefile.am
+5 -4
View File
@@ -1,8 +1,10 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libtncif \
-I$(top_srcdir)/src/libimcv
AM_CFLAGS = -rdynamic
AM_CFLAGS = \
-rdynamic
imcv_LTLIBRARIES = imc-os.la
@@ -12,4 +14,3 @@ imc_os_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
imc_os_la_SOURCES = imc_os.c imc_os_state.h imc_os_state.c
imc_os_la_LDFLAGS = -module -avoid-version
src/libimcv/plugins/imc_scanner/Makefile.am
+5 -4
View File
@@ -1,8 +1,10 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libtncif \
-I$(top_srcdir)/src/libimcv
AM_CFLAGS = -rdynamic
AM_CFLAGS = \
-rdynamic
imcv_LTLIBRARIES = imc-scanner.la
@@ -12,4 +14,3 @@ imc_scanner_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
imc_scanner_la_SOURCES = imc_scanner.c imc_scanner_state.h imc_scanner_state.c
imc_scanner_la_LDFLAGS = -module -avoid-version
src/libimcv/plugins/imc_test/Makefile.am
+5 -4
View File
@@ -1,8 +1,10 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libtncif \
-I$(top_srcdir)/src/libimcv
AM_CFLAGS = -rdynamic
AM_CFLAGS = \
-rdynamic
imcv_LTLIBRARIES = imc-test.la
@@ -12,4 +14,3 @@ imc_test_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
imc_test_la_SOURCES = imc_test.c imc_test_state.h imc_test_state.c
imc_test_la_LDFLAGS = -module -avoid-version
src/libimcv/plugins/imv_os/Makefile.am
+6 -5
View File
@@ -1,8 +1,10 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libtncif \
-I$(top_srcdir)/src/libimcv
AM_CFLAGS = -rdynamic
AM_CFLAGS = \
-rdynamic
imcv_LTLIBRARIES = imv-os.la
@@ -17,9 +19,8 @@ imv_os_la_SOURCES = \
imv_os_la_LDFLAGS = -module -avoid-version
ipsec_PROGRAMS = pacman
pacman_SOURCES = pacman.c
pacman_SOURCES = pacman.c
pacman_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
pacman.o : $(top_builddir)/config.status
EXTRA_DIST = pacman.sh
src/libimcv/plugins/imv_scanner/Makefile.am
+5 -4
View File
@@ -1,8 +1,10 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libtncif \
-I$(top_srcdir)/src/libimcv
AM_CFLAGS = -rdynamic
AM_CFLAGS = \
-rdynamic
imcv_LTLIBRARIES = imv-scanner.la
@@ -14,4 +16,3 @@ imv_scanner_la_SOURCES = \
imv_scanner_agent.h imv_scanner_agent.c
imv_scanner_la_LDFLAGS = -module -avoid-version
src/libimcv/plugins/imv_test/Makefile.am
+5 -4
View File
@@ -1,8 +1,10 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libtncif \
-I$(top_srcdir)/src/libimcv
AM_CFLAGS = -rdynamic
AM_CFLAGS = \
-rdynamic
imcv_LTLIBRARIES = imv-test.la
@@ -14,4 +16,3 @@ imv_test_la_SOURCES = \
imv_test_agent.h imv_test_agent.c
imv_test_la_LDFLAGS = -module -avoid-version