From 4c68d5e2137ea605569c8789a7ef5366df3053af Mon Sep 17 00:00:00 2001
From: Matt Colyer
Date: Sun, 10 May 2009 19:39:43 -0700
Subject: Fixes for 0.9.1 release.
---
Makefile.am | 4 ++--
autogen.sh | 4 ++++
configure.ac | 2 +-
dev/iphoneinfo.c | 6 ------
fdi/Makefile.am | 1 +
src/Makefile.am | 9 ++++++++-
udev/Makefile.am | 2 ++
7 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a8fe16d..a691d73 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@ AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src include fdi swig udev $(DEV_SUB)
+DISTCHECK_CONFIGURE_FLAGS = --enable-dev-tools
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libiphone-1.0.pc
@@ -11,5 +13,3 @@ doc:
indent:
indent -kr -ut -ts4 -l120 src/*.c src/*.h dev/*.c
-release:
- git archive --format=tar --prefix=libiphone-${RELEASE}/ tags/${RELEASE} | bzip2 > libiphone-${RELEASE}.tar.bz2
diff --git a/autogen.sh b/autogen.sh
index 9aa7170..460bc5e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,3 +4,7 @@ libtoolize
autoheader
automake --add-missing
autoconf
+
+if [ -z "$NOCONFIGURE" ]; then
+ ./configure --enable-dev-tools "$@"
+fi
diff --git a/configure.ac b/configure.ac
index 9996ebe..68929ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.61)
AC_INIT(libiphone, 0.1.0, nospam@nowhere.com)
-AM_INIT_AUTOMAKE(libiphone, 0.1.0)
+AM_INIT_AUTOMAKE(libiphone, 0.9.1)
AC_CONFIG_SRCDIR([src/])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/dev/iphoneinfo.c b/dev/iphoneinfo.c
index 4c887ac..4995b9b 100644
--- a/dev/iphoneinfo.c
+++ b/dev/iphoneinfo.c
@@ -150,12 +150,6 @@ void plist_node_to_string(plist_t *node)
free(s);
break;
- case PLIST_UNICODE:
- plist_get_unicode_val(node, &s);
- printf("%s\n", s);
- free(s);
- break;
-
case PLIST_KEY:
plist_get_key_val(node, &s);
printf("%s: ", s);
diff --git a/fdi/Makefile.am b/fdi/Makefile.am
index 31e716b..6ba7e6c 100644
--- a/fdi/Makefile.am
+++ b/fdi/Makefile.am
@@ -1,3 +1,4 @@
freedesktopfdidir=$(prefix)/share/hal/fdi/information/20thirdparty/
freedesktopfdi_DATA=31-apple-mobile-device.fdi
+EXTRA_DIST=$(freedesktopfdi_DATA)
diff --git a/src/Makefile.am b/src/Makefile.am
index a10254c..2ae1943 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,4 +4,11 @@ AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusb_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFL
AM_LDFLAGS = $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS) $(libplist_LIBS)
lib_LTLIBRARIES = libiphone.la
-libiphone_la_SOURCES = usbmux.c iphone.c lockdown.c AFC.c NotificationProxy.c userpref.c utils.c MobileSync.c
+libiphone_la_SOURCES = usbmux.c usbmux.h \
+ iphone.c iphone.h \
+ lockdown.c lockdown.h\
+ AFC.c AFC.h\
+ NotificationProxy.c NotificationProxy.h\
+ userpref.c userpref.h\
+ utils.c utils.h\
+ MobileSync.c MobileSync.h
diff --git a/udev/Makefile.am b/udev/Makefile.am
index d7b8a2f..c6deb39 100644
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -1,2 +1,4 @@
udevdir=$(sysconfdir)/udev/rules.d/
udev_DATA=89-libiphone.rules
+
+EXTRA_DIST=$(udev_DATA)
--
cgit v1.1-32-gdbae