created scripts/Makefile.am

4 files changed, 11 insertions, 17 deletions

diff --git a/Makefile.am b/Makefile.am
index c3d8d0df5..e6a73e996 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src testing
+SUBDIRS = src testing scripts
 EXTRA_DIST = Doxyfile.in CREDITS
 CLEANFILES = apidoc Doxyfile
 
diff --git a/configure.in b/configure.in
index 86d059275..1d4b4f924 100644
--- a/configure.in
+++ b/configure.in
@@ -882,5 +882,6 @@ AC_OUTPUT(
 	src/libfast/Makefile
 	src/manager/Makefile
 	src/medsrv/Makefile
+	scripts/Makefile
 	testing/Makefile
 )
diff --git a/scripts/Makefile b/scripts/Makefile
deleted file mode 100644
index 97f2306c7..000000000
--- a/scripts/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-all :		bin2array bin2sql id2sql key2keyid
-
-bin2array :	bin2array.c
-		gcc -o bin2array bin2array.c
-
-bin2sql :	bin2sql.c
-		gcc -o bin2sql bin2sql.c -I../src/libstrongswan -lstrongswan
-
-id2sql :	id2sql.c
-		gcc -o id2sql id2sql.c -I../src/libstrongswan -lstrongswan
-
-key2keyid :	key2keyid.c
-		gcc -o key2keyid key2keyid.c -I../src/libstrongswan -lstrongswan
-
-clean :
-		rm bin2array bin2sql id2sql key2keyid
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
new file mode 100644
index 000000000..5e47bb47e
--- /dev/null
+++ b/scripts/Makefile.am
@@ -0,0 +1,9 @@
+INCLUDES = -I$(top_srcdir)/src/libstrongswan
+
+noinst_PROGRAMS = bin2array bin2sql id2sql key2keyid
+bin2array_SOURCES = bin2array.c
+bin2sql_SOURCES = bin2sql.c
+id2sql_SOURCES = id2sql.c
+key2keyid_SOURCES = key2keyid.c
+id2sql_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
+key2keyid_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la