From: Martin Willi <martin@revosec.ch>
Date: Thu, 29 Apr 2010 09:28:27 +0000 (+0200)
Subject: Users of PLUGINS depend on config.status, rebuilding them if plugin configuration... 
X-Git-Tag: 4.4.0~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0e789035cfb3ce3d531b26f87d2226962fff3fa;p=thirdparty%2Fstrongswan.git

Users of PLUGINS depend on config.status, rebuilding them if plugin configuration is updated
---

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 24e3cd164f..d689d4cbce 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -17,3 +17,7 @@ key2keyid_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 keyid2sql_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 dh_speed_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lrt
 pubkey_speed_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lrt
+
+key2keyid.o :	$(top_srcdir)/config.status
+
+keyid2sql.o :	$(top_srcdir)/config.status
diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index df056ad9ff..a56498858d 100644
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -100,6 +100,8 @@ credentials/sets/ocsp_response_wrapper.c credentials/sets/ocsp_response_wrapper.
 credentials/sets/cert_cache.c credentials/sets/cert_cache.h \
 credentials/credential_set.h
 
+daemon.lo :		$(top_srcdir)/config.status
+
 INCLUDES = \
 	-I${linux_headers} \
 	-I$(top_srcdir)/src/libstrongswan \
diff --git a/src/libhydra/plugins/attr_sql/Makefile.am b/src/libhydra/plugins/attr_sql/Makefile.am
index dbfedd1cf9..d87cc8d3b3 100644
--- a/src/libhydra/plugins/attr_sql/Makefile.am
+++ b/src/libhydra/plugins/attr_sql/Makefile.am
@@ -20,3 +20,4 @@ libstrongswan_attr_sql_la_LDFLAGS = -module -avoid-version
 ipsec_PROGRAMS = pool
 pool_SOURCES = pool.c
 pool_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
+pool.o :	$(top_srcdir)/config.status
diff --git a/src/manager/Makefile.am b/src/manager/Makefile.am
index 98e50d8d21..b1b3901169 100644
--- a/src/manager/Makefile.am
+++ b/src/manager/Makefile.am
@@ -11,6 +11,7 @@ controller/config_controller.c controller/config_controller.h \
 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_srcdir)/config.status
 
 INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libfast ${xml_CFLAGS}
 AM_CFLAGS = -rdynamic \
diff --git a/src/medsrv/Makefile.am b/src/medsrv/Makefile.am
index 0700c05025..50b654fcbe 100644
--- a/src/medsrv/Makefile.am
+++ b/src/medsrv/Makefile.am
@@ -8,6 +8,7 @@ controller/user_controller.c controller/user_controller.h \
 controller/peer_controller.c controller/peer_controller.h
 
 medsrv_fcgi_LDADD = $(top_srcdir)/src/libstrongswan/libstrongswan.la $(top_builddir)/src/libfast/libfast.la
+main.o :	$(top_srcdir)/config.status
 
 INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libfast
 AM_CFLAGS = -rdynamic \
diff --git a/src/openac/Makefile.am b/src/openac/Makefile.am
index ca62382583..9423df093b 100644
--- a/src/openac/Makefile.am
+++ b/src/openac/Makefile.am
@@ -7,4 +7,4 @@ AM_CFLAGS = \
   -DIPSEC_CONFDIR=\"${sysconfdir}\" \
   -DPLUGINS=\""${libstrongswan_plugins}\""
 openac_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
-
+openac.o :		$(top_srcdir)/config.status
diff --git a/src/pki/Makefile.am b/src/pki/Makefile.am
index a471b6477b..d5ed074fad 100644
--- a/src/pki/Makefile.am
+++ b/src/pki/Makefile.am
@@ -7,9 +7,11 @@ pki_SOURCES = pki.c pki.h command.c command.h \
 	commands/pub.c \
 	commands/req.c \
 	commands/self.c \
-	commands/verify.c 
+	commands/verify.c
 
 pki_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
+pki.o :	$(top_srcdir)/config.status
+
 INCLUDES = -I$(top_srcdir)/src/libstrongswan
 AM_CFLAGS = \
 	-DPLUGINS=\""${libstrongswan_plugins}\""
diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index 1ef3cf79e9..49222cdc80 100644
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -54,6 +54,8 @@ rsaref/pkcs11t.h rsaref/pkcs11.h rsaref/unix.h rsaref/pkcs11f.h
 
 _pluto_adns_SOURCES = adns.c adns.h
 
+plutomain.o :	$(top_srcdir)/config.status
+
 LIBSTRONGSWANDIR=$(top_builddir)/src/libstrongswan
 LIBFREESWANDIR=$(top_builddir)/src/libfreeswan
 LIBHYDRADIR=$(top_builddir)/src/libhydra
diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am
index 23e35344cd..22e8cdf4c0 100644
--- a/src/scepclient/Makefile.am
+++ b/src/scepclient/Makefile.am
@@ -1,6 +1,8 @@
 ipsec_PROGRAMS = scepclient
 scepclient_SOURCES = scepclient.c scep.c scep.h loglite.c
 
+scepclient.o :	$(top_srcdir)/config.status
+
 PLUTODIR=$(top_srcdir)/src/pluto
 OPENACDIR=$(top_srcdir)/src/openac
 WHACKDIR=$(top_srcdir)/src/whack