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.

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b9b3a70a84937e58eac3fae4af7e3a7e6985e82c..06d4609cf65cb57644235b829da3c24133d65f29 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,6 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtls
-AM_CFLAGS = \
--DPLUGINS="\"${scripts_plugins}\""
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libtls \
+       -DPLUGINS="\"${scripts_plugins}\""
 
 noinst_PROGRAMS = bin2array bin2sql id2sql key2keyid keyid2sql oid2der \
        thread_analysis dh_speed pubkey_speed crypt_burn hash_burn fetch \

diff --git a/src/_copyright/Makefile.am b/src/_copyright/Makefile.am
index 915b574211b26807a9cac20c45ca9cdb8e72c3ee..62baf94da35c2427b87fa4f7623821337b503453 100644 (file)
--- a/src/_copyright/Makefile.am
+++ b/src/_copyright/Makefile.am
@@ -1,7 +1,7 @@
 ipsec_PROGRAMS = _copyright
 _copyright_SOURCES = _copyright.c
 
-INCLUDES = \
--I$(top_srcdir)/src/libstrongswan
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
 _copyright_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la

diff --git a/src/charon-cmd/Makefile.am b/src/charon-cmd/Makefile.am
index 4539173a1c0b2ecd33db996e2eca82b7ea7a7912..9ed82be5edd9260a8e6595bce43cf081bc9c9d3b 100644 (file)
--- 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}\""

diff --git a/src/charon-nm/Makefile.am b/src/charon-nm/Makefile.am
index 80fc13ba11e6ffbb237032bb320fd71bbcbf51e8..d3630ffd5a1f79dad9b7f1b1bf63a03014e6576b 100644 (file)
--- a/src/charon-nm/Makefile.am
+++ b/src/charon-nm/Makefile.am
@@ -1,24 +1,24 @@
 ipsec_PROGRAMS = charon-nm
 
 charon_nm_SOURCES = \
-charon-nm.c \
-nm/nm_backend.c nm/nm_backend.h \
-nm/nm_creds.c nm/nm_creds.h \
-nm/nm_handler.c nm/nm_handler.h \
-nm/nm_service.c nm/nm_service.h
+       charon-nm.c \
+       nm/nm_backend.c nm/nm_backend.h \
+       nm/nm_creds.c nm/nm_creds.h \
+       nm/nm_handler.c nm/nm_handler.h \
+       nm/nm_service.c nm/nm_service.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
-       ${nm_CFLAGS}
-
-AM_CFLAGS = \
        -DIPSEC_DIR=\"${ipsecdir}\" \
        -DIPSEC_PIDDIR=\"${piddir}\" \
        -DNM_CA_DIR=\"${nm_ca_dir}\" \
        -DPLUGINS=\""${nm_plugins}\""
 
+AM_CFLAGS = \
+       ${nm_CFLAGS}
+
 charon_nm_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
        $(top_builddir)/src/libhydra/libhydra.la \

diff --git a/src/charon-tkm/Makefile.am b/src/charon-tkm/Makefile.am
index 457e5e44e6fab22f04b74c3c27276aaed6151e70..9b03c67b96bccbe4c3ca64428677adad2b6687de 100644 (file)
--- a/src/charon-tkm/Makefile.am
+++ b/src/charon-tkm/Makefile.am
@@ -1,7 +1,7 @@
 SRC = $(top_builddir)/src
 
 # includes relative to obj directory
-INCLUDES = \
+AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -I../$(SRC)/libstrongswan \
        -I../$(SRC)/libhydra \

diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index 0ca15cb10054953825d8e1298dad4c3e98b01539..6c5b88eb86a75ea50b7db5c9551cb33d382f9702 100644 (file)
--- a/src/charon/Makefile.am
+++ b/src/charon/Makefile.am
@@ -5,12 +5,10 @@ charon.c
 
 charon.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=\""${charon_plugins}\""
@@ -22,4 +20,3 @@ charon_LDADD = \
        -lm $(PTHREADLIB) $(DLLIB)
 
 EXTRA_DIST = Android.mk
-

diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am
index aabd96e7756c86c51b33ec4919c0315b88a2fced..ddb0ea65b8e1033c6cb59be83acdb48b5c48ff8f 100644 (file)
--- a/src/checksum/Makefile.am
+++ b/src/checksum/Makefile.am
@@ -13,12 +13,14 @@ checksum_builder_LDADD = \
        $(DLLIB)
 
 CLEANFILES = checksum.c
-INCLUDES = \
+
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon
+       -I$(top_srcdir)/src/libcharon \
+       -DPLUGINDIR=\"${DESTDIR}${plugindir}\"
+
 AM_CFLAGS = \
-       -DPLUGINDIR=\"${DESTDIR}${plugindir}\" \
        -rdynamic
 
 # we keep track of build dependencies in deps and use libs to store the paths
@@ -29,14 +31,14 @@ libs = $(DESTDIR)$(ipseclibdir)/libstrongswan.so
 exes =
 
 if !MONOLITHIC
-  AM_CFLAGS += -DS_PLUGINS=\""${s_plugins}\""
+  AM_CPPFLAGS += -DS_PLUGINS=\""${s_plugins}\""
 endif
 
 if USE_LIBHYDRA
   deps += $(top_builddir)/src/libhydra/libhydra.la
   libs += $(DESTDIR)$(ipseclibdir)/libhydra.so
 if !MONOLITHIC
-  AM_CFLAGS += -DH_PLUGINS=\""${h_plugins}\""
+  AM_CPPFLAGS += -DH_PLUGINS=\""${h_plugins}\""
 endif
 endif
 
@@ -80,7 +82,7 @@ if USE_CHARON
   libs += $(DESTDIR)$(ipseclibdir)/libcharon.so
   exes += $(top_builddir)/src/charon/.libs/charon
 if !MONOLITHIC
-  AM_CFLAGS += -DC_PLUGINS=\""${c_plugins}\""
+  AM_CPPFLAGS += -DC_PLUGINS=\""${c_plugins}\""
 endif
 endif
 

diff --git a/src/conftest/Makefile.am b/src/conftest/Makefile.am
index 64a2cc6d3c7257af23c6902c6bceffa5e8428147..2aafc7a6fbdb93762e88303083414d3ed5be568a 100644 (file)
--- a/src/conftest/Makefile.am
+++ b/src/conftest/Makefile.am
@@ -1,6 +1,9 @@
 ipsec_PROGRAMS = conftest
 
-AM_CFLAGS = -rdynamic \
+AM_CPPFLAGS = -rdynamic \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
        -DPLUGINS=\""${charon_plugins}\""
 
 conftest_SOURCES = conftest.c conftest.h config.c config.h actions.c actions.h \
@@ -13,11 +16,6 @@ conftest_SOURCES = conftest.c conftest.h config.c config.h actions.c actions.h \
        hooks/set_ike_request.c hooks/set_reserved.c hooks/set_ike_initiator.c \
        hooks/log_ts.c hooks/rebuild_auth.c hooks/reset_seq.c
 
-INCLUDES = \
-       -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon
-
 conftest_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
        $(top_builddir)/src/libhydra/libhydra.la \

diff --git a/src/dumm/Makefile.am b/src/dumm/Makefile.am
index 3e4625ec8ecfdedc16b6efc794fabf6dfc2387a5..1c6a68f587d2b54d3f95942b66e43a6934373d74 100644 (file)
--- a/src/dumm/Makefile.am
+++ b/src/dumm/Makefile.am
@@ -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
 

diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 32167e2c450b1aa5331fe1cd42102d56fa4fe67c..10d0b04cbe7f7883f8101fe8f672715d00c73956 100644 (file)
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -128,13 +128,11 @@ endif
 
 daemon.lo :            $(top_builddir)/config.status
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I${linux_headers} \
        -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}\"
 

diff --git a/src/libcharon/plugins/addrblock/Makefile.am b/src/libcharon/plugins/addrblock/Makefile.am
index 50d0457f868bf4502b3c7368e8a5abf70406de6e..407f22d714c3ece900f11f5b8c1a738df23fc18c 100644 (file)
--- a/src/libcharon/plugins/addrblock/Makefile.am
+++ b/src/libcharon/plugins/addrblock/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-addrblock.la

diff --git a/src/libcharon/plugins/android_dns/Makefile.am b/src/libcharon/plugins/android_dns/Makefile.am
index 0d25f11d74a34d4fc11588e9fd2748e2987d88cf..ebad963bb8e8d8f73089e6dc2b6a8646098078a8 100644 (file)
--- a/src/libcharon/plugins/android_dns/Makefile.am
+++ b/src/libcharon/plugins/android_dns/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-android-dns.la
@@ -15,4 +17,4 @@ libstrongswan_android_dns_la_SOURCES = \
        android_dns_handler.c android_dns_handler.h
 
 libstrongswan_android_dns_la_LDFLAGS = -module -avoid-version
-libstrongswan_android_dns_la_LIBADD  = -lcutils
\ No newline at end of file
+libstrongswan_android_dns_la_LIBADD  = -lcutils

diff --git a/src/libcharon/plugins/android_log/Makefile.am b/src/libcharon/plugins/android_log/Makefile.am
index 3c180f1db601666c635edfbc098a6e794d6a479e..4d8b4850b4ef2fa9d359fca1e5c83004244838d1 100644 (file)
--- a/src/libcharon/plugins/android_log/Makefile.am
+++ b/src/libcharon/plugins/android_log/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-android-log.la

diff --git a/src/libcharon/plugins/certexpire/Makefile.am b/src/libcharon/plugins/certexpire/Makefile.am
index 9aa0daad3cb8b01d467375110e34ffb6f3755cd0..2bfad94974aa8e523b03f5b8686088d4c49f6505 100644 (file)
--- a/src/libcharon/plugins/certexpire/Makefile.am
+++ b/src/libcharon/plugins/certexpire/Makefile.am
@@ -1,10 +1,12 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon
-
-AM_CFLAGS = -rdynamic \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
+AM_CFLAGS = \
+       -rdynamic
+
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-certexpire.la
 else

diff --git a/src/libcharon/plugins/coupling/Makefile.am b/src/libcharon/plugins/coupling/Makefile.am
index 642ce820c51a3bc88b4e0e091568e3e5d89c0c0f..cbc06a6b7c0d49b0cadccdeaa8f4f71284a0b34e 100644 (file)
--- a/src/libcharon/plugins/coupling/Makefile.am
+++ b/src/libcharon/plugins/coupling/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-coupling.la

diff --git a/src/libcharon/plugins/dhcp/Makefile.am b/src/libcharon/plugins/dhcp/Makefile.am
index 45d7536be7b6218764922c1fc66fdad34584bd06..e0e857eed2198b4a1b2b061f350ffe37fd89f584 100644 (file)
--- a/src/libcharon/plugins/dhcp/Makefile.am
+++ b/src/libcharon/plugins/dhcp/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-dhcp.la

