summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2010-05-28 12:21:11 +0200
committerGravatar Martin Szulecki2011-03-26 17:27:04 +0100
commit8baf18c6cb9fbf067d092ba3c5275af88afff1ef (patch)
treed8e268396f34df98a81dc361c2ff07657cd08f7d
parentaa5e00e2a2ea59b1dd7b1b2f46f36bb3b26faf71 (diff)
downloadlibimobiledevice-8baf18c6cb9fbf067d092ba3c5275af88afff1ef.tar.gz
libimobiledevice-8baf18c6cb9fbf067d092ba3c5275af88afff1ef.tar.bz2
Promote ideviceenterrecovery into tools as it is quite useful
-rw-r--r--dev/Makefile.am9
-rw-r--r--tools/Makefile.am7
-rw-r--r--tools/ideviceenterrecovery.c (renamed from dev/ideviceenterrecovery.c)0
3 files changed, 8 insertions, 8 deletions
diff --git a/dev/Makefile.am b/dev/Makefile.am
index 17b67db..0790c80 100644
--- a/dev/Makefile.am
+++ b/dev/Makefile.am
@@ -4,7 +4,7 @@ AM_CFLAGS = $(GLOBAL_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_C
AM_LDFLAGS = $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS)
if ENABLE_DEVTOOLS
-noinst_PROGRAMS = ideviceclient lckd-client afccheck msyncclient ideviceenterrecovery filerelaytest
+noinst_PROGRAMS = ideviceclient lckd-client afccheck msyncclient filerelaytest
ideviceclient_SOURCES = ideviceclient.c
ideviceclient_LDADD = ../src/libimobiledevice.la
@@ -24,11 +24,6 @@ msyncclient_CFLAGS = $(AM_CFLAGS)
msyncclient_LDFLAGS = $(AM_LDFLAGS)
msyncclient_LDADD = ../src/libimobiledevice.la
-ideviceenterrecovery_SOURCES = ideviceenterrecovery.c
-ideviceenterrecovery_CFLAGS = $(AM_CFLAGS)
-ideviceenterrecovery_LDFLAGS = $(AM_LDFLAGS)
-ideviceenterrecovery_LDADD = ../src/libimobiledevice.la
-
filerelaytest_SOURCES = filerelaytest.c
filerelaytest_CFLAGS = $(AM_CFLAGS)
filerelaytest_LDFLAGS = $(AM_LDFLAGS)
@@ -36,4 +31,4 @@ filerelaytest_LDADD = ../src/libimobiledevice.la
endif # ENABLE_DEVTOOLS
-EXTRA_DIST = ideviceclient.c lckdclient.c afccheck.c msyncclient.c ideviceenterrecovery.c
+EXTRA_DIST = ideviceclient.c lckdclient.c afccheck.c msyncclient.c
diff --git a/tools/Makefile.am b/tools/Makefile.am
index de80b92..f274084 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = -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 = idevice_id ideviceinfo idevicepair idevicesyslog idevicebackup ideviceimagemounter idevicescreenshot
+bin_PROGRAMS = idevice_id ideviceinfo idevicepair idevicesyslog idevicebackup ideviceimagemounter idevicescreenshot ideviceenterrecovery
ideviceinfo_SOURCES = ideviceinfo.c
ideviceinfo_CFLAGS = $(AM_CFLAGS)
@@ -39,3 +39,8 @@ idevicescreenshot_SOURCES = idevicescreenshot.c
idevicescreenshot_CFLAGS = $(AM_CFLAGS)
idevicescreenshot_LDFLAGS = $(AM_LDFLAGS)
idevicescreenshot_LDADD = ../src/libimobiledevice.la
+
+ideviceenterrecovery_SOURCES = ideviceenterrecovery.c
+ideviceenterrecovery_CFLAGS = $(AM_CFLAGS)
+ideviceenterrecovery_LDFLAGS = $(AM_LDFLAGS)
+ideviceenterrecovery_LDADD = ../src/libimobiledevice.la
diff --git a/dev/ideviceenterrecovery.c b/tools/ideviceenterrecovery.c
index 827946b..827946b 100644
--- a/dev/ideviceenterrecovery.c
+++ b/tools/ideviceenterrecovery.c