diff options
author | Jonathan Beck | 2009-03-24 20:58:43 +0100 |
---|---|---|
committer | Jonathan Beck | 2009-03-24 20:58:43 +0100 |
commit | 85b8a301be39c4b86cb7f38e80c3cb592240ccb9 (patch) | |
tree | 4974fc254afbf0226e610fd962b5dc74c094cf9f /Makefile.am | |
parent | 19992c668afeb53a28e08a1f61572b5379f87590 (diff) | |
parent | 0114d8da493e69f14bc2669ae0ec6b9813b237cf (diff) | |
download | libimobiledevice-85b8a301be39c4b86cb7f38e80c3cb592240ccb9.tar.gz libimobiledevice-85b8a301be39c4b86cb7f38e80c3cb592240ccb9.tar.bz2 |
Merge branch 'master' of git://github.com/MattColyer/libiphone into contact_sync
Conflicts:
Makefile.am
configure.ac
src/AFC.h
src/NotificationProxy.c
src/lockdown.c
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 982f42b..cc6c06f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src include fdi swig $(DEV_SUB) +SUBDIRS = src include fdi swig udev $(DEV_SUB) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libiphone-1.0.pc |