diff --git a/src/libcharon/plugins/duplicheck/Makefile.am b/src/libcharon/plugins/duplicheck/Makefile.am
index 63c91dfabf8b3aa12c4b7a1baf48df0a8275fb17..4de9dba9f362c657fc4bbd9b86ea4844bc384a80 100644 (file)
--- a/src/libcharon/plugins/duplicheck/Makefile.am
+++ b/src/libcharon/plugins/duplicheck/Makefile.am
@@ -1,10 +1,12 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon
-
-AM_CFLAGS = -rdynamic \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
+AM_CFLAGS = \
+       -rdynamic
+
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-duplicheck.la
 else

diff --git a/src/libcharon/plugins/eap_aka/Makefile.am b/src/libcharon/plugins/eap_aka/Makefile.am
index d37d1691cade12204fce2e7fbaf7601814338e36..ba6e66039565d2f049b40556a52c9e53748b52b7 100644 (file)
--- a/src/libcharon/plugins/eap_aka/Makefile.am
+++ b/src/libcharon/plugins/eap_aka/Makefile.am
@@ -1,8 +1,11 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -I$(top_srcdir)/src/libsimaka
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libsimaka
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-aka.la

diff --git a/src/libcharon/plugins/eap_aka_3gpp2/Makefile.am b/src/libcharon/plugins/eap_aka_3gpp2/Makefile.am
index b4d6dc1d2227e4fb3a4b3c1382345b59fdd25a6f..4e2b207d253b8d2b7d4dcc4a78a6986ace877763 100644 (file)
--- a/src/libcharon/plugins/eap_aka_3gpp2/Makefile.am
+++ b/src/libcharon/plugins/eap_aka_3gpp2/Makefile.am
@@ -1,8 +1,11 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -I$(top_srcdir)/src/libsimaka
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libsimaka
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 libstrongswan_eap_aka_3gpp2_la_LDFLAGS = -module -avoid-version
 libstrongswan_eap_aka_3gpp2_la_LIBADD = -lgmp

diff --git a/src/libcharon/plugins/eap_dynamic/Makefile.am b/src/libcharon/plugins/eap_dynamic/Makefile.am
index 0d07fbf35ade75ccb8867a7235fa38a9f7227807..13b4d10b182a3c5e16c56100ed92f245a204f3ca 100644 (file)
--- a/src/libcharon/plugins/eap_dynamic/Makefile.am
+++ b/src/libcharon/plugins/eap_dynamic/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-dynamic.la

diff --git a/src/libcharon/plugins/eap_gtc/Makefile.am b/src/libcharon/plugins/eap_gtc/Makefile.am
index e4234fab2b358eca2b60107763ee763dde42f6e6..811366a9426e4dcc58922a031f2355d753df1e96 100644 (file)
--- a/src/libcharon/plugins/eap_gtc/Makefile.am
+++ b/src/libcharon/plugins/eap_gtc/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-gtc.la

diff --git a/src/libcharon/plugins/eap_identity/Makefile.am b/src/libcharon/plugins/eap_identity/Makefile.am
index 2a7c764b033ceb542566116a253f30197cfad9b5..1c155866db454bd8e48e7d4f5507873a83e1f74d 100644 (file)
--- a/src/libcharon/plugins/eap_identity/Makefile.am
+++ b/src/libcharon/plugins/eap_identity/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS =  \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-identity.la

diff --git a/src/libcharon/plugins/eap_md5/Makefile.am b/src/libcharon/plugins/eap_md5/Makefile.am
index e9936c9254b1dad8689b96a7c6e6714cee9e1edb..583598342b88e8fed48af3a275b74849533b075b 100644 (file)
--- a/src/libcharon/plugins/eap_md5/Makefile.am
+++ b/src/libcharon/plugins/eap_md5/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-md5.la

diff --git a/src/libcharon/plugins/eap_mschapv2/Makefile.am b/src/libcharon/plugins/eap_mschapv2/Makefile.am
index b9555b3c18c842a44e25a20d8645a9080187e6fa..030682d3e29858a7506f4c0816ce4d789e32c997 100644 (file)
--- a/src/libcharon/plugins/eap_mschapv2/Makefile.am
+++ b/src/libcharon/plugins/eap_mschapv2/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-mschapv2.la

diff --git a/src/libcharon/plugins/eap_peap/Makefile.am b/src/libcharon/plugins/eap_peap/Makefile.am
index 81f2575c73c7c42fb6d276b514f9a8527d810033..19410a4081e42667e2d3ce922d2b3ae04b0b3f1d 100644 (file)
--- a/src/libcharon/plugins/eap_peap/Makefile.am
+++ b/src/libcharon/plugins/eap_peap/Makefile.am
@@ -1,8 +1,11 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -I$(top_srcdir)/src/libtls
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libtls
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-peap.la

diff --git a/src/libcharon/plugins/eap_radius/Makefile.am b/src/libcharon/plugins/eap_radius/Makefile.am
index 628adbeb37a87627dd61c91b14017dd754d4a235..67b540407e4221c226354708ae2b3871c16a96cf 100644 (file)
--- a/src/libcharon/plugins/eap_radius/Makefile.am
+++ b/src/libcharon/plugins/eap_radius/Makefile.am
@@ -1,8 +1,11 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -I$(top_srcdir)/src/libradius
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libradius
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-radius.la

diff --git a/src/libcharon/plugins/eap_sim/Makefile.am b/src/libcharon/plugins/eap_sim/Makefile.am
index a0cb72f5f26bcc3438c82acf1719c61a9b9d2d0d..2e9dad1b8920c3bbceab75571aeb5a0fc7a2d3fd 100644 (file)
--- a/src/libcharon/plugins/eap_sim/Makefile.am
+++ b/src/libcharon/plugins/eap_sim/Makefile.am
@@ -1,8 +1,11 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -I$(top_srcdir)/src/libsimaka
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libsimaka
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-sim.la

diff --git a/src/libcharon/plugins/eap_sim_file/Makefile.am b/src/libcharon/plugins/eap_sim_file/Makefile.am
index d76cdc5cafc4040166a9e617d3f4b46ec0db04f9..0d4da07d5d96f7be7a366830c67b86f794884b71 100644 (file)
--- a/src/libcharon/plugins/eap_sim_file/Makefile.am
+++ b/src/libcharon/plugins/eap_sim_file/Makefile.am
@@ -1,8 +1,12 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -I$(top_srcdir)/src/libsimaka \
+       -DIPSEC_CONFDIR=\"${sysconfdir}\"
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libsimaka
-
-AM_CFLAGS = -rdynamic -DIPSEC_CONFDIR=\"${sysconfdir}\"
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-sim-file.la

diff --git a/src/libcharon/plugins/eap_sim_pcsc/Makefile.am b/src/libcharon/plugins/eap_sim_pcsc/Makefile.am
index fae6fccfcad7853f41c7555ad8d4f2cb6597ae23..e5e9d01ca4372e1918be3f5070ee9826887b2a0c 100644 (file)
--- a/src/libcharon/plugins/eap_sim_pcsc/Makefile.am
+++ b/src/libcharon/plugins/eap_sim_pcsc/Makefile.am
@@ -1,8 +1,12 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -I$(top_srcdir)/src/libsimaka
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libsimaka
-
-AM_CFLAGS = -rdynamic ${pcsclite_CFLAGS}
+AM_CFLAGS = \
+       ${pcsclite_CFLAGS} \
+       -rdynamic
 
 libstrongswan_eap_sim_pcsc_la_LDFLAGS = -module -avoid-version
 libstrongswan_eap_sim_pcsc_la_LIBADD  = ${pcsclite_LIBS}

diff --git a/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am b/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
index a8e03f6504e06a86e5cb3dfb9ad367aa76bdeaa2..0f21c6849733718fbea42ab8a834d110f5ef8b7c 100644 (file)
--- a/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
+++ b/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
@@ -1,8 +1,11 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -I$(top_srcdir)/src/libsimaka
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libsimaka
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-simaka-pseudonym.la

diff --git a/src/libcharon/plugins/eap_simaka_reauth/Makefile.am b/src/libcharon/plugins/eap_simaka_reauth/Makefile.am
index 0b35c7521691de316efcba41092915e261004a30..be000c6d5c15cfe69d68681ffd05aaf6af81e675 100644 (file)
--- a/src/libcharon/plugins/eap_simaka_reauth/Makefile.am
+++ b/src/libcharon/plugins/eap_simaka_reauth/Makefile.am
@@ -1,8 +1,11 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -I$(top_srcdir)/src/libsimaka
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libsimaka
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-simaka-reauth.la

diff --git a/src/libcharon/plugins/eap_simaka_sql/Makefile.am b/src/libcharon/plugins/eap_simaka_sql/Makefile.am
index c83267e677ec04da86e1c0e879ce2b3e0c741135..9a52bd8ab034a445dc91ebdd50560958b3fe2f68 100644 (file)
--- a/src/libcharon/plugins/eap_simaka_sql/Makefile.am
+++ b/src/libcharon/plugins/eap_simaka_sql/Makefile.am
@@ -1,8 +1,12 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -I$(top_srcdir)/src/libsimaka \
+       -DIPSEC_CONFDIR=\"${sysconfdir}\"
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libsimaka
-
-AM_CFLAGS = -rdynamic -DIPSEC_CONFDIR=\"${sysconfdir}\"
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-simaka-sql.la

diff --git a/src/libcharon/plugins/eap_tls/Makefile.am b/src/libcharon/plugins/eap_tls/Makefile.am
index 29ddd822b695e4d9eea2f51ff2d8984fb564638a..c4944fca14c886e36d5aaa9dca4fc3a04017e0b4 100644 (file)
--- a/src/libcharon/plugins/eap_tls/Makefile.am
+++ b/src/libcharon/plugins/eap_tls/Makefile.am
@@ -1,8 +1,11 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -I$(top_srcdir)/src/libtls
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libtls
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-tls.la

diff --git a/src/libcharon/plugins/eap_tnc/Makefile.am b/src/libcharon/plugins/eap_tnc/Makefile.am
index 0e10f7d9c4eda80832c945c24668b497ab94100c..9586bef1486e9e2b76d513994fb1f75cf2933fcb 100644 (file)
--- a/src/libcharon/plugins/eap_tnc/Makefile.am
+++ b/src/libcharon/plugins/eap_tnc/Makefile.am
@@ -1,5 +1,4 @@
-
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
@@ -7,7 +6,8 @@ INCLUDES = \
        -I$(top_srcdir)/src/libtncif \
        -I$(top_srcdir)/src/libtnccs
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-tnc.la

diff --git a/src/libcharon/plugins/eap_ttls/Makefile.am b/src/libcharon/plugins/eap_ttls/Makefile.am
index 8cc82cc2ea593b81610fe9836d817fe6b16378ce..81776d80084bbdddfe80287bbca96f3b1be79ef7 100644 (file)
--- a/src/libcharon/plugins/eap_ttls/Makefile.am
+++ b/src/libcharon/plugins/eap_ttls/Makefile.am
@@ -1,9 +1,12 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libtls \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -I$(top_srcdir)/src/libtls \
        -I$(top_srcdir)/src/libradius
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-ttls.la

