diff options
| author |  Martin Szulecki | 2009-05-24 00:25:03 +0200 |
|---|---|---|
| committer | Martin Szulecki | 2009-05-24 00:25:03 +0200 |
| commit | 36ea32e0064f33d6a285684c3069f4d75bbac7a8 (patch) | |
| tree | 039291b47e954fe8529f52e1fc71f7e924761a6a /Makefile.am | |
| parent | 46f8d46845355e6a33a6dcb97ba11d4c4cab62eb (diff) | |
| parent | 435f5feb4b5c501db52743a170908687d3ba6f60 (diff) | |
| download | libimobiledevice-36ea32e0064f33d6a285684c3069f4d75bbac7a8.tar.gz libimobiledevice-36ea32e0064f33d6a285684c3069f4d75bbac7a8.tar.bz2 | |
Merge branch 'master' of git://github.com/MattColyer/libiphone into martin
Conflicts:
src/Makefile.am
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 a691d73..39ee8e8 100644 --- a/Makefile.am +++ b/Makefile.am | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | AUTOMAKE_OPTIONS = foreign | 1 | AUTOMAKE_OPTIONS = foreign |
| 2 | ACLOCAL_AMFLAGS = -I m4 | 2 | ACLOCAL_AMFLAGS = -I m4 |
| 3 | SUBDIRS = src include fdi swig udev $(DEV_SUB) | 3 | SUBDIRS = src include fdi swig $(DEV_SUB) |
| 4 | 4 | ||
| 5 | DISTCHECK_CONFIGURE_FLAGS = --enable-dev-tools | 5 | DISTCHECK_CONFIGURE_FLAGS = --enable-dev-tools |
| 6 | 6 | ||