diff options
| author |  Nikias Bassen | 2021-09-01 15:47:38 +0200 |
|---|---|---|
| committer | Nikias Bassen | 2021-09-01 15:49:51 +0200 |
| commit | 8eae9896eedd6a685b55abed9a2db4e379ff0e69 (patch) | |
| tree | f0f31c95103a4a8487c2b36464d756aa4d008c96 /src | |
| parent | 1a7351852d650a481e1ddfa86aed9dc781849b51 (diff) | |
| download | libusbmuxd-8eae9896eedd6a685b55abed9a2db4e379ff0e69.tar.gz libusbmuxd-8eae9896eedd6a685b55abed9a2db4e379ff0e69.tar.bz2 | |
Remove common code in favor of new libimobiledevice-glue
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/libusbmuxd.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index dc9a730..9c16952 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,11 +1,11 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/common +AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CFLAGS = $(GLOBAL_CFLAGS) $(libplist_CFLAGS) -AM_LDFLAGS = $(GLOBAL_LIBS) $(libplist_LIBS) +AM_CFLAGS = $(GLOBAL_CFLAGS) $(libplist_CFLAGS) $(limd_glue_CFLAGS) +AM_LDFLAGS = $(GLOBAL_LIBS) $(libplist_LIBS) $(limd_glue_LIBS) lib_LTLIBRARIES = libusbmuxd-2.0.la libusbmuxd_2_0_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBUSBMUXD_SO_VERSION) -no-undefined -libusbmuxd_2_0_la_LIBADD = $(top_builddir)/common/libinternalcommon.la +libusbmuxd_2_0_la_LIBADD = libusbmuxd_2_0_la_SOURCES = libusbmuxd.c if WIN32 diff --git a/src/libusbmuxd.c b/src/libusbmuxd.c index 0c94cde..b16936a 100644 --- a/src/libusbmuxd.c +++ b/src/libusbmuxd.c @@ -61,7 +61,6 @@ #else #include <sys/socket.h> #include <arpa/inet.h> -#include <pthread.h> #if defined(HAVE_PROGRAM_INVOCATION_SHORT_NAME) && !defined(HAVE_PROGRAM_INVOCATION_SHORT_NAME_ERRNO_H) extern char *program_invocation_short_name; #endif @@ -74,6 +73,7 @@ extern int _NSGetExecutablePath(char* buf, uint32_t* bufsize); #ifdef HAVE_INOTIFY #include <sys/inotify.h> #include <sys/select.h> +#include <pthread.h> #define EVENT_SIZE (sizeof (struct inotify_event)) #define EVENT_BUF_LEN (1024 * (EVENT_SIZE + 16)) #define USBMUXD_DIRNAME "/var/run" @@ -103,11 +103,11 @@ static char *prog_name = NULL; // usbmuxd protocol #include "usbmuxd-proto.h" // socket utility functions -#include "socket.h" +#include <libimobiledevice-glue/socket.h> // misc utility functions -#include "collection.h" +#include <libimobiledevice-glue/collection.h> // threads -#include "thread.h" +#include <libimobiledevice-glue/thread.h> static int libusbmuxd_debug = 0; #ifndef PACKAGE |