diff --git a/src/libcharon/plugins/error_notify/Makefile.am b/src/libcharon/plugins/error_notify/Makefile.am
index fccd2520166357bd445f2e8ab48c42b4d8ad983f..980fe1fbd35c559b4dbb3febf55ee87daea587bb 100644 (file)
--- a/src/libcharon/plugins/error_notify/Makefile.am
+++ b/src/libcharon/plugins/error_notify/Makefile.am
@@ -1,10 +1,12 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon
-
-AM_CFLAGS = -rdynamic \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
+AM_CFLAGS = \
+       -rdynamic
+
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-error-notify.la
 else

diff --git a/src/libcharon/plugins/farp/Makefile.am b/src/libcharon/plugins/farp/Makefile.am
index 42cd3187938f11691232634c73ebab43a9868548..95e57d8e601bd70144c9b5601f52f7928e70e1f8 100644 (file)
--- a/src/libcharon/plugins/farp/Makefile.am
+++ b/src/libcharon/plugins/farp/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-farp.la

diff --git a/src/libcharon/plugins/ha/Makefile.am b/src/libcharon/plugins/ha/Makefile.am
index bc1b49d48cc47e1a9547bcbe28829792e687d5b6..c10f7f9033fe818f93e19d90147d8f8ca751312e 100644 (file)
--- a/src/libcharon/plugins/ha/Makefile.am
+++ b/src/libcharon/plugins/ha/Makefile.am
@@ -1,8 +1,11 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -DIPSEC_PIDDIR=\"${piddir}\"
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
-
-AM_CFLAGS = -rdynamic -DIPSEC_PIDDIR=\"${piddir}\"
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-ha.la
@@ -24,4 +27,3 @@ libstrongswan_ha_la_SOURCES = \
   ha_child.h ha_child.c \
   ha_attribute.h ha_attribute.c
 libstrongswan_ha_la_LDFLAGS = -module -avoid-version
-

diff --git a/src/libcharon/plugins/ipseckey/Makefile.am b/src/libcharon/plugins/ipseckey/Makefile.am
index 0614017a03d57471428fad1d0d6243df92701d7d..3a69e521f60c217afafc044b24554fb96010cbb3 100644 (file)
--- a/src/libcharon/plugins/ipseckey/Makefile.am
+++ b/src/libcharon/plugins/ipseckey/Makefile.am
@@ -1,9 +1,11 @@
-
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
+AM_CFLAGS = \
+       -rdynamic
+
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-ipseckey.la
 else

diff --git a/src/libcharon/plugins/kernel_libipsec/Makefile.am b/src/libcharon/plugins/kernel_libipsec/Makefile.am
index d57d1ae7a44e1f92f4ccfe7bda57df88ae6780df..a39d06753f92d081e359bc42f77971d02c7a385d 100644 (file)
--- a/src/libcharon/plugins/kernel_libipsec/Makefile.am
+++ b/src/libcharon/plugins/kernel_libipsec/Makefile.am
@@ -1,10 +1,11 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libipsec
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-kernel-libipsec.la

diff --git a/src/libcharon/plugins/led/Makefile.am b/src/libcharon/plugins/led/Makefile.am
index 6428361fc3097797542ec6c2a0c3d84133527610..fbe779dd66ffcadd645328d08f80c1467b50aaa1 100644 (file)
--- a/src/libcharon/plugins/led/Makefile.am
+++ b/src/libcharon/plugins/led/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-led.la

diff --git a/src/libcharon/plugins/load_tester/Makefile.am b/src/libcharon/plugins/load_tester/Makefile.am
index 0a5cada434b8092e2c748322567de73bfe6f95cd..e7c08783f5bdd527c955b8eaca1d33ef174f9911 100644 (file)
--- a/src/libcharon/plugins/load_tester/Makefile.am
+++ b/src/libcharon/plugins/load_tester/Makefile.am
@@ -1,10 +1,12 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon
-
-AM_CFLAGS = -rdynamic \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
+AM_CFLAGS = \
+       -rdynamic
+
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-load-tester.la
 else

diff --git a/src/libcharon/plugins/lookip/Makefile.am b/src/libcharon/plugins/lookip/Makefile.am
index 450995c9c59ad622054017ac359759ada79246d8..6d71c8c1317e9f38b235cda8f44f6e6e8d78786b 100644 (file)
--- a/src/libcharon/plugins/lookip/Makefile.am
+++ b/src/libcharon/plugins/lookip/Makefile.am
@@ -1,10 +1,12 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon
-
-AM_CFLAGS = -rdynamic \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
+AM_CFLAGS = \
+       -rdynamic
+
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-lookip.la
 else

diff --git a/src/libcharon/plugins/maemo/Makefile.am b/src/libcharon/plugins/maemo/Makefile.am
index 74a019af799b34b1db84c2520d02e9b516fefe5d..c3c55ba413d3966fdc40f72477c0ed89a02806b8 100644 (file)
--- a/src/libcharon/plugins/maemo/Makefile.am
+++ b/src/libcharon/plugins/maemo/Makefile.am
@@ -1,8 +1,11 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon ${maemo_CFLAGS}
-
-AM_CFLAGS = -rdynamic
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon
+
+AM_CFLAGS = \
+       ${maemo_CFLAGS} \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-maemo.la

diff --git a/src/libcharon/plugins/medcli/Makefile.am b/src/libcharon/plugins/medcli/Makefile.am
index cdff8d85475c19cff521b8851cff54803eea8f7b..f645be27ed210a5565fa5771fa83abe16d3c5ad7 100644 (file)
--- a/src/libcharon/plugins/medcli/Makefile.am
+++ b/src/libcharon/plugins/medcli/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-medcli.la

diff --git a/src/libcharon/plugins/medsrv/Makefile.am b/src/libcharon/plugins/medsrv/Makefile.am
index 7f5c8e2b36f896b56c5e2a88f93e1e4ceec38510..ec305da216106019d327f205ecbe7fa8f05f17d1 100644 (file)
--- a/src/libcharon/plugins/medsrv/Makefile.am
+++ b/src/libcharon/plugins/medsrv/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-medsrv.la

diff --git a/src/libcharon/plugins/osx_attr/Makefile.am b/src/libcharon/plugins/osx_attr/Makefile.am
index d1ceab41d2387fee139aa3c529c097c8e152f85e..f1ff22e60e2566e1866c682dfe395bf9acc299e9 100644 (file)
--- a/src/libcharon/plugins/osx_attr/Makefile.am
+++ b/src/libcharon/plugins/osx_attr/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-osx-attr.la

diff --git a/src/libcharon/plugins/radattr/Makefile.am b/src/libcharon/plugins/radattr/Makefile.am
index 0ea8df5d143156baa4daa9a19dff85d1a9abd91d..a0b0584d6860173e550aac06aab5db7b57b898a8 100644 (file)
--- a/src/libcharon/plugins/radattr/Makefile.am
+++ b/src/libcharon/plugins/radattr/Makefile.am
@@ -1,8 +1,11 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -I$(top_srcdir)/src/libradius
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libradius
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-radattr.la

diff --git a/src/libcharon/plugins/smp/Makefile.am b/src/libcharon/plugins/smp/Makefile.am
index f17235835ff42139c6a0a3a2c35eb5a17e4b5967..67b4b2a6d98967ee97cf8ac4728e838d08523757 100644 (file)
--- a/src/libcharon/plugins/smp/Makefile.am
+++ b/src/libcharon/plugins/smp/Makefile.am
@@ -1,8 +1,12 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -DIPSEC_PIDDIR=\"${piddir}\"
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon ${xml_CFLAGS}
-
-AM_CFLAGS = -rdynamic -DIPSEC_PIDDIR=\"${piddir}\"
+AM_CFLAGS = \
+       ${xml_CFLAGS} \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-smp.la

diff --git a/src/libcharon/plugins/socket_default/Makefile.am b/src/libcharon/plugins/socket_default/Makefile.am
index 635a1c548450e42c6cad119284e1b9c05ec835da..d734b313f1e62429898bb1ff50d978ad6928c03a 100644 (file)
--- a/src/libcharon/plugins/socket_default/Makefile.am
+++ b/src/libcharon/plugins/socket_default/Makefile.am
@@ -1,8 +1,11 @@
+AM_CPPFLAGS = \
+       -I${linux_headers} \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon
 
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-socket-default.la

diff --git a/src/libcharon/plugins/socket_dynamic/Makefile.am b/src/libcharon/plugins/socket_dynamic/Makefile.am
index 9149455350ff81faad14bf60840455a0341d03a7..04973e5baa6b81ad14e730aa1b85bdf38d64adbb 100644 (file)
--- a/src/libcharon/plugins/socket_dynamic/Makefile.am
+++ b/src/libcharon/plugins/socket_dynamic/Makefile.am
@@ -1,8 +1,11 @@
+AM_CPPFLAGS = \
+       -I${linux_headers} \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon
 
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-socket-dynamic.la

diff --git a/src/libcharon/plugins/sql/Makefile.am b/src/libcharon/plugins/sql/Makefile.am
index 37b87117c33de3479125ddd832ce7c2ded8d7467..fd5693123be66321a7e42010372da3b1b905cf80 100644 (file)
--- a/src/libcharon/plugins/sql/Makefile.am
+++ b/src/libcharon/plugins/sql/Makefile.am
@@ -1,7 +1,11 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
+AM_CFLAGS = \
+       -rdynamic
+
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-sql.la
 else

diff --git a/src/libcharon/plugins/stroke/Makefile.am b/src/libcharon/plugins/stroke/Makefile.am
index 39b3e79d21f73bd91bcb246cfcdd2868a80b21d9..9509b1bd3ba536d645e1c8a7ac9e5f2f7009a6d3 100644 (file)
--- a/src/libcharon/plugins/stroke/Makefile.am
+++ b/src/libcharon/plugins/stroke/Makefile.am
@@ -1,11 +1,13 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/stroke
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
+       -I$(top_srcdir)/src/stroke \
+       -DIPSEC_CONFDIR=\"${sysconfdir}\" \
+       -DIPSEC_PIDDIR=\"${piddir}\"
 
 AM_CFLAGS = \
--rdynamic \
--DIPSEC_CONFDIR=\"${sysconfdir}\" \
--DIPSEC_PIDDIR=\"${piddir}\"
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-stroke.la

diff --git a/src/libcharon/plugins/systime_fix/Makefile.am b/src/libcharon/plugins/systime_fix/Makefile.am
index a1f843db7d138899c5e6f85a85cb162abbb2c854..40a346440c1c2140cdee95d7854a182bcfc995a3 100644 (file)
--- a/src/libcharon/plugins/systime_fix/Makefile.am
+++ b/src/libcharon/plugins/systime_fix/Makefile.am
@@ -1,5 +1,6 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 if MONOLITHIC

diff --git a/src/libcharon/plugins/tnc_ifmap/Makefile.am b/src/libcharon/plugins/tnc_ifmap/Makefile.am
index 36d9316d7e01e46920556585af8305b8f35a6302..dfbb1b63265bd3789b3dca1eb62e4e62a68aa4b2 100644 (file)
--- a/src/libcharon/plugins/tnc_ifmap/Makefile.am
+++ b/src/libcharon/plugins/tnc_ifmap/Makefile.am
@@ -1,12 +1,12 @@
-
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libtls \
        -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon \
-       ${xml_CFLAGS}
+       -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       ${xml_CFLAGS} \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-tnc-ifmap.la
@@ -26,4 +26,3 @@ libstrongswan_tnc_ifmap_la_SOURCES = \
        tnc_ifmap_renew_session_job.h tnc_ifmap_renew_session_job.c
 
 libstrongswan_tnc_ifmap_la_LDFLAGS = -module -avoid-version
-

diff --git a/src/libcharon/plugins/tnc_imc/Makefile.am b/src/libcharon/plugins/tnc_imc/Makefile.am
index eba280690fa1c2ba3e987810340853c87cf42e1c..6e2b83fa0024c0941308d73cb386fe39baa67868 100644 (file)
--- a/src/libcharon/plugins/tnc_imc/Makefile.am
+++ b/src/libcharon/plugins/tnc_imc/Makefile.am
@@ -1,5 +1,4 @@
-
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
@@ -7,7 +6,8 @@ INCLUDES = \
        -I$(top_srcdir)/src/libtnccs \
        -I$(top_srcdir)/src/libtls
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-tnc-imc.la
@@ -23,4 +23,3 @@ libstrongswan_tnc_imc_la_SOURCES = \
        tnc_imc_manager.h tnc_imc_manager.c tnc_imc_bind_function.c
 
 libstrongswan_tnc_imc_la_LDFLAGS = -module -avoid-version
-

diff --git a/src/libcharon/plugins/tnc_imv/Makefile.am b/src/libcharon/plugins/tnc_imv/Makefile.am
index 90b3507ce34b7ae339fea84e68f2d53982848c3c..49efe3be4e35553eb883bd1140cb2bc3ae0e84c0 100644 (file)
--- a/src/libcharon/plugins/tnc_imv/Makefile.am
+++ b/src/libcharon/plugins/tnc_imv/Makefile.am
@@ -1,5 +1,4 @@
-
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
@@ -7,7 +6,8 @@ INCLUDES = \
        -I$(top_srcdir)/src/libtnccs \
        -I$(top_srcdir)/src/libtls
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-tnc-imv.la
@@ -24,4 +24,3 @@ libstrongswan_tnc_imv_la_SOURCES = \
        tnc_imv_recommendations.h tnc_imv_recommendations.c
 
 libstrongswan_tnc_imv_la_LDFLAGS = -module -avoid-version
-

diff --git a/src/libcharon/plugins/tnc_pdp/Makefile.am b/src/libcharon/plugins/tnc_pdp/Makefile.am
index 2d4c4d55ae13b9319663f59688631824baddbadb..ce0ddce06023b7ff5ac52240343409c4be1068be 100644 (file)
--- a/src/libcharon/plugins/tnc_pdp/Makefile.am
+++ b/src/libcharon/plugins/tnc_pdp/Makefile.am
@@ -1,11 +1,11 @@
-
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libradius
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-tnc-pdp.la
@@ -19,6 +19,6 @@ endif
 
 libstrongswan_tnc_pdp_la_SOURCES = \
        tnc_pdp_plugin.h tnc_pdp_plugin.c \
-       tnc_pdp.h tnc_pdp.c tnc_pdp_connections.h tnc_pdp_connections.c 
+       tnc_pdp.h tnc_pdp.c tnc_pdp_connections.h tnc_pdp_connections.c
 
 libstrongswan_tnc_pdp_la_LDFLAGS = -module -avoid-version

diff --git a/src/libcharon/plugins/tnc_tnccs/Makefile.am b/src/libcharon/plugins/tnc_tnccs/Makefile.am
index 9ee9e86ad92ec0b1b3fe6125c5ae778ef3491b3b..f16bf8e1b761bb8cd1f9a691b42b05a11ebd9aab 100644 (file)
--- a/src/libcharon/plugins/tnc_tnccs/Makefile.am
+++ b/src/libcharon/plugins/tnc_tnccs/Makefile.am
@@ -1,11 +1,11 @@
-
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libtls \
        -I$(top_srcdir)/src/libtncif \
        -I$(top_srcdir)/src/libtnccs
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-tnc-tnccs.la

diff --git a/src/libcharon/plugins/tnccs_11/Makefile.am b/src/libcharon/plugins/tnccs_11/Makefile.am
index 1d29460f836ec8503fa3436539d9f30d839547ed..4c0e0f7c8b8f9d6f25f63b8edc2e8fa21f4285aa 100644 (file)
--- a/src/libcharon/plugins/tnccs_11/Makefile.am
+++ b/src/libcharon/plugins/tnccs_11/Makefile.am
@@ -1,14 +1,14 @@
-
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libtls \
        -I$(top_srcdir)/src/libtncif \
-       -I$(top_srcdir)/src/libtnccs \
-       ${xml_CFLAGS}
+       -I$(top_srcdir)/src/libtnccs
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       ${xml_CFLAGS} \
+       -rdynamic
 
 libstrongswan_tnccs_11_la_LIBADD = ${xml_LIBS}
 
@@ -33,4 +33,3 @@ libstrongswan_tnccs_11_la_SOURCES = \
        messages/tnccs_tncs_contact_info_msg.h messages/tnccs_tncs_contact_info_msg.c
 
 libstrongswan_tnccs_11_la_LDFLAGS = -module -avoid-version
-

diff --git a/src/libcharon/plugins/tnccs_20/Makefile.am b/src/libcharon/plugins/tnccs_20/Makefile.am
index da924b4127d6a6b98abc49c4834dd85516994220..7a2b6c9c2060607671fadd9a205c9473b4bb158d 100644 (file)
--- a/src/libcharon/plugins/tnccs_20/Makefile.am
+++ b/src/libcharon/plugins/tnccs_20/Makefile.am
@@ -1,5 +1,4 @@
-
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libhydra \
@@ -7,7 +6,8 @@ INCLUDES = \
        -I$(top_srcdir)/src/libtncif \
        -I$(top_srcdir)/src/libtnccs
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-tnccs-20.la

diff --git a/src/libcharon/plugins/tnccs_dynamic/Makefile.am b/src/libcharon/plugins/tnccs_dynamic/Makefile.am
index 57c2baaf0de9b95f6a3f4b4a96f706f556b82a94..1a2887816b40324d036e703bd518f99adebbc417 100644 (file)
--- a/src/libcharon/plugins/tnccs_dynamic/Makefile.am
+++ b/src/libcharon/plugins/tnccs_dynamic/Makefile.am
@@ -1,11 +1,11 @@
-
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libtls \
        -I$(top_srcdir)/src/libtncif \
        -I$(top_srcdir)/src/libtnccs
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-tnccs-dynamic.la

diff --git a/src/libcharon/plugins/uci/Makefile.am b/src/libcharon/plugins/uci/Makefile.am
index 6decdb9da0094fa4e9e4acbae49c3a1f46b79168..1fcd9ed2584bfb80bd156b08177cd6d9c319b928 100644 (file)
--- a/src/libcharon/plugins/uci/Makefile.am
+++ b/src/libcharon/plugins/uci/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-uci.la

diff --git a/src/libcharon/plugins/unit_tester/Makefile.am b/src/libcharon/plugins/unit_tester/Makefile.am
index 919c9bc900737e797ce42bdb5fbdb0976f9d6596..21cf08c615cd6c36ca78ca83c70f899ce02b9a2c 100644 (file)
--- a/src/libcharon/plugins/unit_tester/Makefile.am
+++ b/src/libcharon/plugins/unit_tester/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-unit-tester.la

diff --git a/src/libcharon/plugins/unity/Makefile.am b/src/libcharon/plugins/unity/Makefile.am
index b23143fd6a5e45d70d6133e12b9a3d8c0df218fb..b50dc9a0324a84158cdcb685039745a0f221923e 100644 (file)
--- a/src/libcharon/plugins/unity/Makefile.am
+++ b/src/libcharon/plugins/unity/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-unity.la

diff --git a/src/libcharon/plugins/updown/Makefile.am b/src/libcharon/plugins/updown/Makefile.am
index 30683d83e864c8116a329eaef3b9d50437a942c4..a35909408796b831bba6d2d8893b92357dfe9b24 100644 (file)
--- a/src/libcharon/plugins/updown/Makefile.am
+++ b/src/libcharon/plugins/updown/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-updown.la

diff --git a/src/libcharon/plugins/whitelist/Makefile.am b/src/libcharon/plugins/whitelist/Makefile.am
index 064a759dd23f6f5e69ac63a761b1960588584817..e02b4a0416fc8f167ca07c590a90244d4966bc1c 100644 (file)
--- a/src/libcharon/plugins/whitelist/Makefile.am
+++ b/src/libcharon/plugins/whitelist/Makefile.am
@@ -1,10 +1,12 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon
-
-AM_CFLAGS = -rdynamic \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
+AM_CFLAGS = \
+       -rdynamic
+
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-whitelist.la
 else

diff --git a/src/libcharon/plugins/xauth_eap/Makefile.am b/src/libcharon/plugins/xauth_eap/Makefile.am
index f2cb0e26cd49f463fd5085882809ef06e6612ef4..21f8d029735e2f695085a2145df4c681787f5407 100644 (file)
--- a/src/libcharon/plugins/xauth_eap/Makefile.am
+++ b/src/libcharon/plugins/xauth_eap/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-xauth-eap.la

diff --git a/src/libcharon/plugins/xauth_generic/Makefile.am b/src/libcharon/plugins/xauth_generic/Makefile.am
index 0f25e74a2d633220387a66b2bd9d3cd5ae7d4ade..d48e52ddd66619cc7026b81b1431c4e60f26b9ba 100644 (file)
--- a/src/libcharon/plugins/xauth_generic/Makefile.am
+++ b/src/libcharon/plugins/xauth_generic/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-xauth-generic.la

diff --git a/src/libcharon/plugins/xauth_noauth/Makefile.am b/src/libcharon/plugins/xauth_noauth/Makefile.am
index b838af63a3ab0133b4faa8b3a5624fcea6221fb1..f1581ba673bde2be7a72cf141a05fa9c8d88e15d 100644 (file)
--- a/src/libcharon/plugins/xauth_noauth/Makefile.am
+++ b/src/libcharon/plugins/xauth_noauth/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-xauth-noauth.la

diff --git a/src/libcharon/plugins/xauth_pam/Makefile.am b/src/libcharon/plugins/xauth_pam/Makefile.am
index 47521a3ff2c5be6f79d81c6ccff4b15254df3509..a7d4f6436a0774c694f0965e8e3d0f51b9759189 100644 (file)
--- a/src/libcharon/plugins/xauth_pam/Makefile.am
+++ b/src/libcharon/plugins/xauth_pam/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-xauth-pam.la

diff --git a/src/libfast/Makefile.am b/src/libfast/Makefile.am
index db910487d5d5bd4a5fbc9497e61093e46ef46ccc..edc2ab1cab3f5a177f2e59689c70507832838d51 100644 (file)
--- a/src/libfast/Makefile.am
+++ b/src/libfast/Makefile.am
@@ -1,3 +1,10 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I/usr/include/ClearSilver
+
+AM_CFLAGS = \
+       -rdynamic
+
 ipseclib_LTLIBRARIES = libfast.la
 
 libfast_la_SOURCES = \
