diff options
Diffstat (limited to 'src/manager')
-rw-r--r-- | src/manager/Makefile.in | 17 | ||||
-rw-r--r-- | src/manager/controller/auth_controller.c | 2 | ||||
-rw-r--r-- | src/manager/controller/auth_controller.h | 2 | ||||
-rw-r--r-- | src/manager/controller/config_controller.c | 2 | ||||
-rw-r--r-- | src/manager/controller/config_controller.h | 2 | ||||
-rw-r--r-- | src/manager/controller/control_controller.c | 2 | ||||
-rw-r--r-- | src/manager/controller/control_controller.h | 2 | ||||
-rw-r--r-- | src/manager/controller/gateway_controller.c | 2 | ||||
-rw-r--r-- | src/manager/controller/gateway_controller.h | 2 | ||||
-rw-r--r-- | src/manager/controller/ikesa_controller.c | 2 | ||||
-rw-r--r-- | src/manager/controller/ikesa_controller.h | 2 | ||||
-rw-r--r-- | src/manager/gateway.c | 2 | ||||
-rw-r--r-- | src/manager/gateway.h | 2 | ||||
-rw-r--r-- | src/manager/main.c | 2 | ||||
-rw-r--r-- | src/manager/manager.c | 2 | ||||
-rw-r--r-- | src/manager/manager.h | 2 | ||||
-rw-r--r-- | src/manager/storage.c | 2 | ||||
-rw-r--r-- | src/manager/storage.h | 2 | ||||
-rw-r--r-- | src/manager/xml.c | 4 | ||||
-rw-r--r-- | src/manager/xml.h | 2 |
20 files changed, 15 insertions, 42 deletions
diff --git a/src/manager/Makefile.in b/src/manager/Makefile.in index bce0ead39..49376379e 100644 --- a/src/manager/Makefile.in +++ b/src/manager/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -112,6 +112,7 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLIB = @DLLIB@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -134,6 +135,9 @@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ +LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ +LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -145,6 +149,7 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ @@ -158,6 +163,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +RUBY = @RUBY@ +RUBYINCLUDE = @RUBYINCLUDE@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -218,6 +225,7 @@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ piddir = @piddir@ plugindir = @plugindir@ +pluto_plugins = @pluto_plugins@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -229,6 +237,7 @@ srcdir = @srcdir@ strongswan_conf = @strongswan_conf@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ xml_CFLAGS = @xml_CFLAGS@ @@ -293,8 +302,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -588,7 +597,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff --git a/src/manager/controller/auth_controller.c b/src/manager/controller/auth_controller.c index 13031198a..5f9c3b623 100644 --- a/src/manager/controller/auth_controller.c +++ b/src/manager/controller/auth_controller.c @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: auth_controller.c 3589 2008-03-13 14:14:44Z martin $ */ #include "auth_controller.h" diff --git a/src/manager/controller/auth_controller.h b/src/manager/controller/auth_controller.h index e2cd48cc4..41e669fd0 100644 --- a/src/manager/controller/auth_controller.h +++ b/src/manager/controller/auth_controller.h @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: auth_controller.h 5003 2009-03-24 17:43:01Z martin $ */ /** diff --git a/src/manager/controller/config_controller.c b/src/manager/controller/config_controller.c index 1f8289c71..dda2938a1 100644 --- a/src/manager/controller/config_controller.c +++ b/src/manager/controller/config_controller.c @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: config_controller.c 3589 2008-03-13 14:14:44Z martin $ */ #include "config_controller.h" diff --git a/src/manager/controller/config_controller.h b/src/manager/controller/config_controller.h index 88d37424f..07cafd4ff 100644 --- a/src/manager/controller/config_controller.h +++ b/src/manager/controller/config_controller.h @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: config_controller.h 5003 2009-03-24 17:43:01Z martin $ */ /** diff --git a/src/manager/controller/control_controller.c b/src/manager/controller/control_controller.c index b3149797f..c22591182 100644 --- a/src/manager/controller/control_controller.c +++ b/src/manager/controller/control_controller.c @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: control_controller.c 3589 2008-03-13 14:14:44Z martin $ */ #include "control_controller.h" diff --git a/src/manager/controller/control_controller.h b/src/manager/controller/control_controller.h index 8992e5b48..c9bc1e4b3 100644 --- a/src/manager/controller/control_controller.h +++ b/src/manager/controller/control_controller.h @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: control_controller.h 5003 2009-03-24 17:43:01Z martin $ */ /** diff --git a/src/manager/controller/gateway_controller.c b/src/manager/controller/gateway_controller.c index 68fdb7021..164bf5921 100644 --- a/src/manager/controller/gateway_controller.c +++ b/src/manager/controller/gateway_controller.c @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: gateway_controller.c 3589 2008-03-13 14:14:44Z martin $ */ #include "gateway_controller.h" diff --git a/src/manager/controller/gateway_controller.h b/src/manager/controller/gateway_controller.h index 864c7a4bd..7d77bdccb 100644 --- a/src/manager/controller/gateway_controller.h +++ b/src/manager/controller/gateway_controller.h @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: gateway_controller.h 5003 2009-03-24 17:43:01Z martin $ */ /** diff --git a/src/manager/controller/ikesa_controller.c b/src/manager/controller/ikesa_controller.c index ab3a089f0..c35ff42e6 100644 --- a/src/manager/controller/ikesa_controller.c +++ b/src/manager/controller/ikesa_controller.c @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: ikesa_controller.c 3589 2008-03-13 14:14:44Z martin $ */ #include "ikesa_controller.h" diff --git a/src/manager/controller/ikesa_controller.h b/src/manager/controller/ikesa_controller.h index 240e8db4f..3f6779629 100644 --- a/src/manager/controller/ikesa_controller.h +++ b/src/manager/controller/ikesa_controller.h @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: ikesa_controller.h 5003 2009-03-24 17:43:01Z martin $ */ /** diff --git a/src/manager/gateway.c b/src/manager/gateway.c index e6c944873..f0d557c71 100644 --- a/src/manager/gateway.c +++ b/src/manager/gateway.c @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: gateway.c 3589 2008-03-13 14:14:44Z martin $ */ #include "gateway.h" diff --git a/src/manager/gateway.h b/src/manager/gateway.h index 4ba301a0f..7c76fa474 100644 --- a/src/manager/gateway.h +++ b/src/manager/gateway.h @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: gateway.h 5003 2009-03-24 17:43:01Z martin $ */ /** diff --git a/src/manager/main.c b/src/manager/main.c index e556a7415..6fef0bf3e 100644 --- a/src/manager/main.c +++ b/src/manager/main.c @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: main.c 4333 2008-09-04 16:19:46Z andreas $ */ #include <dispatcher.h> diff --git a/src/manager/manager.c b/src/manager/manager.c index 7d1b2adba..72f402a48 100644 --- a/src/manager/manager.c +++ b/src/manager/manager.c @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: manager.c 3589 2008-03-13 14:14:44Z martin $ */ #include "manager.h" diff --git a/src/manager/manager.h b/src/manager/manager.h index ecd29550b..dc5fc1831 100644 --- a/src/manager/manager.h +++ b/src/manager/manager.h @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: manager.h 5003 2009-03-24 17:43:01Z martin $ */ /** diff --git a/src/manager/storage.c b/src/manager/storage.c index fee4c216e..00e688e08 100644 --- a/src/manager/storage.c +++ b/src/manager/storage.c @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: storage.c 3917 2008-05-08 13:12:43Z martin $ */ #include "storage.h" diff --git a/src/manager/storage.h b/src/manager/storage.h index 6c5bea650..2495b3a26 100644 --- a/src/manager/storage.h +++ b/src/manager/storage.h @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: storage.h 5003 2009-03-24 17:43:01Z martin $ */ /** diff --git a/src/manager/xml.c b/src/manager/xml.c index 1e9731cc2..5aa2e3e1e 100644 --- a/src/manager/xml.c +++ b/src/manager/xml.c @@ -11,10 +11,10 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: xml.c 3589 2008-03-13 14:14:44Z martin $ */ +#include <string.h> + #include "xml.h" #include <libxml/parser.h> diff --git a/src/manager/xml.h b/src/manager/xml.h index febe5c25d..230e0f925 100644 --- a/src/manager/xml.h +++ b/src/manager/xml.h @@ -11,8 +11,6 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - * - * $Id: xml.h 5003 2009-03-24 17:43:01Z martin $ */ /** |