move dev specific tools to dev/ subdir.

update autoconf files accordingly

6 files changed, 18 insertions, 35 deletions

diff --git a/Makefile.am b/Makefile.am
index d2db548..938986f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src include fdi
+
+SUBDIRS = src include fdi $(DEV_SUB)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libiphone-1.0.pc
@@ -8,4 +9,4 @@ doc:
         doxygen doxygen.cfg
 
 indent:
-        indent -kr -ut -ts4 -l120 src/*.c src/*.h
+        indent -kr -ut -ts4 -l120 src/*.c src/*.h dev/*.h dev/*.c
diff --git a/configure.ac b/configure.ac
index 24eec9b..286b1d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,13 +43,20 @@ AC_ARG_ENABLE([dev-tools],
             [build development helper tools (default is no)])],
             [build_dev_tools=true],
             [build_dev_tools=false])
-AM_CONDITIONAL([BUILD_DEV_TOOLS], [test x$build_dev_tools = xtrue])
+if test "$build_dev_tools" = true; then
+            DEV_SUB=dev
+else
+            DEV_SUB=
+fi
+AC_SUBST([DEV_SUB])
 
 AC_ARG_ENABLE([debug-code],
-            [AS_HELP_STRING([--enable-debug-code],
-            [enable debug message reporting in library (default is yes)])],
-            [debug_code=true],
-            [debug_code=false])
-AM_CONDITIONAL([STRIP_DEBUG_CODE], [test x$debug_code = xfalse])
-
-AC_OUTPUT(Makefile src/Makefile include/Makefile fdi/Makefile libiphone-1.0.pc)
+            [AS_HELP_STRING([--disable-debug-code],
+            [disable debug message reporting in library (default is yes)])],
+            [no_debug_code=false],
+            [no_debug_code=true])
+if test "$no_debug_code" = true; then
+        AC_DEFINE(STRIP_DEBUG_CODE,1,[Strip debug reporting code])
+fi
+
+AC_OUTPUT(Makefile src/Makefile include/Makefile fdi/Makefile dev/Makefile libiphone-1.0.pc)
diff --git a/src/afccheck.c b/dev/afccheck.c
index e772d99..028110a 100644
--- a/src/afccheck.c
+++ b/dev/afccheck.c
@@ -23,14 +23,11 @@
 #include <string.h>
 #include <glib.h>
 
-#include "usbmux.h"
-#include "iphone.h"
 #include <libiphone/libiphone.h>
 
 #define BUFFER_SIZE 20000
 #define NB_THREADS 10
 
-int debug = 0;
 
 typedef struct {
         iphone_afc_client_t afc;
diff --git a/src/lckdclient.c b/dev/lckdclient.c
index b3b9942..96bc27d 100644
--- a/src/lckdclient.c
+++ b/dev/lckdclient.c
@@ -25,9 +25,6 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-
-#include "usbmux.h"
-#include "iphone.h"
 #include <libiphone/libiphone.h>
 
 
diff --git a/src/main.c b/dev/main.c
index 055cb4b..2dbfb4a 100644
--- a/src/main.c
+++ b/dev/main.c
@@ -24,9 +24,6 @@
 #include <errno.h>
 #include <usb.h>
 
-#include "usbmux.h"
-#include "iphone.h"
-
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
diff --git a/src/Makefile.am b/src/Makefile.am
index a66c05b..785aacf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,22 +5,6 @@ AM_LDFLAGS = $(libxml2_LIBS) $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $
 
 bin_PROGRAMS = libiphone-initconf
 
-if  BUILD_DEV_TOOLS
-        bin_PROGRAMS += iphoneclient lckd-client afccheck
-endif
-
-iphoneclient_SOURCES = main.c
-iphoneclient_LDADD = libiphone.la
-
-lckd_client_SOURCES = lckdclient.c
-lckd_client_CFLAGS = $(AM_CFLAGS)
-lckd_client_LDFLAGS = -lreadline $(AM_LDFLAGS)
-lckd_client_LDADD = libiphone.la
-
-afccheck_SOURCES = afccheck.c
-afccheck_CFLAGS = $(AM_CFLAGS)
-afccheck_LDFLAGS = $(AM_LDFLAGS)
-afccheck_LDADD = libiphone.la
 
 libiphone_initconf_SOURCES = initconf.c userpref.c lockdown.c plist.c usbmux.c iphone.c utils.c
 libiphone_initconf_CFLAGS = $(libgthread2_CFLAGS) $(AM_CFLAGS)