@@ -12,5 +19,3 @@ endif
 
 libfast_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la \
   -lfcgi $(clearsilver_LIBS) $(PTHREADLIB)
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I/usr/include/ClearSilver
-AM_CFLAGS = -rdynamic

diff --git a/src/libhydra/Makefile.am b/src/libhydra/Makefile.am
index 1c7b3ba438935f192ba869022e4ea631975b1b58..a2a164bd99facf30307e72237606b95c7dc42c2d 100644 (file)
--- a/src/libhydra/Makefile.am
+++ b/src/libhydra/Makefile.am
@@ -13,11 +13,11 @@ kernel/kernel_listener.h
 
 libhydra_la_LIBADD =
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-AM_CFLAGS = \
--DIPSEC_DIR=\"${ipsecdir}\" \
--DPLUGINDIR=\"${plugindir}\" \
--DSTRONGSWAN_CONF=\"${strongswan_conf}\"
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -DIPSEC_DIR=\"${ipsecdir}\" \
+       -DPLUGINDIR=\"${plugindir}\" \
+       -DSTRONGSWAN_CONF=\"${strongswan_conf}\"
 
 EXTRA_DIST = Android.mk
 
@@ -78,4 +78,3 @@ if MONOLITHIC
   libhydra_la_LIBADD += plugins/resolve/libstrongswan-resolve.la
 endif
 endif
-

diff --git a/src/libhydra/plugins/attr/Makefile.am b/src/libhydra/plugins/attr/Makefile.am
index fe0c39ebdd878bc62d3693d957bbf01c8d8c9063..5989beae4e5b799ad83627a349ebbe0551d86f67 100644 (file)
--- a/src/libhydra/plugins/attr/Makefile.am
+++ b/src/libhydra/plugins/attr/Makefile.am
@@ -1,7 +1,9 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-attr.la

diff --git a/src/libhydra/plugins/attr_sql/Makefile.am b/src/libhydra/plugins/attr_sql/Makefile.am
index 7491debcd040aa04eb1fb78072c8bc10fd481f9e..4c369a2bd41f76587f824f187aad93ffce1f1f64 100644 (file)
--- a/src/libhydra/plugins/attr_sql/Makefile.am
+++ b/src/libhydra/plugins/attr_sql/Makefile.am
@@ -1,9 +1,10 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -DPLUGINS=\""${pool_plugins}\""
 
 AM_CFLAGS = \
-       -rdynamic \
-       -DPLUGINS=\""${pool_plugins}\""
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-attr-sql.la

diff --git a/src/libhydra/plugins/kernel_klips/Makefile.am b/src/libhydra/plugins/kernel_klips/Makefile.am
index df639b255ea5bcddcb4ab43bd6202188793c0714..1b98cab064734280ca180e180b3784dd20bb0d26 100644 (file)
--- a/src/libhydra/plugins/kernel_klips/Makefile.am
+++ b/src/libhydra/plugins/kernel_klips/Makefile.am
@@ -1,7 +1,9 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-kernel-klips.la

diff --git a/src/libhydra/plugins/kernel_netlink/Makefile.am b/src/libhydra/plugins/kernel_netlink/Makefile.am
index 1ad379421f6e7482e0f65ae3556e3493983481a9..ad573523eef2bf10d38ef34cf3484f3859bbf481 100644 (file)
--- a/src/libhydra/plugins/kernel_netlink/Makefile.am
+++ b/src/libhydra/plugins/kernel_netlink/Makefile.am
@@ -1,10 +1,12 @@
+AM_CPPFLAGS = \
+       -I${linux_headers} \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -DROUTING_TABLE=${routing_table} \
+       -DROUTING_TABLE_PRIO=${routing_table_prio}
 
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra
-
-AM_CFLAGS = -rdynamic \
--DROUTING_TABLE=${routing_table} \
--DROUTING_TABLE_PRIO=${routing_table_prio}
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-kernel-netlink.la

diff --git a/src/libhydra/plugins/kernel_pfkey/Makefile.am b/src/libhydra/plugins/kernel_pfkey/Makefile.am
index 1d1488a6bafb5dd5ff348bfa23143a4adeb4b24b..bb5d0d7f7e2ae4640c469cf61454d16fae6920d4 100644 (file)
--- a/src/libhydra/plugins/kernel_pfkey/Makefile.am
+++ b/src/libhydra/plugins/kernel_pfkey/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan \
+AM_CPPFLAGS = \
+       -I${linux_headers} \
+       -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libhydra
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-kernel-pfkey.la

diff --git a/src/libhydra/plugins/kernel_pfroute/Makefile.am b/src/libhydra/plugins/kernel_pfroute/Makefile.am
index df3109eb8c59de3b37a38ec8d170d820290e562d..9d162136601e778138652352e79ed31e0e7b131a 100644 (file)
--- a/src/libhydra/plugins/kernel_pfroute/Makefile.am
+++ b/src/libhydra/plugins/kernel_pfroute/Makefile.am
@@ -1,8 +1,10 @@
-
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan \
+AM_CPPFLAGS = \
+       -I${linux_headers} \
+       -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libhydra
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-kernel-pfroute.la

diff --git a/src/libhydra/plugins/resolve/Makefile.am b/src/libhydra/plugins/resolve/Makefile.am
index a05c84061a94a6706bb36c6ed81b71df7dd75079..4cbf65fc0e58cc135e1fcea412dc2650d0f4b6d5 100644 (file)
--- a/src/libhydra/plugins/resolve/Makefile.am
+++ b/src/libhydra/plugins/resolve/Makefile.am
@@ -1,9 +1,11 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra
-
-AM_CFLAGS = -rdynamic \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
        -DRESOLV_CONF=\"${resolv_conf}\"
 
+AM_CFLAGS = \
+       -rdynamic
+
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-resolve.la
 else

diff --git a/src/libimcv/Makefile.am b/src/libimcv/Makefile.am
index 3a9f323691ede2281b464cec215a41da877f062e..e1e6541aa2d38ab0bf21946705226f1141c8038c 100644 (file)
--- a/src/libimcv/Makefile.am
+++ b/src/libimcv/Makefile.am
@@ -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
 

diff --git a/src/libimcv/plugins/imc_os/Makefile.am b/src/libimcv/plugins/imc_os/Makefile.am
index 0bfe776a548b7473730a7fba674ec72a0230f292..83c46558b40af685d5db69262a8e87bb2f2ccc8e 100644 (file)
--- a/src/libimcv/plugins/imc_os/Makefile.am
+++ b/src/libimcv/plugins/imc_os/Makefile.am
@@ -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
-

diff --git a/src/libimcv/plugins/imc_scanner/Makefile.am b/src/libimcv/plugins/imc_scanner/Makefile.am
index f27d73b67fd33808af62b2a630b9aa3a4f3dff21..b294541c408c37b6b434261a3722568614f4f33c 100644 (file)
--- a/src/libimcv/plugins/imc_scanner/Makefile.am
+++ b/src/libimcv/plugins/imc_scanner/Makefile.am
@@ -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
-

diff --git a/src/libimcv/plugins/imc_test/Makefile.am b/src/libimcv/plugins/imc_test/Makefile.am
index b55e7bcd41b622ea4839e71a672d75dd232103ab..b1a719ab4f5ad323576c3114cdb8a481075c6423 100644 (file)
--- a/src/libimcv/plugins/imc_test/Makefile.am
+++ b/src/libimcv/plugins/imc_test/Makefile.am
@@ -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
-

diff --git a/src/libimcv/plugins/imv_os/Makefile.am b/src/libimcv/plugins/imv_os/Makefile.am
index 13dd3d669053ab2415c51fd5d164ca2bba49e802..4713b0913b865eb2384613f6a80b0d03f96a18ec 100644 (file)
--- a/src/libimcv/plugins/imv_os/Makefile.am
+++ b/src/libimcv/plugins/imv_os/Makefile.am
@@ -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
-

diff --git a/src/libimcv/plugins/imv_scanner/Makefile.am b/src/libimcv/plugins/imv_scanner/Makefile.am
index 72d90c71a18b2894f50b7582094b2733537178b2..625e62316d61f2eba8fbb016e2ba878a5e6ee037 100644 (file)
--- a/src/libimcv/plugins/imv_scanner/Makefile.am
+++ b/src/libimcv/plugins/imv_scanner/Makefile.am
@@ -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
-

diff --git a/src/libimcv/plugins/imv_test/Makefile.am b/src/libimcv/plugins/imv_test/Makefile.am
index 9e6f161e38ee72fddffe6f35e3180298a8448045..34922867ecfcb7314fd584c12a791fb600e42828 100644 (file)
--- a/src/libimcv/plugins/imv_test/Makefile.am
+++ b/src/libimcv/plugins/imv_test/Makefile.am
@@ -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
-

diff --git a/src/libipsec/Makefile.am b/src/libipsec/Makefile.am
index 35b8d7916fcba95df887d18de8edb4023ec62f9e..74379f1d5095f46c58bda00ec4fc186da69ad498 100644 (file)
--- a/src/libipsec/Makefile.am
+++ b/src/libipsec/Makefile.am
@@ -15,7 +15,7 @@ ipsec_sa_mgr.c ipsec_sa_mgr.h
 
 libipsec_la_LIBADD =
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan
 
 EXTRA_DIST = Android.mk
@@ -28,4 +28,3 @@ SUBDIRS =
 else
 SUBDIRS = .
 endif
-

diff --git a/src/libpts/Makefile.am b/src/libpts/Makefile.am
index 7810e981cfcf34a98e4fad37e6d4d0a6edb4bc5d..162af5d0d05ae57432acbefe363286adc01afca9 100644 (file)
--- a/src/libpts/Makefile.am
+++ b/src/libpts/Makefile.am
@@ -1,5 +1,4 @@
-
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libtncif \
        -I$(top_srcdir)/src/libimcv

diff --git a/src/libpts/plugins/imc_attestation/Makefile.am b/src/libpts/plugins/imc_attestation/Makefile.am
index 9d78b935aad5c04e01af9a82eda97b55d22d3b45..18c756884d94187c592fc225519e54650130396c 100644 (file)
--- a/src/libpts/plugins/imc_attestation/Makefile.am
+++ b/src/libpts/plugins/imc_attestation/Makefile.am
@@ -1,8 +1,11 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libtncif \
+       -I$(top_srcdir)/src/libimcv \
+       -I$(top_srcdir)/src/libpts
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \
-       -I$(top_srcdir)/src/libimcv -I$(top_srcdir)/src/libpts
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 imcv_LTLIBRARIES = imc-attestation.la
 
@@ -15,4 +18,3 @@ imc_attestation_la_SOURCES = imc_attestation.c \
        imc_attestation_process.h imc_attestation_process.c
 
 imc_attestation_la_LDFLAGS = -module -avoid-version
-

