diff options
| author |  Chow Loong Jin | 2014-10-03 13:24:19 +0200 |
|---|---|---|
| committer |  Nikias Bassen | 2014-10-03 13:24:19 +0200 |
| commit | 305450ad5fc9d8027a35a67f3136d81e4ecf74e2 (patch) | |
| tree | 8f159a64437e7bde96eceb00b7257f5c54948c3a | |
| parent | cc4f7aa21edb54b6688aead32e8b8741247848c7 (diff) | |
| download | libusbmuxd-305450ad5fc9d8027a35a67f3136d81e4ecf74e2.tar.gz libusbmuxd-305450ad5fc9d8027a35a67f3136d81e4ecf74e2.tar.bz2 | |
Move socket and collection functions to a convenience library
This avoids the iproxy tool from relying on undocumented library ABI.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | common/Makefile.am | 14 | ||||
| -rw-r--r-- | common/collection.c (renamed from src/collection.c) | 0 | ||||
| -rw-r--r-- | common/collection.h (renamed from src/collection.h) | 0 | ||||
| -rw-r--r-- | common/socket.c (renamed from src/socket.c) | 0 | ||||
| -rw-r--r-- | common/socket.h (renamed from src/socket.h) | 0 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 9 | ||||
| -rw-r--r-- | tools/Makefile.am | 4 |
9 files changed, 21 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 4655b8f..26188a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src include tools +SUBDIRS = common src include tools pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libusbmuxd.pc diff --git a/common/Makefile.am b/common/Makefile.am new file mode 100644 index 0000000..8acf04b --- /dev/null +++ b/common/Makefile.am @@ -0,0 +1,14 @@ +AM_CFLAGS = $(GLOBAL_CFLAGS) + +noinst_LTLIBRARIES = libinternalcommon.la + +libinternalcommon_la_LIBADD = +libinternalcommon_la_SOURCES = \ + socket.c \ + collection.c \ + socket.h \ + collection.h + +if WIN32 +libinternalcommon_la_LIBADD += -lws2_32 +endif diff --git a/src/collection.c b/common/collection.c index ccc4016..ccc4016 100644 --- a/src/collection.c +++ b/common/collection.c diff --git a/src/collection.h b/common/collection.h index a91a465..a91a465 100644 --- a/src/collection.h +++ b/common/collection.h diff --git a/src/socket.c b/common/socket.c index 27b93ba..27b93ba 100644 --- a/src/socket.c +++ b/common/socket.c diff --git a/src/socket.h b/common/socket.h index e31de6b..e31de6b 100644 --- a/src/socket.h +++ b/common/socket.h diff --git a/configure.ac b/configure.ac index d168d95..93c01c5 100644 --- a/configure.ac +++ b/configure.ac @@ -88,6 +88,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_OUTPUT([ Makefile +common/Makefile src/Makefile include/Makefile tools/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 4cd338e..cc6b589 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,15 +1,12 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/common AM_CFLAGS = $(GLOBAL_CFLAGS) $(libplist_CFLAGS) AM_LDFLAGS = $(GLOBAL_LIBS) $(libpthread_LIBS) $(libplist_LIBS) lib_LTLIBRARIES = libusbmuxd.la libusbmuxd_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBUSBMUXD_SO_VERSION) -no-undefined -libusbmuxd_la_LIBADD = -libusbmuxd_la_SOURCES = \ - collection.c collection.h \ - socket.c socket.h \ - libusbmuxd.c +libusbmuxd_la_LIBADD = $(top_builddir)/common/libinternalcommon.la +libusbmuxd_la_SOURCES = libusbmuxd.c if WIN32 libusbmuxd_la_LDFLAGS += -avoid-version diff --git a/tools/Makefile.am b/tools/Makefile.am index df6c803..40fa851 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(GLOBAL_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/include +AM_CFLAGS = $(GLOBAL_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/src -I$(top_srcdir)/include AM_LDFLAGS = $(libpthread_LIBS) bin_PROGRAMS = iproxy @@ -6,5 +6,5 @@ bin_PROGRAMS = iproxy iproxy_SOURCES = iproxy.c iproxy_CFLAGS = $(AM_CFLAGS) iproxy_LDFLAGS = $(AM_LDFLAGS) -iproxy_LDADD = $(top_builddir)/src/libusbmuxd.la +iproxy_LDADD = $(top_builddir)/src/libusbmuxd.la $(top_builddir)/common/libinternalcommon.la |