9 files changed, 26 insertions, 20 deletions

diff --git a/Makefile.am b/Makefile.am
index 6761838..bf4205d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src include fdi swig $(DEV_SUB)
+SUBDIRS = src include fdi swig $(DEV_SUB) tools
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-dev-tools
 
diff --git a/autogen.sh b/autogen.sh
index 460bc5e..cb3887a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,5 +6,5 @@ automake --add-missing
 autoconf
 
 if [ -z "$NOCONFIGURE" ]; then
-    ./configure --enable-dev-tools "$@"
+    ./configure "$@"
 fi
diff --git a/configure.ac b/configure.ac
index 2acc6be..d6b27f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,4 +100,4 @@ if test "$enable_largefile" != no; then
 fi
 AC_SUBST(LFS_CFLAGS)
 
-AC_OUTPUT(Makefile src/Makefile include/Makefile fdi/Makefile dev/Makefile swig/Makefile libiphone-1.0.pc)
+AC_OUTPUT(Makefile src/Makefile include/Makefile fdi/Makefile dev/Makefile tools/Makefile swig/Makefile libiphone-1.0.pc)
diff --git a/dev/Makefile.am b/dev/Makefile.am
index 9e06339..70cd52b 100644
--- a/dev/Makefile.am
+++ b/dev/Makefile.am
@@ -3,9 +3,9 @@ INCLUDES = -I$(top_srcdir)/include
 AM_CFLAGS = $(GLOBAL_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) $(LFS_CFLAGS)
 AM_LDFLAGS = $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS)
 
-bin_PROGRAMS = iphoneclient lckd-client afccheck msyncclient iphoneinfo iphonesyslog iphone_id
+noinst_PROGRAMS = iphoneclient lckd-client afccheck msyncclient
 
-iphoneclient_SOURCES = main.c
+iphoneclient_SOURCES = iphoneclient.c
 iphoneclient_LDADD = ../src/libiphone.la
 
 lckd_client_SOURCES = lckdclient.c
@@ -22,18 +22,3 @@ msyncclient_SOURCES = msyncclient.c
 msyncclient_CFLAGS = $(AM_CFLAGS)
 msyncclient_LDFLAGS = $(AM_LDFLAGS)
 msyncclient_LDADD = ../src/libiphone.la
-
-iphoneinfo_SOURCES = iphoneinfo.c
-iphoneinfo_CFLAGS = $(AM_CFLAGS)
-iphoneinfo_LDFLAGS = $(AM_LDFLAGS)
-iphoneinfo_LDADD = ../src/libiphone.la
-
-iphonesyslog_SOURCES = syslog_relay.c
-iphonesyslog_CFLAGS = $(AM_CFLAGS)
-iphonesyslog_LDFLAGS = $(AM_LDFLAGS)
-iphonesyslog_LDADD = ../src/libiphone.la
-
-iphone_id_SOURCES = iphone_id.c
-iphone_id_CFLAGS = $(AM_CFLAGS)
-iphone_id_LDFLAGS = $(AM_LDFLAGS)
-iphone_id_LDADD = ../src/libiphone.la
diff --git a/dev/main.c b/dev/iphoneclient.c
index bb5dfdd..bb5dfdd 100644
--- a/dev/main.c
+++ b/dev/iphoneclient.c
diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 0000000..7f1be1c
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,21 @@
+INCLUDES = -I$(top_srcdir)/include
+
+AM_CFLAGS = $(GLOBAL_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) $(LFS_CFLAGS)
+AM_LDFLAGS = $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS)
+
+bin_PROGRAMS = iphone_id iphoneinfo iphonesyslog
+
+iphoneinfo_SOURCES = iphoneinfo.c
+iphoneinfo_CFLAGS = $(AM_CFLAGS)
+iphoneinfo_LDFLAGS = $(AM_LDFLAGS)
+iphoneinfo_LDADD = ../src/libiphone.la
+
+iphonesyslog_SOURCES = iphonesyslog.c
+iphonesyslog_CFLAGS = $(AM_CFLAGS)
+iphonesyslog_LDFLAGS = $(AM_LDFLAGS)
+iphonesyslog_LDADD = ../src/libiphone.la
+
+iphone_id_SOURCES = iphone_id.c
+iphone_id_CFLAGS = $(AM_CFLAGS)
+iphone_id_LDFLAGS = $(AM_LDFLAGS)
+iphone_id_LDADD = ../src/libiphone.la
diff --git a/dev/iphone_id.c b/tools/iphone_id.c
index f68fc8b..f68fc8b 100644
--- a/dev/iphone_id.c
+++ b/tools/iphone_id.c
diff --git a/dev/iphoneinfo.c b/tools/iphoneinfo.c
index 7e275b2..7e275b2 100644
--- a/dev/iphoneinfo.c
+++ b/tools/iphoneinfo.c
diff --git a/dev/syslog_relay.c b/tools/iphonesyslog.c
index a096101..a096101 100644
--- a/dev/syslog_relay.c
+++ b/tools/iphonesyslog.c