diff --git a/src/libpts/plugins/imv_attestation/Makefile.am b/src/libpts/plugins/imv_attestation/Makefile.am
index d01bc50d232896f1562a1aa9f5f8edf14391b9df..ae5225ae35d3fce354971a54342898ba9e5c8c51 100644 (file)
--- a/src/libpts/plugins/imv_attestation/Makefile.am
+++ b/src/libpts/plugins/imv_attestation/Makefile.am
@@ -1,11 +1,12 @@
-
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libtncif \
        -I$(top_srcdir)/src/libimcv \
-       -I$(top_srcdir)/src/libpts
+       -I$(top_srcdir)/src/libpts \
+       -DPLUGINS=\""${attest_plugins}\""
 
-AM_CFLAGS = -rdynamic -DPLUGINS=\""${attest_plugins}\""
+AM_CFLAGS = \
+       -rdynamic
 
 imcv_LTLIBRARIES = imv-attestation.la
 

diff --git a/src/libpttls/Makefile.am b/src/libpttls/Makefile.am
index 48123181b2cd323a211442bfb9d882b3219bda28..225d0e48f3f085a851b97d9ff58f424100c54399 100644 (file)
--- a/src/libpttls/Makefile.am
+++ b/src/libpttls/Makefile.am
@@ -1,6 +1,8 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtls \
-       -I$(top_srcdir)/src/libtncif -I$(top_srcdir)/src/libtnccs
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libtls \
+       -I$(top_srcdir)/src/libtncif \
+       -I$(top_srcdir)/src/libtnccs
 
 ipseclib_LTLIBRARIES = libpttls.la
 libpttls_la_LIBADD = $(top_builddir)/src/libtls/libtls.la

diff --git a/src/libradius/Makefile.am b/src/libradius/Makefile.am
index 5672f7b840c324a0b19a2fa034f00e0d10999bec..91ded23e3a5945f646aa885b837bd9985a5f17a1 100644 (file)
--- a/src/libradius/Makefile.am
+++ b/src/libradius/Makefile.am
@@ -1,5 +1,5 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
 ipseclib_LTLIBRARIES = libradius.la
 libradius_la_SOURCES = \
@@ -8,4 +8,3 @@ libradius_la_SOURCES = \
        radius_client.h radius_client.c \
        radius_config.h radius_config.c \
        radius_mppe.h
-

diff --git a/src/libsimaka/Makefile.am b/src/libsimaka/Makefile.am
index 80d4fb814f0d7210abad94b3c0cf7f8e5ed5487e..8aaac7de0f08e4c6a7a6901229731330985f9566 100644 (file)
--- a/src/libsimaka/Makefile.am
+++ b/src/libsimaka/Makefile.am
@@ -1,5 +1,7 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon
 
 ipseclib_LTLIBRARIES = libsimaka.la
 libsimaka_la_SOURCES = simaka_message.h simaka_message.c \

diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 82d2159ce98c0c1620a65bbb516bfb875783e1ab..e131f2ef97fa24fdee9381fd4017a18dbf125f23 100644 (file)
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -83,25 +83,27 @@ library.lo :        $(top_builddir)/config.status
 
 libstrongswan_la_LIBADD = $(PTHREADLIB) $(DLLIB) $(BTLIB) $(SOCKLIB) $(RTLIB) $(BFDLIB) $(UNWINDLIB)
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -DIPSEC_DIR=\"${ipsecdir}\" \
+       -DIPSEC_LIB_DIR=\"${ipseclibdir}\" \
+       -DPLUGINDIR=\"${plugindir}\" \
+       -DSTRONGSWAN_CONF=\"${strongswan_conf}\"
+
 AM_CFLAGS = \
--DIPSEC_DIR=\"${ipsecdir}\" \
--DIPSEC_LIB_DIR=\"${ipseclibdir}\" \
--DPLUGINDIR=\"${plugindir}\" \
--DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
-@COVERAGE_CFLAGS@
+       @COVERAGE_CFLAGS@
 
 if USE_LEAK_DETECTIVE
-  AM_CFLAGS += -DLEAK_DETECTIVE
+  AM_CPPFLAGS += -DLEAK_DETECTIVE
   libstrongswan_la_SOURCES += utils/leak_detective.c
 endif
 
 if USE_LOCK_PROFILER
-  AM_CFLAGS += -DLOCK_PROFILER
+  AM_CPPFLAGS += -DLOCK_PROFILER
 endif
 
 if USE_INTEGRITY_TEST
-  AM_CFLAGS += -DINTEGRITY_TEST
+  AM_CPPFLAGS += -DINTEGRITY_TEST
   libstrongswan_la_SOURCES += utils/integrity_checker.c
 endif
 

diff --git a/src/libstrongswan/plugins/aes/Makefile.am b/src/libstrongswan/plugins/aes/Makefile.am
index e72daeb44a83aa5e07ac9b97fb3837a677152354..8c5505bfcf6276d331867f554f6f4d664e371621 100644 (file)
--- a/src/libstrongswan/plugins/aes/Makefile.am
+++ b/src/libstrongswan/plugins/aes/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-aes.la

diff --git a/src/libstrongswan/plugins/af_alg/Makefile.am b/src/libstrongswan/plugins/af_alg/Makefile.am
index a33fd30b6590d19ef410d4ea8723a0bdf77c9574..58113ca3de54ab45f6ab7cf7e3d9403f014e3b7d 100644 (file)
--- a/src/libstrongswan/plugins/af_alg/Makefile.am
+++ b/src/libstrongswan/plugins/af_alg/Makefile.am
@@ -1,7 +1,9 @@
+AM_CPPFLAGS = \
+       -I${linux_headers} \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-af-alg.la

diff --git a/src/libstrongswan/plugins/agent/Makefile.am b/src/libstrongswan/plugins/agent/Makefile.am
index ffa6e8b7f9229c50da5c4111ddc3c15caca1e5d6..e60d193635921bfff7b16ac19ae0db65a579027e 100644 (file)
--- a/src/libstrongswan/plugins/agent/Makefile.am
+++ b/src/libstrongswan/plugins/agent/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-agent.la

diff --git a/src/libstrongswan/plugins/blowfish/Makefile.am b/src/libstrongswan/plugins/blowfish/Makefile.am
index 95c414204f386411df65b49f156a2b0c2dbb5ea4..3e5cf8f089f46d4c711ed9479efab3f06913fe46 100644 (file)
--- a/src/libstrongswan/plugins/blowfish/Makefile.am
+++ b/src/libstrongswan/plugins/blowfish/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-blowfish.la

diff --git a/src/libstrongswan/plugins/ccm/Makefile.am b/src/libstrongswan/plugins/ccm/Makefile.am
index bca1f073505613dbce2532306447bfc1f9c0b681..d512f5a94f38f1d1f25cf6e2729bf476645f40b6 100644 (file)
--- a/src/libstrongswan/plugins/ccm/Makefile.am
+++ b/src/libstrongswan/plugins/ccm/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-ccm.la

diff --git a/src/libstrongswan/plugins/cmac/Makefile.am b/src/libstrongswan/plugins/cmac/Makefile.am
index 5cac3959cf528721c6f239bd65c388ee58fac437..08e910be14b9965736f6b1a416c2bb94b1759fef 100644 (file)
--- a/src/libstrongswan/plugins/cmac/Makefile.am
+++ b/src/libstrongswan/plugins/cmac/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-cmac.la

diff --git a/src/libstrongswan/plugins/constraints/Makefile.am b/src/libstrongswan/plugins/constraints/Makefile.am
index d80d39a2d318e8fddcd788077a0958cefdc2c918..8afde7013707e853a14b2000396d031b9c17cfba 100644 (file)
--- a/src/libstrongswan/plugins/constraints/Makefile.am
+++ b/src/libstrongswan/plugins/constraints/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-constraints.la

diff --git a/src/libstrongswan/plugins/ctr/Makefile.am b/src/libstrongswan/plugins/ctr/Makefile.am
index 893171aabc85eb585cc6039d94151583ce43cf17..52278b6d2f7bb74ce01e3d62957a46bf69d1ccc6 100644 (file)
--- a/src/libstrongswan/plugins/ctr/Makefile.am
+++ b/src/libstrongswan/plugins/ctr/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-ctr.la

diff --git a/src/libstrongswan/plugins/curl/Makefile.am b/src/libstrongswan/plugins/curl/Makefile.am
index 43718f678854cf12c01cdc555e7d66a46a99fc2b..17bcc8d98acc317b90de40671c84f4a1c2d15c84 100644 (file)
--- a/src/libstrongswan/plugins/curl/Makefile.am
+++ b/src/libstrongswan/plugins/curl/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-curl.la

diff --git a/src/libstrongswan/plugins/des/Makefile.am b/src/libstrongswan/plugins/des/Makefile.am
index c7d9ce915ee153abec9f7feac34c850ba12c161a..9ca9659952d016ce2fbfa1eb86afcee35a4ab9ca 100644 (file)
--- a/src/libstrongswan/plugins/des/Makefile.am
+++ b/src/libstrongswan/plugins/des/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-des.la

diff --git a/src/libstrongswan/plugins/dnskey/Makefile.am b/src/libstrongswan/plugins/dnskey/Makefile.am
index 0f2e554c1ee415cf0663231b002f8c20c441ee10..7e74fd897673a655663cb3dca564686ac5bff8b9 100644 (file)
--- a/src/libstrongswan/plugins/dnskey/Makefile.am
+++ b/src/libstrongswan/plugins/dnskey/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-dnskey.la

diff --git a/src/libstrongswan/plugins/fips_prf/Makefile.am b/src/libstrongswan/plugins/fips_prf/Makefile.am
index c9cf2c9774944a3511090b0817b2c5b67d10a3a9..a7ae612c01f2f58d99e1506645b8454e41c2bb63 100644 (file)
--- a/src/libstrongswan/plugins/fips_prf/Makefile.am
+++ b/src/libstrongswan/plugins/fips_prf/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-fips-prf.la

diff --git a/src/libstrongswan/plugins/gcm/Makefile.am b/src/libstrongswan/plugins/gcm/Makefile.am
index ec733fbcc2a993084a4764b2d59bf2e171796172..228b4708d073dfdd1371c601b43a9883d932dac5 100644 (file)
--- a/src/libstrongswan/plugins/gcm/Makefile.am
+++ b/src/libstrongswan/plugins/gcm/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-gcm.la

diff --git a/src/libstrongswan/plugins/gcrypt/Makefile.am b/src/libstrongswan/plugins/gcrypt/Makefile.am
index 57f3f5016cfdd0ae337798500318679da82c5eb9..1a9d225ec6e536e533d09e6d300405e3c661012a 100644 (file)
--- a/src/libstrongswan/plugins/gcrypt/Makefile.am
+++ b/src/libstrongswan/plugins/gcrypt/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-gcrypt.la

diff --git a/src/libstrongswan/plugins/gmp/Makefile.am b/src/libstrongswan/plugins/gmp/Makefile.am
index cc8ad34db1d061921a126b19ef4dc94ff91a73cc..57e1fd7a81953ec2cd986b7b130870a543a677fa 100644 (file)
--- a/src/libstrongswan/plugins/gmp/Makefile.am
+++ b/src/libstrongswan/plugins/gmp/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-gmp.la

