From: Tobias Brunner Date: Thu, 29 Apr 2010 11:29:53 +0000 (+0200) Subject: Fixing out-of-tree build after adding dependency to config.status. X-Git-Tag: 4.4.0~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=257e27df0785371ab0dfe3d45863865a3353087a;p=thirdparty%2Fstrongswan.git Fixing out-of-tree build after adding dependency to config.status. --- diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d689d4cbce..70a56f6971 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -18,6 +18,6 @@ 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 +key2keyid.o : $(top_builddir)/config.status -keyid2sql.o : $(top_srcdir)/config.status +keyid2sql.o : $(top_builddir)/config.status diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am index a56498858d..0eaccf7a09 100644 --- a/src/libcharon/Makefile.am +++ b/src/libcharon/Makefile.am @@ -100,7 +100,7 @@ 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 +daemon.lo : $(top_builddir)/config.status INCLUDES = \ -I${linux_headers} \ diff --git a/src/libhydra/plugins/attr_sql/Makefile.am b/src/libhydra/plugins/attr_sql/Makefile.am index d87cc8d3b3..376a8259c2 100644 --- a/src/libhydra/plugins/attr_sql/Makefile.am +++ b/src/libhydra/plugins/attr_sql/Makefile.am @@ -20,4 +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 +pool.o : $(top_builddir)/config.status diff --git a/src/manager/Makefile.am b/src/manager/Makefile.am index b1b3901169..e673356738 100644 --- a/src/manager/Makefile.am +++ b/src/manager/Makefile.am @@ -11,7 +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 +main.o : $(top_builddir)/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 50b654fcbe..bdec08190c 100644 --- a/src/medsrv/Makefile.am +++ b/src/medsrv/Makefile.am @@ -8,7 +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 +main.o : $(top_builddir)/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 9423df093b..a278cdd178 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 +openac.o : $(top_builddir)/config.status diff --git a/src/pki/Makefile.am b/src/pki/Makefile.am index d5ed074fad..8eac07afc3 100644 --- a/src/pki/Makefile.am +++ b/src/pki/Makefile.am @@ -10,7 +10,7 @@ pki_SOURCES = pki.c pki.h command.c command.h \ commands/verify.c pki_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -pki.o : $(top_srcdir)/config.status +pki.o : $(top_builddir)/config.status INCLUDES = -I$(top_srcdir)/src/libstrongswan AM_CFLAGS = \ diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am index 49222cdc80..a264e642e1 100644 --- a/src/pluto/Makefile.am +++ b/src/pluto/Makefile.am @@ -54,7 +54,7 @@ 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 +plutomain.o : $(top_builddir)/config.status LIBSTRONGSWANDIR=$(top_builddir)/src/libstrongswan LIBFREESWANDIR=$(top_builddir)/src/libfreeswan diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am index 22e8cdf4c0..dd4a4a63d0 100644 --- a/src/scepclient/Makefile.am +++ b/src/scepclient/Makefile.am @@ -1,7 +1,7 @@ ipsec_PROGRAMS = scepclient scepclient_SOURCES = scepclient.c scep.c scep.h loglite.c -scepclient.o : $(top_srcdir)/config.status +scepclient.o : $(top_builddir)/config.status PLUTODIR=$(top_srcdir)/src/pluto OPENACDIR=$(top_srcdir)/src/openac