diff options
| author | Martin Willi <martin@strongswan.org> | 2007-10-04 08:21:53 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2007-10-04 08:21:53 +0000 |
| commit | d62a4526fda0b286d2797aa99e560e2cfbe704b0 (patch) | |
| tree | cdb077a52270d96dea5065faedb007c0a109f609 | |
| parent | b9bc74979e793abbb61a424cbd505d8b0aae6c7e (diff) | |
| download | strongswan-d62a4526fda0b286d2797aa99e560e2cfbe704b0.tar.bz2 strongswan-d62a4526fda0b286d2797aa99e560e2cfbe704b0.tar.xz | |
moved enumerator from libappserv to libstrongswan
| -rw-r--r-- | src/libstrongswan/Makefile.am | 1 | ||||
| -rw-r--r-- | src/libstrongswan/utils/enumerator.c (renamed from src/manager/lib/enumerator.c) | 0 | ||||
| -rw-r--r-- | src/libstrongswan/utils/enumerator.h (renamed from src/manager/lib/enumerator.h) | 0 | ||||
| -rw-r--r-- | src/manager/Makefile.am | 2 | ||||
| -rw-r--r-- | src/manager/database.c | 1 | ||||
| -rw-r--r-- | src/manager/database.h | 2 | ||||
| -rw-r--r-- | src/manager/gateway.h | 2 | ||||
| -rw-r--r-- | src/manager/lib/xml.h | 2 |
8 files changed, 5 insertions, 5 deletions
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 437608baf..1bfe3d842 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -50,6 +50,7 @@ utils/iterator.h \ utils/leak_detective.c utils/leak_detective.h \ utils/lexparser.c utils/lexparser.h \ utils/linked_list.c utils/linked_list.h \ +utils/enumerator.c utils/enumerator.h \ utils/optionsfrom.c utils/optionsfrom.h \ utils/randomizer.c utils/randomizer.h diff --git a/src/manager/lib/enumerator.c b/src/libstrongswan/utils/enumerator.c index 842a2e997..842a2e997 100644 --- a/src/manager/lib/enumerator.c +++ b/src/libstrongswan/utils/enumerator.c diff --git a/src/manager/lib/enumerator.h b/src/libstrongswan/utils/enumerator.h index df1d78206..df1d78206 100644 --- a/src/manager/lib/enumerator.h +++ b/src/libstrongswan/utils/enumerator.h diff --git a/src/manager/Makefile.am b/src/manager/Makefile.am index 6380718d3..17eecdbab 100644 --- a/src/manager/Makefile.am +++ b/src/manager/Makefile.am @@ -15,7 +15,7 @@ lib_LTLIBRARIES = libappserv.la libappserv_la_SOURCES = \ lib/context.h lib/dispatcher.c lib/request.h lib/session.h \ lib/controller.h lib/dispatcher.h lib/request.c lib/session.c \ -lib/xml.h lib/xml.c lib/enumerator.h lib/enumerator.c +lib/xml.h lib/xml.c libappserv_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lfcgi -lpthread -lneo_cgi -lneo_cs -lneo_utl ${xml_LIBS} diff --git a/src/manager/database.c b/src/manager/database.c index 101e0c7ac..a7776c81e 100644 --- a/src/manager/database.c +++ b/src/manager/database.c @@ -24,7 +24,6 @@ #include <sqlite3.h> #include <library.h> -#include <enumerator.h> #include <crypto/hashers/hasher.h> diff --git a/src/manager/database.h b/src/manager/database.h index 7edcde4fa..228d1cb22 100644 --- a/src/manager/database.h +++ b/src/manager/database.h @@ -23,7 +23,7 @@ #ifndef DATABASE_H_ #define DATABASE_H_ -#include <enumerator.h> +#include <utils/enumerator.h> typedef struct database_t database_t; diff --git a/src/manager/gateway.h b/src/manager/gateway.h index d84f00038..1fe2aef4b 100644 --- a/src/manager/gateway.h +++ b/src/manager/gateway.h @@ -24,7 +24,7 @@ #define GATEWAY_H_ #include <utils/host.h> -#include <enumerator.h> +#include <utils/enumerator.h> typedef struct gateway_t gateway_t; diff --git a/src/manager/lib/xml.h b/src/manager/lib/xml.h index b73ddf074..738a8e1b3 100644 --- a/src/manager/lib/xml.h +++ b/src/manager/lib/xml.h @@ -23,7 +23,7 @@ #ifndef XML_H_ #define XML_H_ -#include <enumerator.h> +#include <utils/enumerator.h> typedef struct xml_t xml_t; |