diff --git a/src/libstrongswan/plugins/hmac/Makefile.am b/src/libstrongswan/plugins/hmac/Makefile.am
index 4faf321efa2abb19b687106ebdada18092522156..5d88d26c80b4aba3964bb30efb3de54683e47050 100644 (file)
--- a/src/libstrongswan/plugins/hmac/Makefile.am
+++ b/src/libstrongswan/plugins/hmac/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-hmac.la

diff --git a/src/libstrongswan/plugins/ldap/Makefile.am b/src/libstrongswan/plugins/ldap/Makefile.am
index 2b2f7d31dd0a0dbbb480db52947e85c728579a5b..3bcef1aa8874cee17da2f2fa943bad3b26e2f928 100644 (file)
--- a/src/libstrongswan/plugins/ldap/Makefile.am
+++ b/src/libstrongswan/plugins/ldap/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-ldap.la

diff --git a/src/libstrongswan/plugins/md4/Makefile.am b/src/libstrongswan/plugins/md4/Makefile.am
index 904af70c08ccddc82913f51d033cf0fffef789d5..a2fe8ecabc79c95842d6a448579d38b91fa2e568 100644 (file)
--- a/src/libstrongswan/plugins/md4/Makefile.am
+++ b/src/libstrongswan/plugins/md4/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-md4.la

diff --git a/src/libstrongswan/plugins/md5/Makefile.am b/src/libstrongswan/plugins/md5/Makefile.am
index b2eb2abd2c488cefc8a1695727853cb97813a608..fc6406afa0f996402227b241b7c4a9fe2b54d0c9 100644 (file)
--- a/src/libstrongswan/plugins/md5/Makefile.am
+++ b/src/libstrongswan/plugins/md5/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-md5.la

diff --git a/src/libstrongswan/plugins/mysql/Makefile.am b/src/libstrongswan/plugins/mysql/Makefile.am
index 801a7a7be14d9d02987c61f247a6d84594ec7379..588b7991b82a335aec796b8ab0532e012bd0e8fc 100644 (file)
--- a/src/libstrongswan/plugins/mysql/Makefile.am
+++ b/src/libstrongswan/plugins/mysql/Makefile.am
@@ -1,7 +1,9 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic $(MYSQLCFLAG)
+AM_CFLAGS = \
+       $(MYSQLCFLAG) \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-mysql.la
@@ -15,4 +17,3 @@ libstrongswan_mysql_la_SOURCES = \
 
 libstrongswan_mysql_la_LDFLAGS = -module -avoid-version
 libstrongswan_mysql_la_LIBADD  = $(MYSQLLIB)
-

diff --git a/src/libstrongswan/plugins/nonce/Makefile.am b/src/libstrongswan/plugins/nonce/Makefile.am
index 0a2ccfc080b89896f26f735b5283eda11d52e4cb..7dde99e5f1b0d7c8df3ea0693eebbd287a821993 100644 (file)
--- a/src/libstrongswan/plugins/nonce/Makefile.am
+++ b/src/libstrongswan/plugins/nonce/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-nonce.la

diff --git a/src/libstrongswan/plugins/openssl/Makefile.am b/src/libstrongswan/plugins/openssl/Makefile.am
index 7ae5ea43e05de6c52c0d3ab01279679a56ee5abd..cbfd69b71ff7818a2440c06751f495b465bc7653 100644 (file)
--- a/src/libstrongswan/plugins/openssl/Makefile.am
+++ b/src/libstrongswan/plugins/openssl/Makefile.am
@@ -1,7 +1,9 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -DFIPS_MODE=${fips_mode}
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic -DFIPS_MODE=${fips_mode}
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-openssl.la
@@ -31,4 +33,3 @@ libstrongswan_openssl_la_SOURCES = \
 
 libstrongswan_openssl_la_LDFLAGS = -module -avoid-version
 libstrongswan_openssl_la_LIBADD  = -lcrypto
-

diff --git a/src/libstrongswan/plugins/padlock/Makefile.am b/src/libstrongswan/plugins/padlock/Makefile.am
index 6706d26cb8b3644a8379a0752f2adb4aeb4ad5d8..0acd8384c14bbcff369b7cc4f1948e2d8bf0f6c4 100644 (file)
--- a/src/libstrongswan/plugins/padlock/Makefile.am
+++ b/src/libstrongswan/plugins/padlock/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-padlock.la

diff --git a/src/libstrongswan/plugins/pem/Makefile.am b/src/libstrongswan/plugins/pem/Makefile.am
index b815b1e0b0706d9bc4ec774d3b13db883c3a707b..9aa853e13a203ef8ee50b4dc09fa99b76c059d46 100644 (file)
--- a/src/libstrongswan/plugins/pem/Makefile.am
+++ b/src/libstrongswan/plugins/pem/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-pem.la

diff --git a/src/libstrongswan/plugins/pgp/Makefile.am b/src/libstrongswan/plugins/pgp/Makefile.am
index 4b414616d61f0644f644fd206a2b441d3e09f447..d3eef3ce1739db73097cc1173fc58dd7265a475a 100644 (file)
--- a/src/libstrongswan/plugins/pgp/Makefile.am
+++ b/src/libstrongswan/plugins/pgp/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-pgp.la

diff --git a/src/libstrongswan/plugins/pkcs1/Makefile.am b/src/libstrongswan/plugins/pkcs1/Makefile.am
index bd3203dae9d6fc480267389bfacef90b11b1d14c..5dbc4e9c2f94c4934e179d99609ef95e1acc8122 100644 (file)
--- a/src/libstrongswan/plugins/pkcs1/Makefile.am
+++ b/src/libstrongswan/plugins/pkcs1/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-pkcs1.la

diff --git a/src/libstrongswan/plugins/pkcs11/Makefile.am b/src/libstrongswan/plugins/pkcs11/Makefile.am
index d032b879a70b43e3f38e08a702cf0d8e493b9a7c..1d175ecb4a6bb3553056e001b8ecc6ba1e99865b 100644 (file)
--- a/src/libstrongswan/plugins/pkcs11/Makefile.am
+++ b/src/libstrongswan/plugins/pkcs11/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-pkcs11.la

diff --git a/src/libstrongswan/plugins/pkcs12/Makefile.am b/src/libstrongswan/plugins/pkcs12/Makefile.am
index 1f703bd6caa3972e283b43c5839c2f6dbfcc091d..af472ba82c0b1244c1fdeaac98b56926d0b788ae 100644 (file)
--- a/src/libstrongswan/plugins/pkcs12/Makefile.am
+++ b/src/libstrongswan/plugins/pkcs12/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-pkcs12.la

diff --git a/src/libstrongswan/plugins/pkcs7/Makefile.am b/src/libstrongswan/plugins/pkcs7/Makefile.am
index 000bde23e7775b28b07e9067f5a8834cf8e0bf29..080947f46f145a136a0d2af830e6d4405da550f4 100644 (file)
--- a/src/libstrongswan/plugins/pkcs7/Makefile.am
+++ b/src/libstrongswan/plugins/pkcs7/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-pkcs7.la

diff --git a/src/libstrongswan/plugins/pkcs8/Makefile.am b/src/libstrongswan/plugins/pkcs8/Makefile.am
index bcaf2c6a5429f71b5e22415b859b2c83682f072c..98e3263dfe1e2d20e17ac45a4ddc00763ec8b460 100644 (file)
--- a/src/libstrongswan/plugins/pkcs8/Makefile.am
+++ b/src/libstrongswan/plugins/pkcs8/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-pkcs8.la

diff --git a/src/libstrongswan/plugins/pubkey/Makefile.am b/src/libstrongswan/plugins/pubkey/Makefile.am
index c2974a585d3c08ba6708d11941c7caaabdebed8f..4f23544559da94b52acc815c6b46d57dfa2df284 100644 (file)
--- a/src/libstrongswan/plugins/pubkey/Makefile.am
+++ b/src/libstrongswan/plugins/pubkey/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-pubkey.la

diff --git a/src/libstrongswan/plugins/random/Makefile.am b/src/libstrongswan/plugins/random/Makefile.am
index 5df99271816fb2310b1691d6f4acb301052e4aaf..7c03c66ef692a98943ebbc34c9ffd7e9a9a307b0 100644 (file)
--- a/src/libstrongswan/plugins/random/Makefile.am
+++ b/src/libstrongswan/plugins/random/Makefile.am
@@ -1,9 +1,10 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -DDEV_RANDOM=\"${random_device}\" \
+       -DDEV_URANDOM=\"${urandom_device}\"
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic \
--DDEV_RANDOM=\"${random_device}\" \
--DDEV_URANDOM=\"${urandom_device}\"
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-random.la

diff --git a/src/libstrongswan/plugins/rc2/Makefile.am b/src/libstrongswan/plugins/rc2/Makefile.am
index 156574de3137c183726f3af8c7ca1ef1108cdacf..3f892728d33419e6da3343b5ade9348ae7dea777 100644 (file)
--- a/src/libstrongswan/plugins/rc2/Makefile.am
+++ b/src/libstrongswan/plugins/rc2/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-rc2.la

diff --git a/src/libstrongswan/plugins/rdrand/Makefile.am b/src/libstrongswan/plugins/rdrand/Makefile.am
index 4be7b7215f229cbb66243286570aec7d0b4f0847..d9cb00161d5d3b0d3ab2d50bc7b55962e86c3966 100644 (file)
--- a/src/libstrongswan/plugins/rdrand/Makefile.am
+++ b/src/libstrongswan/plugins/rdrand/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-rdrand.la

diff --git a/src/libstrongswan/plugins/revocation/Makefile.am b/src/libstrongswan/plugins/revocation/Makefile.am
index fb6d019263438a3a94a9e9c49eefd24630bcadae..5bb5ac2045a81c8bde3a2a8542d433aeeca56d64 100644 (file)
--- a/src/libstrongswan/plugins/revocation/Makefile.am
+++ b/src/libstrongswan/plugins/revocation/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-revocation.la

diff --git a/src/libstrongswan/plugins/sha1/Makefile.am b/src/libstrongswan/plugins/sha1/Makefile.am
index 4e539fd83759fdcb2951ed54035e6bdbbfa49428..f5e7d946eb62d89fb8e7b92982808b1e5a4c9902 100644 (file)
--- a/src/libstrongswan/plugins/sha1/Makefile.am
+++ b/src/libstrongswan/plugins/sha1/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-sha1.la

diff --git a/src/libstrongswan/plugins/sha2/Makefile.am b/src/libstrongswan/plugins/sha2/Makefile.am
index a255d06094829d3e170408ae1dccb1f5e90d0c82..cdd8696cd0fe1c1a582583a8fba5cd871f6c8bef 100644 (file)
--- a/src/libstrongswan/plugins/sha2/Makefile.am
+++ b/src/libstrongswan/plugins/sha2/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-sha2.la

diff --git a/src/libstrongswan/plugins/soup/Makefile.am b/src/libstrongswan/plugins/soup/Makefile.am
index 9006f1b7ce26418dbb5472b83f6e0e41759806b2..8df666f4c59242b047caddec8c7afc26d60e395a 100644 (file)
--- a/src/libstrongswan/plugins/soup/Makefile.am
+++ b/src/libstrongswan/plugins/soup/Makefile.am
@@ -1,7 +1,9 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan ${soup_CFLAGS}
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+        ${soup_CFLAGS} \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-soup.la

