pool: Move the pool utility to its own directory in src

configure.ac

@@ -1478,6 +1478,7 @@ AC_CONFIG_FILES([
 	src/scepclient/Makefile
 	src/pki/Makefile
 	src/pki/man/Makefile
+	src/pool/Makefile
 	src/dumm/Makefile
 	src/dumm/ext/extconf.rb
 	src/libfast/Makefile

src/Makefile.am

@@ -100,6 +100,10 @@ if USE_INTEGRITY_TEST
   SUBDIRS += checksum
 endif
 
+if USE_ATTR_SQL
+  SUBDIRS += pool
+endif
+
 if USE_TKM
   SUBDIRS += charon-tkm
 endif

src/libhydra/plugins/attr_sql/Makefile.am

@@ -1,7 +1,6 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/libstrongswan \
-	-I$(top_srcdir)/src/libhydra \
+	-I$(top_srcdir)/src/libhydra
-	-DPLUGINS=\""${pool_plugins}\""
 
 AM_CFLAGS = \
 	-rdynamic
@@ -17,10 +16,3 @@ libstrongswan_attr_sql_la_SOURCES = \
 	sql_attribute.h sql_attribute.c
 
 libstrongswan_attr_sql_la_LDFLAGS = -module -avoid-version
-
-ipsec_PROGRAMS = pool
-pool_SOURCES = pool.c pool_attributes.c pool_attributes.h \
-			   pool_usage.h pool_usage.c
-pool_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la \
-			 $(top_builddir)/src/libhydra/libhydra.la
-pool.o :	$(top_builddir)/config.status

src/pool/Makefile.am

@@ -0,0 +1,16 @@
+ipsec_PROGRAMS = pool
+
+pool_SOURCES = \
+	pool.c pool_attributes.c pool_attributes.h \
+	pool_usage.h pool_usage.c
+
+pool.o :	$(top_builddir)/config.status
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/libstrongswan \
+	-I$(top_srcdir)/src/libhydra \
+	-DPLUGINS=\""${pool_plugins}\""
+
+pool_LDADD = \
+	$(top_builddir)/src/libstrongswan/libstrongswan.la \
+	$(top_builddir)/src/libhydra/libhydra.la

src/pool/pool.c

@@ -1284,4 +1284,3 @@ int main(int argc, char *argv[])
 
 	exit(EXIT_SUCCESS);
 }
-

src/pool/pool_attributes.c

@@ -714,4 +714,3 @@ void show_attr(void)
 		}
 	}
 }
-

src/pool/pool_attributes.h

@@ -61,5 +61,3 @@ void status_attr(bool hexout);
 void show_attr(void);
 
 #endif /* POOL_ATTRIBUTES_H_ */
-
-

src/pool/pool_usage.c

@@ -124,4 +124,3 @@ Usage:\n\
                lines are ignored. The file may not contain a --batch command.\n\
   \n");
 }
-

src/pool/pool_usage.h

@@ -22,5 +22,4 @@
  */
 void usage(void);
 
-
 #endif /* POOL_USAGE_H_ */