summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2009-11-30 13:15:20 +0100
committerGravatar Martin Szulecki2009-11-30 13:15:20 +0100
commitd908c99c68c1722b8122e5d26c67ad614035aa25 (patch)
treef0259783c7b4f7e98c4bd2762bc9385e99a7bd3e
parentf21026094deb8fed64021c000827ea867b50ceb6 (diff)
parenta386752ce0f4ab8dd364b50e9a60c2155827ba66 (diff)
downloadlibimobiledevice-d908c99c68c1722b8122e5d26c67ad614035aa25.tar.gz
libimobiledevice-d908c99c68c1722b8122e5d26c67ad614035aa25.tar.bz2
Merge branch 'master' of git://github.com/MattColyer/libiphone into martin
-rw-r--r--README4
-rw-r--r--src/Makefile.am2
2 files changed, 3 insertions, 3 deletions
diff --git a/README b/README
index 3c7011f..beef2f8 100644
--- a/README
+++ b/README
@@ -17,7 +17,7 @@ Development Packages of:
libusbmuxd (within usbmuxd package, see below)
Software:
- usbmuxd (git clone http://pims.selfip.net/git/usbmuxd)
+ usbmuxd (git clone git://git.marcansoft.com/usbmuxd.git)
make
autoheader
automake
@@ -55,5 +55,5 @@ Mailing List:
http://lists.mattcolyer.com/listinfo.cgi/iphone-linux-dev-mattcolyer.com
README Updated on:
- 2009-07-24
+ 2009-11-24
diff --git a/src/Makefile.am b/src/Makefile.am
index 5489684..ce1d237 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir)/include
AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusbmuxd_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) $(libplist_CFLAGS) $(LFS_CFLAGS)
-AM_LDFLAGS = $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS) $(libplist_LIBS) $(libusbmuxd_LIBS)
+AM_LDFLAGS = $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS) $(libplist_LIBS) $(libusbmuxd_LIBS) $(libgcrypt_LIBS)
lib_LTLIBRARIES = libiphone.la
libiphone_la_SOURCES = iphone.c iphone.h \