Fix make distcheck by using $(top_builddir) where needed
diff --git a/dev/Makefile.am b/dev/Makefile.am
index fcded9d..3815af6 100644
--- a/dev/Makefile.am
+++ b/dev/Makefile.am
@@ -9,32 +9,32 @@
ideviceclient_SOURCES = ideviceclient.c
ideviceclient_CFLAGS = $(AM_CFLAGS)
ideviceclient_LDFLAGS = $(AM_LDFLAGS)
-ideviceclient_LDADD = ../src/libimobiledevice.la
+ideviceclient_LDADD = $(top_builddir)/src/libimobiledevice.la
lckd_client_SOURCES = lckdclient.c
lckd_client_CFLAGS = $(AM_CFLAGS) $(libglib2_CFLAGS)
lckd_client_LDFLAGS = -lreadline $(AM_LDFLAGS) $(libglib2_LIBS)
-lckd_client_LDADD = ../src/libimobiledevice.la
+lckd_client_LDADD = $(top_builddir)/src/libimobiledevice.la
afccheck_SOURCES = afccheck.c
-afccheck_CFLAGS = $(AM_CFLAGS)
+afccheck_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS)
afccheck_LDFLAGS = $(AM_LDFLAGS)
-afccheck_LDADD = ../src/libimobiledevice.la
+afccheck_LDADD = $(top_builddir)/src/libimobiledevice.la
filerelaytest_SOURCES = filerelaytest.c
filerelaytest_CFLAGS = $(AM_CFLAGS)
filerelaytest_LDFLAGS = $(AM_LDFLAGS)
-filerelaytest_LDADD = ../src/libimobiledevice.la
+filerelaytest_LDADD = $(top_builddir)/src/libimobiledevice.la
housearresttest_SOURCES = housearresttest.c
housearresttest_CFLAGS = $(AM_CFLAGS)
housearresttest_LDFLAGS = $(AM_LDFLAGS)
-housearresttest_LDADD = ../src/libimobiledevice.la
+housearresttest_LDADD = $(top_builddir)/src/libimobiledevice.la
ideviceheartbeat_SOURCES = ideviceheartbeat.c
ideviceheartbeat_CFLAGS = $(AM_CFLAGS)
ideviceheartbeat_LDFLAGS = $(AM_LDFLAGS)
-ideviceheartbeat_LDADD = ../src/libimobiledevice.la
+ideviceheartbeat_LDADD = $(top_builddir)/src/libimobiledevice.la
endif # ENABLE_DEVTOOLS
diff --git a/src/Makefile.am b/src/Makefile.am
index 9a0736d..287b4e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@
AM_LDFLAGS = $(libgnutls_LIBS) $(libtasn1_LIBS) $(libplist_LIBS) $(libusbmuxd_LIBS) $(libgcrypt_LIBS) $(libpthread_LIBS) $(openssl_LIBS)
lib_LTLIBRARIES = libimobiledevice.la
-libimobiledevice_la_LIBADD = $(top_srcdir)/common/libinternalcommon.la
+libimobiledevice_la_LIBADD = $(top_builddir)/common/libinternalcommon.la
libimobiledevice_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBIMOBILEDEVICE_SO_VERSION) -no-undefined
libimobiledevice_la_SOURCES = idevice.c idevice.h \
service.c service.h\
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3a91cfe..d87ef96 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,77 +8,77 @@
ideviceinfo_SOURCES = ideviceinfo.c
ideviceinfo_CFLAGS = $(AM_CFLAGS)
ideviceinfo_LDFLAGS = $(AM_LDFLAGS)
-ideviceinfo_LDADD = ../src/libimobiledevice.la
+ideviceinfo_LDADD = $(top_builddir)/src/libimobiledevice.la
idevicename_SOURCES = idevicename.c
idevicename_CFLAGS = $(AM_CFLAGS)
idevicename_LDFLAGS = $(AM_LDFLAGS)
-idevicename_LDADD = ../src/libimobiledevice.la
+idevicename_LDADD = $(top_builddir)/src/libimobiledevice.la
idevicepair_SOURCES = idevicepair.c
-idevicepair_CFLAGS = $(AM_CFLAGS)
-idevicepair_LDFLAGS = $(top_srcdir)/common/libinternalcommon.la $(AM_LDFLAGS) $(libusbmuxd_LIBS)
-idevicepair_LDADD = ../src/libimobiledevice.la
+idevicepair_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS)
+idevicepair_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) $(libusbmuxd_LIBS)
+idevicepair_LDADD = $(top_builddir)/src/libimobiledevice.la
idevicesyslog_SOURCES = idevicesyslog.c
idevicesyslog_CFLAGS = $(AM_CFLAGS)
idevicesyslog_LDFLAGS = $(AM_LDFLAGS)
-idevicesyslog_LDADD = ../src/libimobiledevice.la
+idevicesyslog_LDADD = $(top_builddir)/src/libimobiledevice.la
idevice_id_SOURCES = idevice_id.c
idevice_id_CFLAGS = $(AM_CFLAGS)
idevice_id_LDFLAGS = $(AM_LDFLAGS)
-idevice_id_LDADD = ../src/libimobiledevice.la
+idevice_id_LDADD = $(top_builddir)/src/libimobiledevice.la
idevicebackup_SOURCES = idevicebackup.c
idevicebackup_CFLAGS = $(AM_CFLAGS)
idevicebackup_LDFLAGS = $(AM_LDFLAGS)
-idevicebackup_LDADD = ../src/libimobiledevice.la
+idevicebackup_LDADD = $(top_builddir)/src/libimobiledevice.la
idevicebackup2_SOURCES = idevicebackup2.c
idevicebackup2_CFLAGS = $(AM_CFLAGS)
idevicebackup2_LDFLAGS = $(AM_LDFLAGS)
-idevicebackup2_LDADD = ../src/libimobiledevice.la
+idevicebackup2_LDADD = $(top_builddir)/src/libimobiledevice.la
ideviceimagemounter_SOURCES = ideviceimagemounter.c
ideviceimagemounter_CFLAGS = $(AM_CFLAGS)
ideviceimagemounter_LDFLAGS = $(AM_LDFLAGS)
-ideviceimagemounter_LDADD = ../src/libimobiledevice.la
+ideviceimagemounter_LDADD = $(top_builddir)/src/libimobiledevice.la
idevicescreenshot_SOURCES = idevicescreenshot.c
idevicescreenshot_CFLAGS = $(AM_CFLAGS)
idevicescreenshot_LDFLAGS = $(AM_LDFLAGS)
-idevicescreenshot_LDADD = ../src/libimobiledevice.la
+idevicescreenshot_LDADD = $(top_builddir)/src/libimobiledevice.la
ideviceenterrecovery_SOURCES = ideviceenterrecovery.c
ideviceenterrecovery_CFLAGS = $(AM_CFLAGS)
ideviceenterrecovery_LDFLAGS = $(AM_LDFLAGS)
-ideviceenterrecovery_LDADD = ../src/libimobiledevice.la
+ideviceenterrecovery_LDADD = $(top_builddir)/src/libimobiledevice.la
idevicedate_SOURCES = idevicedate.c
idevicedate_CFLAGS = $(AM_CFLAGS)
idevicedate_LDFLAGS = $(AM_LDFLAGS)
-idevicedate_LDADD = ../src/libimobiledevice.la
+idevicedate_LDADD = $(top_builddir)/src/libimobiledevice.la
ideviceprovision_SOURCES = ideviceprovision.c
ideviceprovision_CFLAGS = $(AM_CFLAGS)
ideviceprovision_LDFLAGS = $(AM_LDFLAGS)
-ideviceprovision_LDADD = ../src/libimobiledevice.la
+ideviceprovision_LDADD = $(top_builddir)/src/libimobiledevice.la
idevicedebugserverproxy_SOURCES = idevicedebugserverproxy.c
-idevicedebugserverproxy_CFLAGS = $(AM_CFLAGS)
-idevicedebugserverproxy_LDFLAGS = $(top_srcdir)/common/libinternalcommon.la $(AM_LDFLAGS)
-idevicedebugserverproxy_LDADD = ../src/libimobiledevice.la
+idevicedebugserverproxy_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS)
+idevicedebugserverproxy_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
+idevicedebugserverproxy_LDADD = $(top_builddir)/src/libimobiledevice.la
idevicediagnostics_SOURCES = idevicediagnostics.c
idevicediagnostics_CFLAGS = $(AM_CFLAGS)
idevicediagnostics_LDFLAGS = $(AM_LDFLAGS)
-idevicediagnostics_LDADD = ../src/libimobiledevice.la
+idevicediagnostics_LDADD = $(top_builddir)/src/libimobiledevice.la
if !WIN32
bin_PROGRAMS += idevicecrashreport
idevicecrashreport_SOURCES = idevicecrashreport.c
-idevicecrashreport_CFLAGS = $(AM_CFLAGS)
-idevicecrashreport_LDFLAGS = $(top_srcdir)/common/libinternalcommon.la $(AM_LDFLAGS)
-idevicecrashreport_LDADD = ../src/libimobiledevice.la
+idevicecrashreport_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS)
+idevicecrashreport_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
+idevicecrashreport_LDADD = $(top_builddir)/src/libimobiledevice.la
endif
