Commit e46784e5 authored by Jonathan Beck's avatar Jonathan Beck

move dev specific tools to dev/ subdir.

update autoconf files accordingly
parent 41778c3d
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
SUBDIRS = src include fdi
SUBDIRS = src include fdi $(DEV_SUB)
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libiphone-1.0.pc pkgconfig_DATA = libiphone-1.0.pc
...@@ -8,4 +9,4 @@ doc: ...@@ -8,4 +9,4 @@ doc:
doxygen doxygen.cfg doxygen doxygen.cfg
indent: indent:
indent -kr -ut -ts4 -l120 src/*.c src/*.h indent -kr -ut -ts4 -l120 src/*.c src/*.h dev/*.h dev/*.c
...@@ -43,13 +43,20 @@ AC_ARG_ENABLE([dev-tools], ...@@ -43,13 +43,20 @@ AC_ARG_ENABLE([dev-tools],
[build development helper tools (default is no)])], [build development helper tools (default is no)])],
[build_dev_tools=true], [build_dev_tools=true],
[build_dev_tools=false]) [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], AC_ARG_ENABLE([debug-code],
[AS_HELP_STRING([--enable-debug-code], [AS_HELP_STRING([--disable-debug-code],
[enable debug message reporting in library (default is yes)])], [disable debug message reporting in library (default is yes)])],
[debug_code=true], [no_debug_code=false],
[debug_code=false]) [no_debug_code=true])
AM_CONDITIONAL([STRIP_DEBUG_CODE], [test x$debug_code = xfalse]) if test "$no_debug_code" = true; then
AC_DEFINE(STRIP_DEBUG_CODE,1,[Strip debug reporting code])
AC_OUTPUT(Makefile src/Makefile include/Makefile fdi/Makefile libiphone-1.0.pc) fi
AC_OUTPUT(Makefile src/Makefile include/Makefile fdi/Makefile dev/Makefile libiphone-1.0.pc)
...@@ -23,14 +23,11 @@ ...@@ -23,14 +23,11 @@
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include "usbmux.h"
#include "iphone.h"
#include <libiphone/libiphone.h> #include <libiphone/libiphone.h>
#define BUFFER_SIZE 20000 #define BUFFER_SIZE 20000
#define NB_THREADS 10 #define NB_THREADS 10
int debug = 0;
typedef struct { typedef struct {
iphone_afc_client_t afc; iphone_afc_client_t afc;
......
...@@ -25,9 +25,6 @@ ...@@ -25,9 +25,6 @@
#include <readline/readline.h> #include <readline/readline.h>
#include <readline/history.h> #include <readline/history.h>
#include "usbmux.h"
#include "iphone.h"
#include <libiphone/libiphone.h> #include <libiphone/libiphone.h>
......
...@@ -24,9 +24,6 @@ ...@@ -24,9 +24,6 @@
#include <errno.h> #include <errno.h>
#include <usb.h> #include <usb.h>
#include "usbmux.h"
#include "iphone.h"
#include <libxml/parser.h> #include <libxml/parser.h>
#include <libxml/tree.h> #include <libxml/tree.h>
......
...@@ -5,22 +5,6 @@ AM_LDFLAGS = $(libxml2_LIBS) $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $ ...@@ -5,22 +5,6 @@ AM_LDFLAGS = $(libxml2_LIBS) $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $
bin_PROGRAMS = libiphone-initconf 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_SOURCES = initconf.c userpref.c lockdown.c plist.c usbmux.c iphone.c utils.c
libiphone_initconf_CFLAGS = $(libgthread2_CFLAGS) $(AM_CFLAGS) libiphone_initconf_CFLAGS = $(libgthread2_CFLAGS) $(AM_CFLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment