diff options
| author |  Bastien Nocera | 2009-08-03 19:58:55 +0100 |
|---|---|---|
| committer |  Matt Colyer | 2009-08-04 09:03:55 -0700 |
| commit | 12b62b8d2d001e03d8b640afbc44d943d14f24b5 (patch) | |
| tree | 9013ff9cd719357877d18fe25e65e0a99817929d | |
| parent | dbf7b02b4a09de4aa9220431d466d900e47b74ba (diff) | |
| download | libimobiledevice-12b62b8d2d001e03d8b640afbc44d943d14f24b5.tar.gz libimobiledevice-12b62b8d2d001e03d8b640afbc44d943d14f24b5.tar.bz2 | |
Make distcheck pass from a clean tree
Signed-off-by: Matt Colyer <matt@colyer.name>
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | dev/Makefile.am | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index bf4205d..04358f9 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) tools +SUBDIRS = src include fdi swig dev tools DISTCHECK_CONFIGURE_FLAGS = --enable-dev-tools @@ -8,9 +8,8 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libiphone-1.0.pc EXTRA_DIST= docs -dist-hook: doc -doc: +docs: rm -fr docs doxygen doxygen.cfg diff --git a/configure.ac b/configure.ac index d6b27f4..55f5bae 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,9 @@ if test "$build_dev_tools" = true; then else DEV_SUB= fi + +AM_CONDITIONAL([ENABLE_DEVTOOLS],[test "x$DEV_SUB" = "xdev"]) + AC_SUBST([DEV_SUB]) AC_ARG_ENABLE([debug-code], diff --git a/dev/Makefile.am b/dev/Makefile.am index 70cd52b..cd43623 100644 --- a/dev/Makefile.am +++ b/dev/Makefile.am @@ -3,6 +3,7 @@ INCLUDES = -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) +if ENABLE_DEVTOOLS noinst_PROGRAMS = iphoneclient lckd-client afccheck msyncclient iphoneclient_SOURCES = iphoneclient.c @@ -22,3 +23,7 @@ msyncclient_SOURCES = msyncclient.c msyncclient_CFLAGS = $(AM_CFLAGS) msyncclient_LDFLAGS = $(AM_LDFLAGS) msyncclient_LDADD = ../src/libiphone.la + +endif # ENABLE_DEVTOOLS + +EXTRA_DIST = iphoneclient.c lckdclient.c afccheck.c msyncclient.c |