common: Move debug and userpref code into libinternalcommon

2 files changed, 3 insertions, 3 deletions

diff --git a/tools/Makefile.am b/tools/Makefile.am
index e668592..fe9b1fa 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -11,9 +11,9 @@ ideviceinfo_LDFLAGS = $(AM_LDFLAGS)
 ideviceinfo_LDADD = ../src/libimobiledevice.la
 
 idevicepair_SOURCES = idevicepair.c
-idevicepair_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src
+idevicepair_CFLAGS = $(AM_CFLAGS)
 idevicepair_LDFLAGS = $(AM_LDFLAGS)
-idevicepair_LDADD = ../src/libimobiledevice.la
+idevicepair_LDADD = $(top_srcdir)/common/libinternalcommon.la ../src/libimobiledevice.la
 
 idevicesyslog_SOURCES = idevicesyslog.c
 idevicesyslog_CFLAGS = $(AM_CFLAGS)
diff --git a/tools/idevicepair.c b/tools/idevicepair.c
index dddb6ee..d634d5f 100644
--- a/tools/idevicepair.c
+++ b/tools/idevicepair.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <getopt.h>
-#include "userpref.h"
+#include "common/userpref.h"
 
 #include <libimobiledevice/libimobiledevice.h>
 #include <libimobiledevice/lockdown.h>