diff --git a/src/libstrongswan/plugins/sqlite/Makefile.am b/src/libstrongswan/plugins/sqlite/Makefile.am
index 2e1d9733f9a933abf418c863522b30fa4c0ae799..717d6350dc84a9b0e7c01e86277df3bd419885c2 100644 (file)
--- a/src/libstrongswan/plugins/sqlite/Makefile.am
+++ b/src/libstrongswan/plugins/sqlite/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-sqlite.la
@@ -15,4 +16,3 @@ libstrongswan_sqlite_la_SOURCES = \
 
 libstrongswan_sqlite_la_LDFLAGS = -module -avoid-version
 libstrongswan_sqlite_la_LIBADD  = -lsqlite3
-

diff --git a/src/libstrongswan/plugins/sshkey/Makefile.am b/src/libstrongswan/plugins/sshkey/Makefile.am
index 8101726b65301513e0701fa9f2d258a5ad019afe..d2ec631a8dc5b97eec698ed7f73522afe390cf38 100644 (file)
--- a/src/libstrongswan/plugins/sshkey/Makefile.am
+++ b/src/libstrongswan/plugins/sshkey/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-sshkey.la

diff --git a/src/libstrongswan/plugins/test_vectors/Makefile.am b/src/libstrongswan/plugins/test_vectors/Makefile.am
index 20716d3a0d811f387132e931d9bb93003b03798e..6dcad400d8296a777613c52f043dd98cf7a05008 100644 (file)
--- a/src/libstrongswan/plugins/test_vectors/Makefile.am
+++ b/src/libstrongswan/plugins/test_vectors/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-test-vectors.la

diff --git a/src/libstrongswan/plugins/unbound/Makefile.am b/src/libstrongswan/plugins/unbound/Makefile.am
index efb3134075b9b13f2e2ed7f4c6c01d45cbbcdc44..64a5cc7e1053fb244099fd41258aa7fc686dc1d6 100644 (file)
--- a/src/libstrongswan/plugins/unbound/Makefile.am
+++ b/src/libstrongswan/plugins/unbound/Makefile.am
@@ -1,8 +1,9 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -DIPSEC_CONFDIR=\"${sysconfdir}\"
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic -DIPSEC_CONFDIR=\"${sysconfdir}\"
-
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-unbound.la

diff --git a/src/libstrongswan/plugins/x509/Makefile.am b/src/libstrongswan/plugins/x509/Makefile.am
index 4b50d78dcb79050d38f72f22d718c7499a6ae165..b464d1483233f9efcea0c72723023b7f06a4d9bb 100644 (file)
--- a/src/libstrongswan/plugins/x509/Makefile.am
+++ b/src/libstrongswan/plugins/x509/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-x509.la

diff --git a/src/libstrongswan/plugins/xcbc/Makefile.am b/src/libstrongswan/plugins/xcbc/Makefile.am
index 28e99f6505fd869a7128caacca8e5c63871aeb4d..6e2227206f89fa6d11ecbf0f6614b86d3a6c3f24 100644 (file)
--- a/src/libstrongswan/plugins/xcbc/Makefile.am
+++ b/src/libstrongswan/plugins/xcbc/Makefile.am
@@ -1,7 +1,8 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = \
+       -rdynamic
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-xcbc.la

diff --git a/src/libtls/Makefile.am b/src/libtls/Makefile.am
index 772950606ba8ab690e5301d23baca179ee6eb501..9e3712abe6dfd9b4c0e64dda24b2c17647f20039 100644 (file)
--- a/src/libtls/Makefile.am
+++ b/src/libtls/Makefile.am
@@ -1,5 +1,5 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
 ipseclib_LTLIBRARIES = libtls.la
 libtls_la_SOURCES = \

diff --git a/src/libtnccs/Makefile.am b/src/libtnccs/Makefile.am
index c6492d8d33e4d5542fe8a2d0ec0de03e89d48ab5..720505757fb730b8bc3269a51b5abcd0bc56c167 100644 (file)
--- a/src/libtnccs/Makefile.am
+++ b/src/libtnccs/Makefile.am
@@ -1,5 +1,4 @@
-
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libtncif \
        -I$(top_srcdir)/src/libtls

diff --git a/src/libtncif/Makefile.am b/src/libtncif/Makefile.am
index 6176478a21265cc68064640dcaad65e941c3356d..3c7cb9ff254fd7838e0ea81be4e1351403092ec4 100644 (file)
--- a/src/libtncif/Makefile.am
+++ b/src/libtncif/Makefile.am
@@ -1,4 +1,5 @@
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan
 
 noinst_LTLIBRARIES = libtncif.la
 

diff --git a/src/manager/Makefile.am b/src/manager/Makefile.am
index 045c77896cd15077ac09ce66b9a5100590540968..41001dd8b263b59a9588aeb9009299b61848b0cc 100644 (file)
--- 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

diff --git a/src/medsrv/Makefile.am b/src/medsrv/Makefile.am
index 43da9c4e5deaedf718b7e10d7d3ec48096eac395..40bafd856ef5f726cd5090d4b74c567631a05ee8 100644 (file)
--- 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

diff --git a/src/openac/Makefile.am b/src/openac/Makefile.am
index 0be040e874934053b7e85d0ab2c76e7ae2a602aa..78a466bd692672e311a4ad121d323f802c4d22fa 100644 (file)
--- a/src/openac/Makefile.am
+++ b/src/openac/Makefile.am
@@ -2,9 +2,10 @@ ipsec_PROGRAMS = openac
 openac_SOURCES = openac.c
 dist_man_MANS = openac.8
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-AM_CFLAGS = \
-  -DIPSEC_CONFDIR=\"${sysconfdir}\" \
-  -DPLUGINS=\""${openac_plugins}\""
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -DIPSEC_CONFDIR=\"${sysconfdir}\" \
+       -DPLUGINS=\""${openac_plugins}\""
+
 openac_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 openac.o :             $(top_builddir)/config.status

diff --git a/src/pki/Makefile.am b/src/pki/Makefile.am
index be74e5d00d3d3e619c745009565dff9518fed6ac..e0793828460ce0ac0fdfd9a6147ad7b85f61a8aa 100644 (file)
--- a/src/pki/Makefile.am
+++ b/src/pki/Makefile.am
@@ -15,6 +15,6 @@ pki_SOURCES = pki.c pki.h command.c command.h \
 pki_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 pki.o :        $(top_builddir)/config.status
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
-AM_CFLAGS = \
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
        -DPLUGINS=\""${pki_plugins}\""

diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am
index 930f3dd80f78e2b298f4dbe62a95bd4f71d22c96..c911be1c45b880fc09438cf52ceb6281f7ef2de3 100644 (file)
--- a/src/scepclient/Makefile.am
+++ b/src/scepclient/Makefile.am
@@ -4,16 +4,13 @@ scepclient.c scep.c scep.h
 
 scepclient.o : $(top_builddir)/config.status
 
-INCLUDES = \
--I$(top_srcdir)/src/libstrongswan \
--I$(top_srcdir)/src/libhydra
-
-AM_CFLAGS = \
--DIPSEC_CONFDIR=\"${sysconfdir}\" \
--DPLUGINS=\""${scepclient_plugins}\""
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -DIPSEC_CONFDIR=\"${sysconfdir}\" \
+       -DPLUGINS=\""${scepclient_plugins}\""
 
 scepclient_LDADD = \
 $(top_builddir)/src/libstrongswan/libstrongswan.la
 
 dist_man_MANS = scepclient.8
-

diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index 2c08db50ec27bd61d2296c6066ff1a4f19441482..0c2d250f4f4f021604ac072e004f0dc554328c50 100644 (file)
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -6,21 +6,19 @@ starterstroke.h confread.h args.c \
 keywords.c files.h keywords.h cmp.c starter.c cmp.h invokecharon.c \
 invokecharon.h klips.c klips.h
 
-INCLUDES = \
--I${linux_headers} \
--I$(top_srcdir)/src/libstrongswan \
--I$(top_srcdir)/src/libhydra \
--I$(top_srcdir)/src/stroke
-
-AM_CFLAGS = \
--DIPSEC_DIR=\"${ipsecdir}\" \
--DIPSEC_CONFDIR=\"${sysconfdir}\" \
--DIPSEC_PIDDIR=\"${piddir}\" \
--DIPSEC_EAPDIR=\"${eapdir}\" \
--DDEV_RANDOM=\"${random_device}\" \
--DDEV_URANDOM=\"${urandom_device}\" \
--DPLUGINS=\""${starter_plugins}\"" \
--DDEBUG
+AM_CPPFLAGS = \
+       -I${linux_headers} \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/stroke \
+       -DIPSEC_DIR=\"${ipsecdir}\" \
+       -DIPSEC_CONFDIR=\"${sysconfdir}\" \
+       -DIPSEC_PIDDIR=\"${piddir}\" \
+       -DIPSEC_EAPDIR=\"${eapdir}\" \
+       -DDEV_RANDOM=\"${random_device}\" \
+       -DDEV_URANDOM=\"${urandom_device}\" \
+       -DPLUGINS=\""${starter_plugins}\"" \
+       -DDEBUG
 
 AM_YFLAGS = -v -d
 
@@ -30,15 +28,15 @@ MAINTAINERCLEANFILES = keywords.c
 BUILT_SOURCES = parser.h
 
 if USE_CHARON
-  AM_CFLAGS += -DSTART_CHARON
+  AM_CPPFLAGS += -DSTART_CHARON
 endif
 
 if USE_LOAD_WARNING
-  AM_CFLAGS += -DLOAD_WARNING
+  AM_CPPFLAGS += -DLOAD_WARNING
 endif
 
 if USE_TOOLS
-  AM_CFLAGS += -DGENERATE_SELFCERT
+  AM_CPPFLAGS += -DGENERATE_SELFCERT
 endif
 
 keywords.c:    $(srcdir)/keywords.txt $(srcdir)/keywords.h

diff --git a/src/stroke/Makefile.am b/src/stroke/Makefile.am
index 2d2d057482b686802e47fe9d07c28060885cea63..ed170bd08060ae82a4bab264f518692651d3d031 100644 (file)
--- a/src/stroke/Makefile.am
+++ b/src/stroke/Makefile.am
@@ -4,11 +4,12 @@ stroke_SOURCES = \
 stroke.c stroke_msg.h stroke_keywords.c stroke_keywords.h
 
 stroke_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(SOCKLIB)
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
 EXTRA_DIST = stroke_keywords.txt Android.mk
 BUILT_SOURCES = stroke_keywords.c
 MAINTAINERCLEANFILES = stroke_keywords.c
-AM_CFLAGS = -DIPSEC_PIDDIR=\"${piddir}\"
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/libstrongswan \
+       -DIPSEC_PIDDIR=\"${piddir}\"
 
 stroke_keywords.c:     $(srcdir)/stroke_keywords.txt $(srcdir)/stroke_keywords.h
                $(AM_V_GEN) \